openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "cleanup aodh redirect"

Browse Source
This commit is contained in:
Jenkins
2017-01-23 11:02:15 +00:00
committed by Gerrit Code Review
parent e60757c258 c93e68428d
commit 658d7e27ff
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometerclient/v2/alarms.py
View File

@@ -70,13 +70,7 @@ class AlarmChange(base.Resource):
class AlarmManager(base.Manager):
resource_class = Alarm
def __init__(self, api, aodh_enabled=False):
self.aodh_enabled = aodh_enabled
super(AlarmManager, self).__init__(api)
def _path(self, id=None):
# TODO(liusheng) if aodh will only have v1 api, we need to change
# following path if aodh enabled (self.aodh_enabled)
return '/v2/alarms/%s' % id if id else '/v2/alarms'
def list(self, q=None):

2
ceilometerclient/v2/client.py
View File

@@ -78,7 +78,7 @@ class Client(object):
self.new_samples = samples.SampleManager(self.http_client)
self.statistics = statistics.StatisticsManager(self.http_client)
self.resources = resources.ResourceManager(self.http_client)
self.alarms = alarms.AlarmManager(self.alarm_client, aodh_enabled)
self.alarms = alarms.AlarmManager(self.alarm_client)
self.events = events.EventManager(self.event_client)
self.event_types = event_types.EventTypeManager(self.event_client)
self.traits = traits.TraitManager(self.event_client)