From cd11187e07ba0f0b10a76fda9aa9df0e873fe232 Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Mon, 16 Nov 2015 06:01:11 +0000 Subject: [PATCH] Rename get_server_group to show_server_group [GET /resources] methods should be "list_s" or "show_", so this patch applies the rule to server_group client. Partially implements blueprint consistent-service-method-names Change-Id: I75307176c2f032301da6227249070c42af54dd6e --- tempest/api/compute/servers/test_create_server.py | 2 +- tempest/api/compute/servers/test_server_group.py | 4 ++-- tempest/api_schema/response/compute/v2_1/servers.py | 2 +- .../services/compute/json/server_groups_client.py | 6 +++--- .../services/compute/test_server_groups_client.py | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tempest/api/compute/servers/test_create_server.py b/tempest/api/compute/servers/test_create_server.py index 902b72cec8..f51c2db98b 100644 --- a/tempest/api/compute/servers/test_create_server.py +++ b/tempest/api/compute/servers/test_create_server.py @@ -150,7 +150,7 @@ class ServersTestJSON(base.BaseV2ComputeTest): wait_until='ACTIVE') # Check a server is in the group - server_group = (self.server_groups_client.get_server_group(group_id) + server_group = (self.server_groups_client.show_server_group(group_id) ['server_group']) self.assertIn(server['id'], server_group['members']) diff --git a/tempest/api/compute/servers/test_server_group.py b/tempest/api/compute/servers/test_server_group.py index 0da7912ad2..9a04556073 100644 --- a/tempest/api/compute/servers/test_server_group.py +++ b/tempest/api/compute/servers/test_server_group.py @@ -104,9 +104,9 @@ class ServerGroupTestJSON(base.BaseV2ComputeTest): self._delete_server_group(server_groups[i]) @test.idempotent_id('b3545034-dd78-48f0-bdc2-a4adfa6d0ead') - def test_get_server_group(self): + def test_show_server_group(self): # Get the server-group - body = self.client.get_server_group( + body = self.client.show_server_group( self.created_server_group['id'])['server_group'] self.assertEqual(self.created_server_group, body) diff --git a/tempest/api_schema/response/compute/v2_1/servers.py b/tempest/api_schema/response/compute/v2_1/servers.py index 44ab9e9baa..9593f3c2ba 100644 --- a/tempest/api_schema/response/compute/v2_1/servers.py +++ b/tempest/api_schema/response/compute/v2_1/servers.py @@ -351,7 +351,7 @@ common_server_group = { 'required': ['id', 'name', 'policies', 'members', 'metadata'] } -create_get_server_group = { +create_show_server_group = { 'status_code': [200], 'response_body': { 'type': 'object', diff --git a/tempest/services/compute/json/server_groups_client.py b/tempest/services/compute/json/server_groups_client.py index 62258d3bb9..7284e022fd 100644 --- a/tempest/services/compute/json/server_groups_client.py +++ b/tempest/services/compute/json/server_groups_client.py @@ -32,7 +32,7 @@ class ServerGroupsClient(service_client.ServiceClient): resp, body = self.post('os-server-groups', post_body) body = json.loads(body) - self.validate_response(schema.create_get_server_group, resp, body) + self.validate_response(schema.create_show_server_group, resp, body) return service_client.ResponseBody(resp, body) def delete_server_group(self, server_group_id): @@ -48,9 +48,9 @@ class ServerGroupsClient(service_client.ServiceClient): self.validate_response(schema.list_server_groups, resp, body) return service_client.ResponseBody(resp, body) - def get_server_group(self, server_group_id): + def show_server_group(self, server_group_id): """Get the details of given server_group.""" resp, body = self.get("os-server-groups/%s" % server_group_id) body = json.loads(body) - self.validate_response(schema.create_get_server_group, resp, body) + self.validate_response(schema.create_show_server_group, resp, body) return service_client.ResponseBody(resp, body) diff --git a/tempest/tests/services/compute/test_server_groups_client.py b/tempest/tests/services/compute/test_server_groups_client.py index 5e058d69d2..e531e2ff4e 100644 --- a/tempest/tests/services/compute/test_server_groups_client.py +++ b/tempest/tests/services/compute/test_server_groups_client.py @@ -69,16 +69,16 @@ class TestServerGroupsClient(base.BaseComputeServiceTest): def test_list_server_groups_byte_body(self): self._test_list_server_groups(bytes_body=True) - def _test_get_server_group(self, bytes_body=False): + def _test_show_server_group(self, bytes_body=False): expected = {"server_group": TestServerGroupsClient.server_group} self.check_service_client_function( - self.client.get_server_group, + self.client.show_server_group, 'tempest.common.service_client.ServiceClient.get', expected, bytes_body, server_group_id='5bbcc3c4-1da2-4437-a48a-66f15b1b13f9') - def test_get_server_group_str_body(self): - self._test_get_server_group(bytes_body=False) + def test_show_server_group_str_body(self): + self._test_show_server_group(bytes_body=False) - def test_get_server_group_byte_body(self): - self._test_get_server_group(bytes_body=True) + def test_show_server_group_byte_body(self): + self._test_show_server_group(bytes_body=True)