diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-23 11:02:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-23 11:02:15 +0000 |
| commit | 658d7e27ff8472f45cf8018df9f175da1bd4ec74 (patch) | |
| tree | 0ce50f1d30d9fb3776d02a3ad8dd2e65b04a3235 | |
| parent | e60757c258f6c5cb88e7c552aa3afcb557734d2b (diff) | |
| parent | c93e68428dd24e5c3ac96929faf941bce1766545 (diff) | |
| download | python-ceilometerclient-658d7e27ff8472f45cf8018df9f175da1bd4ec74.tar.gz | |
Merge "cleanup aodh redirect"2.8.0
| -rw-r--r-- | ceilometerclient/v2/alarms.py | 6 | ||||
| -rw-r--r-- | ceilometerclient/v2/client.py | 2 |
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) |