diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-04-25 17:06:57 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-04-25 17:06:57 +0000 |
commit | 11fafa6527cdb3b568418871f750219c5374724d (patch) | |
tree | 53f54753b47ba281230235371f5715c918ec7f62 | |
parent | 214a6e440a45a986fe4d0aede3bcd8cd704e4ff5 (diff) | |
parent | e5cdc72459aa015b9d0277dea86243f883a9dcd3 (diff) | |
download | tempest-11fafa6527cdb3b568418871f750219c5374724d.tar.gz |
Merge "Apply a naming rule of GET to telemetry client"
-rw-r--r-- | tempest/api/telemetry/test_telemetry_alarming_api.py | 8 | ||||
-rw-r--r-- | tempest/services/telemetry/json/telemetry_client.py | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tempest/api/telemetry/test_telemetry_alarming_api.py b/tempest/api/telemetry/test_telemetry_alarming_api.py index 8bc97e8da..d106b284f 100644 --- a/tempest/api/telemetry/test_telemetry_alarming_api.py +++ b/tempest/api/telemetry/test_telemetry_alarming_api.py @@ -67,13 +67,13 @@ class TelemetryAlarmingAPITestJSON(base.BaseTelemetryTest): self.assertEqual(alarm_name, body['name']) self.assertDictContainsSubset(new_rule, body['threshold_rule']) # Get and verify details of an alarm after update - body = self.telemetry_client.get_alarm(alarm_id) + body = self.telemetry_client.show_alarm(alarm_id) self.assertEqual(alarm_name, body['name']) self.assertDictContainsSubset(new_rule, body['threshold_rule']) # Delete alarm and verify if deleted self.telemetry_client.delete_alarm(alarm_id) self.assertRaises(lib_exc.NotFound, - self.telemetry_client.get_alarm, alarm_id) + self.telemetry_client.show_alarm, alarm_id) @test.attr(type="gate") @test.idempotent_id('aca49486-70bb-4016-87e0-f6131374f741') @@ -87,7 +87,7 @@ class TelemetryAlarmingAPITestJSON(base.BaseTelemetryTest): new_state) self.assertEqual(new_state, state.data) # Get alarm state and verify - state = self.telemetry_client.alarm_get_state(alarm['alarm_id']) + state = self.telemetry_client.show_alarm_state(alarm['alarm_id']) self.assertEqual(new_state, state.data) @test.attr(type="gate") @@ -106,4 +106,4 @@ class TelemetryAlarmingAPITestJSON(base.BaseTelemetryTest): # Verify alarm delete self.telemetry_client.delete_alarm(alarm_id) self.assertRaises(lib_exc.NotFound, - self.telemetry_client.get_alarm, alarm_id) + self.telemetry_client.show_alarm, alarm_id) diff --git a/tempest/services/telemetry/json/telemetry_client.py b/tempest/services/telemetry/json/telemetry_client.py index 070309d3d..0c019084e 100644 --- a/tempest/services/telemetry/json/telemetry_client.py +++ b/tempest/services/telemetry/json/telemetry_client.py @@ -85,14 +85,14 @@ class TelemetryClientJSON(service_client.ServiceClient): uri = '%s/meters/%s' % (self.uri_prefix, meter_id) return self._helper_list(uri, query) - def get_resource(self, resource_id): + def show_resource(self, resource_id): uri = '%s/resources/%s' % (self.uri_prefix, resource_id) resp, body = self.get(uri) self.expected_success(200, resp.status) body = self.deserialize(body) return service_client.ResponseBody(resp, body) - def get_alarm(self, alarm_id): + def show_alarm(self, alarm_id): uri = '%s/alarms/%s' % (self.uri_prefix, alarm_id) resp, body = self.get(uri) self.expected_success(200, resp.status) @@ -123,7 +123,7 @@ class TelemetryClientJSON(service_client.ServiceClient): body = self.deserialize(body) return service_client.ResponseBody(resp, body) - def alarm_get_state(self, alarm_id): + def show_alarm_state(self, alarm_id): uri = "%s/alarms/%s/state" % (self.uri_prefix, alarm_id) resp, body = self.get(uri) self.expected_success(200, resp.status) |