summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Riedemann <mriedem@us.ibm.com>2016-01-22 11:49:56 -0800
committerJordan Pittier <jordan.pittier@scality.com>2016-01-26 13:25:21 +0000
commitd5e40672689ae67aabf92737ff91ad3410c98a23 (patch)
tree5ee9bbbe222db220778e4d94af98ca9d0053fade
parent57e4d853e5039c18f860ac030d9167adba73d517 (diff)
downloadtempest-lib-d5e40672689ae67aabf92737ff91ad3410c98a23.tar.gz
Change attach_id to volume_id in show_volume_attachment
The id in the os-volume_attachments GET request is actually the volume id [1] so rename the variable so people like me aren't super confused when writing code with tempest-lib. [1] http://tinyurl.com/hl2mcwb Change-Id: Ie5454963ce931a7238e34737b638e171c69d0125
-rw-r--r--tempest_lib/services/compute/servers_client.py4
-rw-r--r--tempest_lib/tests/services/compute/test_servers_client.py2
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):