Merge "Verify server list_addresses V2/V3 APIs attributes"

This commit is contained in:
Jenkins 2014-06-02 06:25:05 +00:00 committed by Gerrit Code Review
commit 3382326781
4 changed files with 24 additions and 0 deletions

View File

@ -131,3 +131,14 @@ list_addresses_by_network = {
server_actions_confirm_resize = copy.deepcopy(
servers.server_actions_delete_password)
list_addresses = {
'status_code': [200],
'response_body': {
'type': 'object',
'properties': {
'addresses': parameter_types.addresses
},
'required': ['addresses']
}
}

View File

@ -84,3 +84,14 @@ list_addresses_by_network = {
server_actions_change_password = copy.deepcopy(
servers.server_actions_delete_password)
list_addresses = {
'status_code': [200],
'response_body': {
'type': 'object',
'properties': {
'addresses': addresses_v3
},
'required': ['addresses']
}
}

View File

@ -193,6 +193,7 @@ class ServersClientJSON(rest_client.RestClient):
"""Lists all addresses for a server."""
resp, body = self.get("servers/%s/ips" % str(server_id))
body = json.loads(body)
self.validate_response(schema.list_addresses, resp, body)
return resp, body['addresses']
def list_addresses_by_network(self, server_id, network_id):

View File

@ -193,6 +193,7 @@ class ServersV3ClientJSON(rest_client.RestClient):
"""Lists all addresses for a server."""
resp, body = self.get("servers/%s/ips" % str(server_id))
body = json.loads(body)
self.validate_response(schema.list_addresses, resp, body)
return resp, body['addresses']
def list_addresses_by_network(self, server_id, network_id):