Merge pull request #103 from jathanism/set_queries

Updated unit tests to support assert proper support for NSoT 0.17.1.

pynsot/app.py

@@ -235,7 +235,7 @@ def handle_error(self, action, data, err):
             msg = str(err)
 
         if isinstance(msg, dict):
-            msg = self.pretty_dict(msg, delim=':', joiner='')
+            msg = self.pretty_dict(msg, delim=': ', joiner='')
 
         # If we're being verbose, print some extra context.
         if self.verbose:
@@ -535,6 +535,19 @@ def get_single_object(self, data, resource=None, natural_keys=None):
         except IndexError:
             return None
 
+    def set_query(self, data):
+        """
+        Run a set query and return the results.
+
+        :param data:
+            Dict of query parameters
+        """
+        self.rebase(data)
+        try:
+            return self.resource.query.get(**data)
+        except HTTP_ERRORS as err:
+            self.handle_error('list', data, err)
+
     def list(self, data, display_fields=None, resource=None,
              verbose_fields=None):
         """

pynsot/client.py

@@ -287,7 +287,7 @@ def get_token(self, base_url, email, secret_key):
             return result
         else:
             msg = 'Failed to fetch auth_token from %s' % base_url
-            err = HttpClientError(msg, response=r, content=r.content)
+            err = HttpClientError(msg, response=resp, content=resp.content)
             self.client.error(err)
 
     def __call__(self, r):

pynsot/commands/cmd_devices.py

@@ -190,9 +190,8 @@ def list(ctx, attributes, delimited, grep, hostname, id, limit, natural_key,
     data.pop('delimited')  # We don't want this going to the server.
 
     if ctx.invoked_subcommand is None:
-        if query:
-            results = ctx.obj.api.sites(site_id).devices.query.get(
-                query=query, limit=limit, offset=offset)
+        if query is not None:
+            results = ctx.obj.set_query(data)
             devices = get_result(results)
             devices = sorted(d['hostname'] for d in devices)
             joiner = ',' if delimited else '\n'

pynsot/commands/cmd_interfaces.py

@@ -248,8 +248,8 @@ def list(ctx, attributes, delimited, device, description, grep, id, limit,
     # If we aren't passing a sub-command, just call list(), otherwise let it
     # fallback to default behavior.
     if ctx.invoked_subcommand is None:
-        if query:
-            results = ctx.obj.api.sites(site_id).interfaces.query.get(**data)
+        if query is not None:
+            results = ctx.obj.set_query(data)
             interfaces = get_result(results)
             interfaces = sorted(
                 (i['device'], i['name']) for i in interfaces

pynsot/commands/cmd_networks.py

@@ -257,8 +257,8 @@ def list(ctx, attributes, cidr, delimited, grep, id, include_ips,
     # If we aren't passing a sub-command, just call list(), otherwise let it
     # fallback to default behavior.
     if ctx.invoked_subcommand is None:
-        if query:
-            results = ctx.obj.api.sites(site_id).networks.query.get(**data)
+        if query is not None:
+            results = ctx.obj.set_query(data)
             networks = get_result(results)
             networks = sorted(
                 (d['network_address'], d['prefix_length']) for d in networks

pynsot/util.py

@@ -21,4 +21,3 @@ def get_result(response):
 
     # Or just return the payload... (next-gen)
     return payload
-

pynsot/version.py

@@ -1 +1 @@
-__version__ = '0.20.3'
+__version__ = '0.20.4'

requirements-dev.txt

@@ -1,6 +1,6 @@
 -r requirements.txt
 fake-factory==0.5.0
-nsot==0.17
+nsot==0.17.1
 py==1.4.26
 pytest==2.7.0
 pytest-django==2.9.1

tests/test_app.py

@@ -300,6 +300,25 @@ def test_devices_list(site_client):
         assert result.exit_code == 0
         assert result.output == expected_output
 
+        # Now create 1 device w/ owner= w/ a space in the value 
+        runner.run('devices add -H foo-bar3 -a owner="Jathan McCollum"')
+
+        # Test that you can query by values w/ spaces when properly quoted
+        result = runner.run('devices list -q \'owner="Jathan McCollum"\'')
+        expected_output = 'foo-bar3\n'
+        assert result.exit_code == 0
+        assert result.output == expected_output
+
+        # ... Or using backslashes works, too.
+        result = runner.run('devices list -q "owner=Jathan\ McCollum"')
+        assert result.exit_code == 0
+        assert result.output == expected_output
+
+        # Test that query with unbalanced quotes fails.
+        result = runner.run('devices list -q \'owner="Jathan McCollum\'')
+        assert result.exit_code == 1
+        assert 'No closing quotation' in result.output
+
 
 def test_devices_update(site_client):
     """Test ``nsot devices update``."""
@@ -548,6 +567,25 @@ def test_networks_list(site_client):
         assert result.exit_code == 0
         assert result.output == expected_output
 
+        # Now create 1 network w/ owner= w/ a space in the value 
+        runner.run('networks add -c 10.0.0.0/16 -a owner="Jathan McCollum"')
+
+        # Test that you can query by values w/ spaces when properly quoted
+        result = runner.run('networks list -q \'owner="Jathan McCollum"\'')
+        expected_output = '10.0.0.0/16\n'
+        assert result.exit_code == 0
+        assert result.output == expected_output
+
+        # ... Or using backslashes works, too.
+        result = runner.run('networks list -q "owner=Jathan\ McCollum"')
+        assert result.exit_code == 0
+        assert result.output == expected_output
+
+        # Test that query with unbalanced quotes fails.
+        result = runner.run('networks list -q \'owner="Jathan McCollum\'')
+        assert result.exit_code == 1
+        assert 'No closing quotation' in result.output
+
 
 def test_networks_subcommands(site_client):
     """Test supernets/subnets sub-commands."""