Refactored client code and test to consume XML

Removed unused constants

Change-Id: I7a965a498ab4607de145359697b7d5d976aaa4ff
Fixes: bug #1154300

reddwarfclient/cli.py

@@ -233,7 +233,7 @@ class LimitsCommands(common.AuthedCommandsBase):
 
     def list(self):
         """List the rate limits and absolute limits"""
-        self._pretty_list(self.dbaas.limits.index)
+        self._pretty_list(self.dbaas.limits.list)
 
 
 COMMANDS = {'auth': common.Auth,

reddwarfclient/limits.py

@@ -16,39 +16,35 @@
 from reddwarfclient import base
 import exceptions
 
-RESPONSE_KEY = "limits"
+
-ABSOLUTE = "absolute"
+class Limit(base.Resource):
-RATE = "rate"
+
-LIMIT = 'limit'
+    def __repr__(self):
+        return "<Limit: %s>" % self.verb
 
 
 class Limits(base.ManagerWithFind):
     """
     Manages :class `Limit` resources
     """
-    resource_class = base.Resource
+    resource_class = Limit
 
-    def index(self):
+    def __repr__(self):
-        """
+        return "<Limit Manager at %s>" % id(self)
-        Retrieve the limits
+
-        """
+    def _list(self, url, response_key):
-        URL = "/limits"
+        resp, body = self.api.client.get(url)
-        resp, body = self.api.client.get(URL)
 
         if resp is None or resp.status != 200:
             raise exceptions.from_response(resp, body)
 
         if not body:
-            raise Exception("Call to " + URL + " did not return a body.")
+            raise Exception("Call to " + url + " did not return a body.")
 
-        absolute_rates = self._get_absolute_rates(body)
+        return [self.resource_class(self, res) for res in body[response_key]]
-        rates = self._get_rates(body)
-        return absolute_rates + rates
 
-    def _get_rates(self, body):
+    def list(self):
-        rates = body[RESPONSE_KEY][RATE][0].get(LIMIT, {})
+        """
-        return [self.resource_class(self, res) for res in rates]
+        Retrieve the limits
-
+        """
-    def _get_absolute_rates(self, body):
+        return self._list("/limits", "limits")
-        absolute_rates = body[RESPONSE_KEY].get(ABSOLUTE, {})
-        return [self.resource_class(self, absolute_rates)]

reddwarfclient/xml.py

@@ -18,7 +18,8 @@ LISTIFY = {
     "devices": [[]],
     "users": [[]],
     "versions": [[]],
-    "attachments": [[]]
+    "attachments": [[]],
+    "limits": [[]]
 }
 
 TYPE_MAP = {

tests/test_limits.py

@@ -16,56 +16,48 @@ class LimitsTest(TestCase):
     def tearDown(self):
         super(LimitsTest, self).tearDown()
 
-    def test_index(self):
+    def test_list(self):
-        RESPONSE_KEY = "limits"
-
         resp = Mock()
         resp.status = 200
-        body = {RESPONSE_KEY: {
+        body = {"limits":
-                "absolute": {
+                [
-                    "maxTotalInstances": 55,
+                    {'maxTotalInstances': 55,
-                    "maxTotalVolumes": 100
+                     'verb': 'ABSOLUTE',
-                },
+                     'maxTotalVolumes': 100},
-                'rate': [
+                    {'regex': '.*',
-                {'limit': [
+                     'nextAvailable': '2011-07-21T18:17:06Z',
-                    {
+                     'uri': '*',
-                        "next-available": "2013-02-26T00:00:13Z",
+                     'value': 10,
-                        "remaining": 100,
+                     'verb': 'POST',
-                        "unit": "MINUTE",
+                     'remaining': 2, 'unit': 'MINUTE'},
-                        "value": 100,
+                    {'regex': '.*',
-                        "verb": "POST"
+                     'nextAvailable': '2011-07-21T18:17:06Z',
-                    },
+                     'uri': '*',
-                    {
+                     'value': 10,
-                        "next-available": "2013-02-26T00:00:13Z",
+                     'verb': 'PUT',
-                        "remaining": 100,
+                     'remaining': 2,
-                        "unit": "MINUTE",
+                     'unit': 'MINUTE'},
-                        "value": 100,
+                    {'regex': '.*',
-                        "verb": "PUT"
+                     'nextAvailable': '2011-07-21T18:17:06Z',
-                    },
+                     'uri': '*',
-                    {
+                     'value': 10,
-                        "next-available": "2013-02-26T00:00:13Z",
+                     'verb': 'DELETE',
-                        "remaining": 100,
+                     'remaining': 2,
-                        "unit": "MINUTE",
+                     'unit': 'MINUTE'},
-                        "value": 100,
+                    {'regex': '.*',
-                        "verb": "DELETE"
+                     'nextAvailable': '2011-07-21T18:17:06Z',
-                    },
+                     'uri': '*',
-                    {
+                     'value': 10,
-                        "next-available": "2013-02-26T00:00:13Z",
+                     'verb': 'GET',
-                        "remaining": 99,
+                     'remaining': 2, 'unit': 'MINUTE'}]}
-                        "unit": "MINUTE",
-                        "value": 100,
-                        "verb": "GET"
-                    }
-                ]
-                }]}}
         response = (resp, body)
 
         mock_get = Mock(return_value=response)
         self.limits.api.client.get = mock_get
-        self.assertIsNotNone(self.limits.index())
+        self.assertIsNotNone(self.limits.list())
         mock_get.assert_called_once_with("/limits")
 
-    def test_index_errors(self):
+    def test_list_errors(self):
         status_list = [400, 401, 403, 404, 408, 409, 413, 500, 501]
         for status_code in status_list:
             self._check_error_response(status_code)
@@ -84,4 +76,4 @@ class LimitsTest(TestCase):
 
         mock_get = Mock(return_value=response)
         self.limits.api.client.get = mock_get
-        self.assertRaises(Exception, self.limits.index)
+        self.assertRaises(Exception, self.limits.list)