Rename mathods of v1 image_members_client
v2 image_members_client contains create_image_member() and
delete_image_member() and these method names are based
http://specs.openstack.org/openstack/qa-specs/specs/tempest/consistent-service-method-names.html
This patch renames v1's one also for the same methods.
Partially implements blueprint consistent-service-method-names
Change-Id: I547be28c45d69fa0628bb2c7278a3d1f6912c674
diff --git a/tempest/api/image/v1/test_image_members.py b/tempest/api/image/v1/test_image_members.py
index 0bad96a..94edb6c 100644
--- a/tempest/api/image/v1/test_image_members.py
+++ b/tempest/api/image/v1/test_image_members.py
@@ -22,7 +22,7 @@
@test.idempotent_id('1d6ef640-3a20-4c84-8710-d95828fdb6ad')
def test_add_image_member(self):
image = self._create_image()
- self.image_member_client.add_member(self.alt_tenant_id, image)
+ self.image_member_client.create_image_member(image, self.alt_tenant_id)
body = self.image_member_client.list_image_members(image)
members = body['members']
members = map(lambda x: x['member_id'], members)
@@ -33,9 +33,10 @@
@test.idempotent_id('6a5328a5-80e8-4b82-bd32-6c061f128da9')
def test_get_shared_images(self):
image = self._create_image()
- self.image_member_client.add_member(self.alt_tenant_id, image)
+ self.image_member_client.create_image_member(image, self.alt_tenant_id)
share_image = self._create_image()
- self.image_member_client.add_member(self.alt_tenant_id, share_image)
+ self.image_member_client.create_image_member(share_image,
+ self.alt_tenant_id)
body = self.image_member_client.list_shared_images(
self.alt_tenant_id)
images = body['shared_images']
@@ -46,8 +47,10 @@
@test.idempotent_id('a76a3191-8948-4b44-a9d6-4053e5f2b138')
def test_remove_member(self):
image_id = self._create_image()
- self.image_member_client.add_member(self.alt_tenant_id, image_id)
- self.image_member_client.delete_member(self.alt_tenant_id, image_id)
+ self.image_member_client.create_image_member(image_id,
+ self.alt_tenant_id)
+ self.image_member_client.delete_image_member(image_id,
+ self.alt_tenant_id)
body = self.image_member_client.list_image_members(image_id)
members = body['members']
self.assertEqual(0, len(members), str(members))
diff --git a/tempest/api/image/v1/test_image_members_negative.py b/tempest/api/image/v1/test_image_members_negative.py
index d46a836..2538781 100644
--- a/tempest/api/image/v1/test_image_members_negative.py
+++ b/tempest/api/image/v1/test_image_members_negative.py
@@ -26,8 +26,8 @@
# Add member with non existing image.
non_exist_image = data_utils.rand_uuid()
self.assertRaises(lib_exc.NotFound,
- self.image_member_client.add_member,
- self.alt_tenant_id, non_exist_image)
+ self.image_member_client.create_image_member,
+ non_exist_image, self.alt_tenant_id)
@test.attr(type=['negative'])
@test.idempotent_id('e1559f05-b667-4f1b-a7af-518b52dc0c0f')
@@ -35,8 +35,8 @@
# Delete member with non existing image.
non_exist_image = data_utils.rand_uuid()
self.assertRaises(lib_exc.NotFound,
- self.image_member_client.delete_member,
- self.alt_tenant_id, non_exist_image)
+ self.image_member_client.delete_image_member,
+ non_exist_image, self.alt_tenant_id)
@test.attr(type=['negative'])
@test.idempotent_id('f5720333-dd69-4194-bb76-d2f048addd56')
@@ -45,8 +45,8 @@
image_id = self._create_image()
non_exist_tenant = data_utils.rand_uuid_hex()
self.assertRaises(lib_exc.NotFound,
- self.image_member_client.delete_member,
- non_exist_tenant, image_id)
+ self.image_member_client.delete_image_member,
+ image_id, non_exist_tenant)
@test.attr(type=['negative'])
@test.idempotent_id('f25f89e4-0b6c-453b-a853-1f80b9d7ef26')
diff --git a/tempest/services/image/v1/json/image_members_client.py b/tempest/services/image/v1/json/image_members_client.py
index df16d2fd..e7fa0c9 100644
--- a/tempest/services/image/v1/json/image_members_client.py
+++ b/tempest/services/image/v1/json/image_members_client.py
@@ -39,7 +39,7 @@
body = json.loads(body)
return rest_client.ResponseBody(resp, body)
- def add_member(self, member_id, image_id, **kwargs):
+ def create_image_member(self, image_id, member_id, **kwargs):
"""Add a member to an image.
Available params: see http://developer.openstack.org/
@@ -51,7 +51,7 @@
self.expected_success(204, resp.status)
return rest_client.ResponseBody(resp)
- def delete_member(self, member_id, image_id):
+ def delete_image_member(self, image_id, member_id):
"""Removes a membership from the image.
Available params: see http://developer.openstack.org/