Fixes for telemetry
It could be my implementation, but I had to make these changes to get telemetry working. Service type for me is metering. If that is not always the case, maybe there should be the ability to supply multiple types or override through some mapping. Also, the v2.0 url did not work for me. Change-Id: Ia664b5d6e142a1c9f05134ccb5222451de9319a1
This commit is contained in:
parent
9855a7c4bd
commit
0db56a4566
|
@ -18,4 +18,4 @@ class TelemetryService(service_filter.ServiceFilter):
|
|||
|
||||
def __init__(self):
|
||||
"""Create a telemetry service."""
|
||||
super(TelemetryService, self).__init__(service_type='telemetry')
|
||||
super(TelemetryService, self).__init__(service_type='metering')
|
||||
|
|
|
@ -17,7 +17,7 @@ from openstack.telemetry import telemetry_service
|
|||
class Capabilities(resource.Resource):
|
||||
resource_key = 'capabilities'
|
||||
resources_key = 'capabilities'
|
||||
base_path = '/v2.0/capabilities'
|
||||
base_path = '/v2/capabilities'
|
||||
service = telemetry_service.TelemetryService()
|
||||
|
||||
# Supported Operations
|
||||
|
|
|
@ -19,7 +19,7 @@ class TestTelemetryService(testtools.TestCase):
|
|||
|
||||
def test_service(self):
|
||||
sot = telemetry_service.TelemetryService()
|
||||
self.assertEqual('telemetry', sot.service_type)
|
||||
self.assertEqual('metering', sot.service_type)
|
||||
self.assertEqual('public', sot.visibility)
|
||||
self.assertIsNone(sot.region)
|
||||
self.assertIsNone(sot.service_name)
|
||||
|
|
|
@ -26,8 +26,8 @@ class TestMeter(testtools.TestCase):
|
|||
sot = capabilities.Capabilities()
|
||||
self.assertEqual('capabilities', sot.resource_key)
|
||||
self.assertEqual('capabilities', sot.resources_key)
|
||||
self.assertEqual('/v2.0/capabilities', sot.base_path)
|
||||
self.assertEqual('telemetry', sot.service.service_type)
|
||||
self.assertEqual('/v2/capabilities', sot.base_path)
|
||||
self.assertEqual('metering', sot.service.service_type)
|
||||
self.assertFalse(sot.allow_create)
|
||||
self.assertFalse(sot.allow_retrieve)
|
||||
self.assertFalse(sot.allow_update)
|
||||
|
|
Loading…
Reference in New Issue