openstack/tempest-lib
Code Issues Proposed changes

Merge "Change attach_id to volume_id in show_volume_attachment"

Browse Source
This commit is contained in:
Jenkins 2016-01-26 16:11:16 +00:00 committed by Gerrit Code Review
commit 5e02b7844b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tempest_lib/services/compute/servers_client.py
View File

@ -319,10 +319,10 @@ class ServersClient(rest_client.RestClient):
self.validate_response(schema.detach_volume, resp, body) self.validate_response(schema.detach_volume, resp, body)
return rest_client.ResponseBody(resp, body) return rest_client.ResponseBody(resp, body)
def show_volume_attachment(self, server_id, attach_id): def show_volume_attachment(self, server_id, volume_id):
"""Return details about the given volume attachment.""" """Return details about the given volume attachment."""
resp, body = self.get('servers/%s/os-volume_attachments/%s' % ( resp, body = self.get('servers/%s/os-volume_attachments/%s' % (
server_id, attach_id)) server_id, volume_id))
body = json.loads(body) body = json.loads(body)
self.validate_response(schema.show_volume_attachment, resp, body) self.validate_response(schema.show_volume_attachment, resp, body)
return rest_client.ResponseBody(resp, body) return rest_client.ResponseBody(resp, body)

2
tempest_lib/tests/services/compute/test_servers_client.py
View File

@ -592,7 +592,7 @@ class TestServersClient(base.BaseComputeServiceTest):
'tempest_lib.common.rest_client.RestClient.get', 'tempest_lib.common.rest_client.RestClient.get',
{'volumeAttachment': self.FAKE_COMMON_VOLUME}, {'volumeAttachment': self.FAKE_COMMON_VOLUME},
server_id=self.server_id, server_id=self.server_id,
attach_id='fake-attach-id' volume_id=self.FAKE_COMMON_VOLUME['volumeId']
) )
def test_list_volume_attachments_with_str_body(self): def test_list_volume_attachments_with_str_body(self):