diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-05-25 21:16:01 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-05-25 21:16:01 +0000 |
| commit | db18a792414240cbdb1221d0e79e8a63313f103e (patch) | |
| tree | 3304e10313ab78a0e28a2c2762888938394fd2c4 | |
| parent | ec0e674ce1a8539143e9b99deb8cc62b9d42d6b2 (diff) | |
| parent | 60d78fb3962e5bdd5f642a8982f53656bda20314 (diff) | |
| download | nova-db18a792414240cbdb1221d0e79e8a63313f103e.tar.gz nova-db18a792414240cbdb1221d0e79e8a63313f103e.tar.xz nova-db18a792414240cbdb1221d0e79e8a63313f103e.zip | |
Fixed the mistyped line referred to in bug 787023
| -rw-r--r-- | nova/api/openstack/views/limits.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_limits.py | 51 |
2 files changed, 52 insertions, 1 deletions
diff --git a/nova/api/openstack/views/limits.py b/nova/api/openstack/views/limits.py index 33be12c0c..e21c9f2fd 100644 --- a/nova/api/openstack/views/limits.py +++ b/nova/api/openstack/views/limits.py @@ -104,7 +104,7 @@ class ViewBuilderV11(ViewBuilder): # check for existing key for limit in limits: if limit["uri"] == rate_limit["URI"] and \ - limit["regex"] == limit["regex"]: + limit["regex"] == rate_limit["regex"]: _rate_limit_key = limit break diff --git a/nova/tests/api/openstack/test_limits.py b/nova/tests/api/openstack/test_limits.py index 1bbe96612..70f59eda6 100644 --- a/nova/tests/api/openstack/test_limits.py +++ b/nova/tests/api/openstack/test_limits.py @@ -305,6 +305,57 @@ class LimitsControllerV11Test(BaseLimitTestSuite): body = json.loads(response.body) self.assertEqual(expected, body) + def _populate_limits_diff_regex(self, request): + """Put limit info into a request.""" + _limits = [ + limits.Limit("GET", "*", ".*", 10, 60).display(), + limits.Limit("GET", "*", "*.*", 10, 60).display(), + ] + request.environ["nova.limits"] = _limits + return request + + def test_index_diff_regex(self): + """Test getting limit details in JSON.""" + request = self._get_index_request() + request = self._populate_limits_diff_regex(request) + response = request.get_response(self.controller) + expected = { + "limits": { + "rate": [ + { + "regex": ".*", + "uri": "*", + "limit": [ + { + "verb": "GET", + "next-available": 0, + "unit": "MINUTE", + "value": 10, + "remaining": 10, + }, + ], + }, + { + "regex": "*.*", + "uri": "*", + "limit": [ + { + "verb": "GET", + "next-available": 0, + "unit": "MINUTE", + "value": 10, + "remaining": 10, + }, + ], + }, + + ], + "absolute": {}, + }, + } + body = json.loads(response.body) + self.assertEqual(expected, body) + def _test_index_absolute_limits_json(self, expected): request = self._get_index_request() response = request.get_response(self.controller) |