diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-26 16:11:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-26 16:11:16 +0000 |
| commit | 5e02b7844b0ec92b41491a873fc2909a205f4426 (patch) | |
| tree | b6ba6aa3c2382d600aea03835d24c8fde5ff66fe | |
| parent | ef27fd2d10765d48e2911e380342fc73690ce829 (diff) | |
| parent | d5e40672689ae67aabf92737ff91ad3410c98a23 (diff) | |
| download | tempest-lib-5e02b7844b0ec92b41491a873fc2909a205f4426.tar.gz | |
Merge "Change attach_id to volume_id in show_volume_attachment"
| -rw-r--r-- | tempest_lib/services/compute/servers_client.py | 4 | ||||
| -rw-r--r-- | tempest_lib/tests/services/compute/test_servers_client.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tempest_lib/services/compute/servers_client.py b/tempest_lib/services/compute/servers_client.py index 62c3900..5bbcf24 100644 --- a/tempest_lib/services/compute/servers_client.py +++ b/tempest_lib/services/compute/servers_client.py @@ -319,10 +319,10 @@ class ServersClient(rest_client.RestClient): self.validate_response(schema.detach_volume, 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.""" resp, body = self.get('servers/%s/os-volume_attachments/%s' % ( - server_id, attach_id)) + server_id, volume_id)) body = json.loads(body) self.validate_response(schema.show_volume_attachment, resp, body) return rest_client.ResponseBody(resp, body) diff --git a/tempest_lib/tests/services/compute/test_servers_client.py b/tempest_lib/tests/services/compute/test_servers_client.py index 90026c3..44cd7ce 100644 --- a/tempest_lib/tests/services/compute/test_servers_client.py +++ b/tempest_lib/tests/services/compute/test_servers_client.py @@ -592,7 +592,7 @@ class TestServersClient(base.BaseComputeServiceTest): 'tempest_lib.common.rest_client.RestClient.get', {'volumeAttachment': self.FAKE_COMMON_VOLUME}, 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): |