summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgord chung <gord@live.ca>2017-01-11 23:14:10 +0000
committergord chung <gord@live.ca>2017-01-11 23:14:10 +0000
commitc93e68428dd24e5c3ac96929faf941bce1766545 (patch)
tree2c741acb03a51361336ddeaa0350390b2a8377e7
parent72ea5ef82461d12644f0be6b80ac7dd07a4a2cec (diff)
downloadpython-ceilometerclient-c93e68428dd24e5c3ac96929faf941bce1766545.tar.gz
cleanup aodh redirect
Change-Id: I80684f79da471e22dbc1dacdeafa43c6cfa334a8
-rw-r--r--ceilometerclient/v2/alarms.py6
-rw-r--r--ceilometerclient/v2/client.py2
2 files changed, 1 insertions, 7 deletions
diff --git a/ceilometerclient/v2/alarms.py b/ceilometerclient/v2/alarms.py
index 393dc09..f669624 100644
--- a/ceilometerclient/v2/alarms.py
+++ b/ceilometerclient/v2/alarms.py
@@ -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):
diff --git a/ceilometerclient/v2/client.py b/ceilometerclient/v2/client.py
index 8b672dd..e61e43f 100644
--- a/ceilometerclient/v2/client.py
+++ b/ceilometerclient/v2/client.py
@@ -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)