Rename get_server_group to show_server_group
[GET /resources] methods should be "list_<resource name>s" or "show_<resource name>", so this patch applies the rule to server_group client. Partially implements blueprint consistent-service-method-names Change-Id: I75307176c2f032301da6227249070c42af54dd6e
This commit is contained in:
parent
f8512379dc
commit
cd11187e07
@ -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'])
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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',
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user