Fix RateLimit.__repr__ - self.method is undefined

Using self.verb instead of self.method, unit tests added to cover this fix.

Closes-bug: #1258489

Change-Id: I4a84179ff96c50b230afcaea7a19fb54613577fb

cinderclient/tests/v1/test_limits.py

@@ -0,0 +1,24 @@
+# Copyright 2011 OpenStack Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from cinderclient.tests import utils
+from cinderclient.v1 import limits
+
+
+class TestRateLimit(utils.TestCase):
+    def test_repr(self):
+        l1 = limits.RateLimit("verb1", "uri1", "regex1", "value1", "remain1",
+                              "unit1", "next1")
+        self.assertEqual("<RateLimit: method=verb1 uri=uri1>", repr(l1))

cinderclient/tests/v2/test_limits.py

@@ -0,0 +1,24 @@
+# Copyright 2011 OpenStack Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from cinderclient.tests import utils
+from cinderclient.v2 import limits
+
+
+class TestRateLimit(utils.TestCase):
+    def test_repr(self):
+        l1 = limits.RateLimit("verb1", "uri1", "regex1", "value1", "remain1",
+                              "unit1", "next1")
+        self.assertEqual("<RateLimit: method=verb1 uri=uri1>", repr(l1))

cinderclient/v1/limits.py

@@ -61,7 +61,7 @@ class RateLimit(object):
             and self.next_available == other.next_available
 
     def __repr__(self):
-        return "<RateLimit: method=%s uri=%s>" % (self.method, self.uri)
+        return "<RateLimit: method=%s uri=%s>" % (self.verb, self.uri)
 
 
 class AbsoluteLimit(object):

cinderclient/v2/limits.py

@@ -61,7 +61,7 @@ class RateLimit(object):
             and self.next_available == other.next_available
 
     def __repr__(self):
-        return "<RateLimit: method=%s uri=%s>" % (self.method, self.uri)
+        return "<RateLimit: method=%s uri=%s>" % (self.verb, self.uri)
 
 
 class AbsoluteLimit(object):

doc/source/index.rst

@@ -40,6 +40,7 @@ MASTER
 .. _1255876: http://bugs.launchpad.net/python-cinderclient/+bug/1255876
 .. _1251385: http://bugs.launchpad.net/python-cinderclient/+bug/1251385
 .. _1264415: http://bugs.launchpad.net/python-cinderclient/+bug/1264415
+.. _1258489: http://bugs.launchpad.net/python-cinderclient/+bug/1258489
 
 1.0.7
 -----