query_and_count -> query_with_count.

Author: Kami

CHANGELOG.rst

@@ -48,8 +48,8 @@ Fixed
 * Fix api key generation, to use system user, when auth is disabled. (bug fix) #3578 #3593
 * Fix invocation of Mistral workflow from Action Chain with jinja in params. (bug fix) #3440
 * Fix st2client API bug, a backward incompatible change in `query()` method, introduced in note
-  implementation(#3514) in 2.3.1. The `query()` method is now backward compatible (pre 2.3) and
-  `query_and_count()` method is used for results pagination and note. #3616
+  implementation (#3514) in 2.3.1. The `query()` method is now backward compatible (pre 2.3) and
+  `query_with_count()` method is used for results pagination and note. #3616
 
 2.3.1 - July 07, 2017
 ---------------------

st2client/st2client/commands/action.py

@@ -1062,7 +1062,7 @@ def run(self, args, **kwargs):
         exclude_attributes = ','.join(exclude_attributes)
         kwargs['exclude_attributes'] = exclude_attributes
 
-        return self.manager.query_and_count(limit=args.last, **kwargs)
+        return self.manager.query_with_count(limit=args.last, **kwargs)
 
     def run_and_print(self, args, **kwargs):
 

st2client/st2client/commands/rule.py

@@ -83,7 +83,7 @@ def run(self, args, **kwargs):
             # switch attr to display the trigger and action
             args.attr = self.display_attributes_iftt
 
-        return self.manager.query_and_count(limit=args.last, **kwargs)
+        return self.manager.query_with_count(limit=args.last, **kwargs)
 
     def run_and_print(self, args, **kwargs):
         instances, count = self.run(args, **kwargs)

st2client/st2client/commands/rule_enforcement.py

@@ -110,7 +110,7 @@ def run(self, args, **kwargs):
         if args.timestamp_lt:
             kwargs['enforced_at_lt'] = args.timestamp_lt
 
-        return self.manager.query_and_count(limit=args.last, **kwargs)
+        return self.manager.query_with_count(limit=args.last, **kwargs)
 
     def run_and_print(self, args, **kwargs):
         instances, count = self.run(args, **kwargs)

st2client/st2client/commands/trace.py

@@ -163,7 +163,7 @@ def run(self, args, **kwargs):
                 kwargs['sort_asc'] = True
             elif args.sort_order in ['desc', 'descending']:
                 kwargs['sort_desc'] = True
-        return self.manager.query_and_count(limit=args.last, **kwargs)
+        return self.manager.query_with_count(limit=args.last, **kwargs)
 
     def run_and_print(self, args, **kwargs):
         instances, count = self.run(args, **kwargs)

st2client/st2client/commands/triggerinstance.py

@@ -118,7 +118,7 @@ def run(self, args, **kwargs):
         if args.status:
             kwargs['status'] = args.status
 
-        return self.manager.query_and_count(limit=args.last, **kwargs)
+        return self.manager.query_with_count(limit=args.last, **kwargs)
 
     def run_and_print(self, args, **kwargs):
 

st2client/st2client/models/core.py

@@ -268,7 +268,7 @@ def _query_details(self, **kwargs):
             response = self.client.get(url)
 
         if response.status_code == 404:
-            # for query and query_and_count
+            # for query and query_with_count
             return [], None
         if response.status_code != 200:
             self.handle_error(response)
@@ -282,7 +282,7 @@ def query(self, **kwargs):
         return instances
 
     @add_auth_token_to_kwargs_from_env
-    def query_and_count(self, **kwargs):
+    def query_with_count(self, **kwargs):
         instances, response = self._query_details(**kwargs)
         if response and 'X-Total-Count' in response.headers:
             return (instances, response.headers['X-Total-Count'])

st2client/tests/unit/test_models.py

@@ -108,9 +108,9 @@ def test_resource_query(self):
         httpclient.HTTPClient, 'get',
         mock.MagicMock(return_value=base.FakeResponse(json.dumps([base.RESOURCES[0]]), 200, 'OK',
                                                       {'X-Total-Count': '50'})))
-    def test_resource_query_and_count(self):
+    def test_resource_query_with_count(self):
         mgr = models.ResourceManager(base.FakeResource, base.FAKE_ENDPOINT)
-        resources, count = mgr.query_and_count(name='abc')
+        resources, count = mgr.query_with_count(name='abc')
         actual = [resource.serialize() for resource in resources]
         expected = json.loads(json.dumps([base.RESOURCES[0]]))
         self.assertEqual(actual, expected)
@@ -141,9 +141,9 @@ def test_resource_query_404(self):
         httpclient.HTTPClient, 'get',
         mock.MagicMock(return_value=base.FakeResponse('', 404, 'NOT FOUND',
                                                       {'X-Total-Count': '30'})))
-    def test_resource_query_and_count_404(self):
+    def test_resource_query_with_count_404(self):
         mgr = models.ResourceManager(base.FakeResource, base.FAKE_ENDPOINT)
-        resources, count = mgr.query_and_count(name='abc')
+        resources, count = mgr.query_with_count(name='abc')
         self.assertListEqual(resources, [])
         self.assertIsNone(count)