summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kulhavy <martin.kulhavy@nokia.com>2017-07-13 16:50:35 +0300
committerMartin Kulhavy <martin.kulhavy@nokia.com>2017-07-13 18:36:25 +0300
commit3d4ec1b5fe9159d16a8d8e8f426f94149e2a9088 (patch)
treefbd167fc729be1c06b896322d860999454c96f35
parent3b4e35abada626ce052f20d55c71fe12ab77052a (diff)
downloadpython-ceilometerclient-3d4ec1b5fe9159d16a8d8e8f426f94149e2a9088.tar.gz
Fix invalid url for event_types
Additionally fix the object name in the string representation. Closes-Bug: 1704138 Change-Id: I2bb0963600cfc93d782f10480d5245d92c1c0f1d Signed-off-by: Martin Kulhavy <martin.kulhavy@nokia.com>
-rw-r--r--ceilometerclient/tests/unit/v2/test_event_types.py4
-rw-r--r--ceilometerclient/v2/event_types.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/ceilometerclient/tests/unit/v2/test_event_types.py b/ceilometerclient/tests/unit/v2/test_event_types.py
index e5d2037..3bccbae 100644
--- a/ceilometerclient/tests/unit/v2/test_event_types.py
+++ b/ceilometerclient/tests/unit/v2/test_event_types.py
@@ -20,7 +20,7 @@ import ceilometerclient.v2.event_types
fixtures = {
- '/v2/event_types/': {
+ '/v2/event_types': {
'GET': (
{},
['Foo', 'Bar', 'Sna', 'Fu']
@@ -40,7 +40,7 @@ class EventTypesManagerTest(utils.BaseTestCase):
def test_list(self):
event_types = list(self.mgr.list())
expect = [
- 'GET', '/v2/event_types/'
+ 'GET', '/v2/event_types'
]
self.http_client.assert_called(*expect)
self.assertEqual(4, len(event_types))
diff --git a/ceilometerclient/v2/event_types.py b/ceilometerclient/v2/event_types.py
index 631f0b4..0f44931 100644
--- a/ceilometerclient/v2/event_types.py
+++ b/ceilometerclient/v2/event_types.py
@@ -17,7 +17,7 @@ from ceilometerclient.common import base
class EventType(base.Resource):
def __repr__(self):
- return "<Event %s>" % self._info
+ return "<EventType %s>" % self._info
def object_class_str(mgr, value, loaded):
@@ -27,4 +27,4 @@ def object_class_str(mgr, value, loaded):
class EventTypeManager(base.Manager):
def list(self):
- return self._list('/v2/event_types/', obj_class=object_class_str)
+ return self._list('/v2/event_types', obj_class=object_class_str)