Merge "Move v3 inherited_roles_client to library interface"
diff --git a/tempest/lib/services/identity/v3/endpoints_client.py b/tempest/lib/services/identity/v3/endpoints_client.py
index db30508..3bb3deb 100644
--- a/tempest/lib/services/identity/v3/endpoints_client.py
+++ b/tempest/lib/services/identity/v3/endpoints_client.py
@@ -36,7 +36,7 @@
"""Create endpoint.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#createEndpoint
+ api-ref/identity/v3/index.html#create-endpoint
"""
post_body = json.dumps({'endpoint': kwargs})
resp, body = self.post('endpoints', post_body)
@@ -48,7 +48,7 @@
"""Updates an endpoint with given parameters.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#updateEndpoint
+ api-ref/identity/v3/index.html#update-endpoint
"""
post_body = json.dumps({'endpoint': kwargs})
resp, body = self.patch('endpoints/%s' % endpoint_id, post_body)
diff --git a/tempest/lib/services/identity/v3/groups_client.py b/tempest/lib/services/identity/v3/groups_client.py
index 3674496..200cb43 100644
--- a/tempest/lib/services/identity/v3/groups_client.py
+++ b/tempest/lib/services/identity/v3/groups_client.py
@@ -30,7 +30,7 @@
"""Creates a group.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#createGroup
+ api-ref/identity/v3/index.html#create-group
"""
post_body = json.dumps({'group': kwargs})
resp, body = self.post('groups', post_body)
@@ -63,7 +63,7 @@
"""Updates a group.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#updateGroup
+ api-ref/identity/v3/index.html#update-group
"""
post_body = json.dumps({'group': kwargs})
resp, body = self.patch('groups/%s' % group_id, post_body)
diff --git a/tempest/lib/services/identity/v3/policies_client.py b/tempest/lib/services/identity/v3/policies_client.py
index f28db9a..4c1b4ae 100644
--- a/tempest/lib/services/identity/v3/policies_client.py
+++ b/tempest/lib/services/identity/v3/policies_client.py
@@ -29,7 +29,7 @@
"""Creates a Policy.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#createPolicy
+ api-ref/identity/v3/index.html#create-policy
"""
post_body = json.dumps({'policy': kwargs})
resp, body = self.post('policies', post_body)
@@ -56,7 +56,7 @@
"""Updates a policy.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#updatePolicy
+ api-ref/identity/v3/index.html#update-policy
"""
post_body = json.dumps({'policy': kwargs})
url = 'policies/%s' % policy_id
diff --git a/tempest/lib/services/identity/v3/projects_client.py b/tempest/lib/services/identity/v3/projects_client.py
index ce2f38d..ff06a19 100644
--- a/tempest/lib/services/identity/v3/projects_client.py
+++ b/tempest/lib/services/identity/v3/projects_client.py
@@ -26,7 +26,7 @@
"""Create a Project.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#createProject
+ api-ref/identity/v3/index.html#create-project
"""
# Include the project name to the kwargs parameters
@@ -50,7 +50,7 @@
"""Update a Project.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#updateProject
+ api-ref/identity/v3/index.html#update-project
"""
post_body = json.dumps({'project': kwargs})
diff --git a/tempest/lib/services/identity/v3/regions_client.py b/tempest/lib/services/identity/v3/regions_client.py
index 90dd9d7..bddfc7b 100644
--- a/tempest/lib/services/identity/v3/regions_client.py
+++ b/tempest/lib/services/identity/v3/regions_client.py
@@ -30,10 +30,7 @@
"""Create region.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#createRegion
-
- see http://developer.openstack.org/
- api-ref-identity-v3.html#createRegionWithID
+ api-ref/identity/v3/index.html#create-region
"""
if region_id is not None:
method = self.put
@@ -51,7 +48,7 @@
"""Updates a region.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#updateRegion
+ api-ref/identity/v3/index.html#update-region
"""
post_body = json.dumps({'region': kwargs})
resp, body = self.patch('regions/%s' % region_id, post_body)
diff --git a/tempest/lib/services/identity/v3/roles_client.py b/tempest/lib/services/identity/v3/roles_client.py
index e8f8a5f..2a97caf 100644
--- a/tempest/lib/services/identity/v3/roles_client.py
+++ b/tempest/lib/services/identity/v3/roles_client.py
@@ -25,7 +25,7 @@
"""Create a Role.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#createRole
+ api-ref/identity/v3/index.html#create-role
"""
post_body = json.dumps({'role': kwargs})
resp, body = self.post('roles', post_body)
@@ -55,7 +55,7 @@
"""Update a Role.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#updateRole
+ api-ref/identity/v3/index.html#update-role
"""
post_body = json.dumps({'role': kwargs})
resp, body = self.patch('roles/%s' % role_id, post_body)
diff --git a/tempest/lib/services/identity/v3/services_client.py b/tempest/lib/services/identity/v3/services_client.py
index 95caf7d..efa0d89 100644
--- a/tempest/lib/services/identity/v3/services_client.py
+++ b/tempest/lib/services/identity/v3/services_client.py
@@ -30,7 +30,7 @@
"""Updates a service.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#updateService
+ api-ref/identity/v3/index.html#update-service
"""
patch_body = json.dumps({'service': kwargs})
resp, body = self.patch('services/%s' % service_id, patch_body)
@@ -50,7 +50,7 @@
"""Creates a service.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#createService
+ api-ref/identity/v3/index.html#create-service
"""
body = json.dumps({'service': kwargs})
resp, body = self.post("services", body)
diff --git a/tempest/lib/services/identity/v3/users_client.py b/tempest/lib/services/identity/v3/users_client.py
index 0dcdacd..5398621 100644
--- a/tempest/lib/services/identity/v3/users_client.py
+++ b/tempest/lib/services/identity/v3/users_client.py
@@ -37,7 +37,7 @@
"""Updates a user.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#updateUser
+ api-ref/identity/v3/#update-user
"""
if 'id' not in kwargs:
kwargs['id'] = user_id
@@ -51,7 +51,8 @@
"""Update a user password
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#changeUserPassword
+ api-ref/identity/v3/index.html#
+ change-password-for-user
"""
update_user = json.dumps({'user': kwargs})
resp, _ = self.post('users/%s/password' % user_id, update_user)
diff --git a/tempest/lib/services/image/v2/image_members_client.py b/tempest/lib/services/image/v2/image_members_client.py
index d0ab165..941e2e3 100644
--- a/tempest/lib/services/image/v2/image_members_client.py
+++ b/tempest/lib/services/image/v2/image_members_client.py
@@ -22,7 +22,7 @@
"""List image members.
Available params: http://developer.openstack.org/
- api-ref-image-v2.html#listImageMembers-v2
+ api-ref/image/v2/#list-image-members
"""
url = 'images/%s/members' % image_id
resp, body = self.get(url)
@@ -34,7 +34,7 @@
"""Create an image member.
Available params: see http://developer.openstack.org/
- api-ref-image-v2.html#createImageMember-v2
+ api-ref/image/v2/#create-image-member
"""
url = 'images/%s/members' % image_id
data = json.dumps(kwargs)
@@ -47,7 +47,7 @@
"""Update an image member.
Available params: see http://developer.openstack.org/
- api-ref-image-v2.html#updateImageMember-v2
+ api-ref/image/v2/#update-image-member
"""
url = 'images/%s/members/%s' % (image_id, member_id)
data = json.dumps(kwargs)
@@ -60,7 +60,7 @@
"""Show an image member.
Available params: http://developer.openstack.org/
- api-ref-image-v2.html#showImageMember-v2
+ api-ref/image/v2/#show-image-member-details
"""
url = 'images/%s/members/%s' % (image_id, member_id)
resp, body = self.get(url)
@@ -71,7 +71,7 @@
"""Delete an image member.
Available params: http://developer.openstack.org/
- api-ref-image-v2.html#deleteImageMember-v2
+ api-ref/image/v2/#delete-image-member
"""
url = 'images/%s/members/%s' % (image_id, member_id)
resp, _ = self.delete(url)
diff --git a/tempest/lib/services/image/v2/images_client.py b/tempest/lib/services/image/v2/images_client.py
index 996ce94..a6016a4 100644
--- a/tempest/lib/services/image/v2/images_client.py
+++ b/tempest/lib/services/image/v2/images_client.py
@@ -31,7 +31,7 @@
"""Update an image.
Available params: see http://developer.openstack.org/
- api-ref-image-v2.html#updateImage-v2
+ api-ref/image/v2/index.html#update-an-image
"""
data = json.dumps(patch)
headers = {"Content-Type": "application/openstack-images-v2.0"
@@ -45,7 +45,7 @@
"""Create an image.
Available params: see http://developer.openstack.org/
- api-ref-image-v2.html#createImage-v2
+ api-ref/image/v2/index.html#create-an-image
"""
data = json.dumps(kwargs)
resp, body = self.post('images', data)
@@ -57,7 +57,7 @@
"""Deactivate image.
Available params: see http://developer.openstack.org/
- api-ref-image-v2.html#deactivateImage-v2
+ api-ref/image/v2/#deactivate-image
"""
url = 'images/%s/actions/deactivate' % image_id
resp, body = self.post(url, None)
@@ -68,7 +68,7 @@
"""Reactivate image.
Available params: see http://developer.openstack.org/
- api-ref-image-v2.html#reactivateImage-v2
+ api-ref/image/v2/#reactivate-image
"""
url = 'images/%s/actions/reactivate' % image_id
resp, body = self.post(url, None)
@@ -79,7 +79,7 @@
"""Delete image.
Available params: see http://developer.openstack.org/
- api-ref-image-v2.html#deleteImage-v2
+ /api-ref/image/v2/#delete-an-image
"""
url = 'images/%s' % image_id
resp, _ = self.delete(url)
@@ -90,7 +90,7 @@
"""List images.
Available params: see http://developer.openstack.org/
- api-ref-image-v2.html#listImages-v2
+ api-ref/image/v2/#show-images
"""
url = 'images'
@@ -106,7 +106,7 @@
"""Show image details.
Available params: http://developer.openstack.org/
- api-ref-image-v2.html#showImage-v2
+ api-ref/image/v2/#show-image-details
"""
url = 'images/%s' % image_id
resp, body = self.get(url)
@@ -130,7 +130,7 @@
"""Upload binary image data.
Available params: http://developer.openstack.org/
- api-ref-image-v2.html#storeImageFile-v2
+ api-ref/image/v2/#upload-binary-image-data
"""
url = 'images/%s/file' % image_id
@@ -148,7 +148,7 @@
"""Download binary image data.
Available params: http://developer.openstack.org/
- api-ref-image-v2.html#showImageFile-v2
+ api-ref/image/v2/#download-binary-image-data
"""
url = 'images/%s/file' % image_id
resp, body = self.get(url)
@@ -159,7 +159,7 @@
"""Add an image tag.
Available params: http://developer.openstack.org/
- api-ref-image-v2.html#addImageTag-v2
+ api-ref/image/v2/#add-image-tag
"""
url = 'images/%s/tags/%s' % (image_id, tag)
resp, body = self.put(url, body=None)
@@ -170,7 +170,7 @@
"""Delete an image tag.
Available params: http://developer.openstack.org/
- api-ref-image-v2.html#deleteImageTag-v2
+ api-ref/image/v2/#delete-image-tag
"""
url = 'images/%s/tags/%s' % (image_id, tag)
resp, _ = self.delete(url)
diff --git a/tempest/lib/services/image/v2/namespaces_client.py b/tempest/lib/services/image/v2/namespaces_client.py
index 5bd096d..aafa936 100644
--- a/tempest/lib/services/image/v2/namespaces_client.py
+++ b/tempest/lib/services/image/v2/namespaces_client.py
@@ -25,7 +25,7 @@
"""Create a namespace.
Available params: see http://developer.openstack.org/
- api-ref-image-v2.html#createNamespace-v2
+ api-ref/image/v2/metadefs-index.html#create-namespace
"""
data = json.dumps(kwargs)
resp, body = self.post('metadefs/namespaces', data)
@@ -34,6 +34,11 @@
return rest_client.ResponseBody(resp, body)
def show_namespace(self, namespace):
+ """Show namespace details.
+
+ Available params: see http://developer.openstack.org/
+ api-ref/image/v2/metadefs-index.html#get-namespace-details
+ """
url = 'metadefs/namespaces/%s' % namespace
resp, body = self.get(url)
self.expected_success(200, resp.status)
@@ -44,7 +49,7 @@
"""Update a namespace.
Available params: see http://developer.openstack.org/
- api-ref-image-v2.html#updateNamespace-v2
+ api-ref/image/v2/metadefs-index.html#update-namespace
"""
# NOTE: On Glance API, we need to pass namespace on both URI
# and a request body.
@@ -61,7 +66,7 @@
"""Delete a namespace.
Available params: http://developer.openstack.org/
- api-ref-image-v2.html#deleteNamespace-v2
+ api-ref/image/v2/metadefs-index.html#delete-namespace
"""
url = 'metadefs/namespaces/%s' % namespace
resp, _ = self.delete(url)
diff --git a/tempest/services/identity/v3/json/credentials_client.py b/tempest/services/identity/v3/json/credentials_client.py
index 55eeee4..c063cae 100644
--- a/tempest/services/identity/v3/json/credentials_client.py
+++ b/tempest/services/identity/v3/json/credentials_client.py
@@ -14,7 +14,7 @@
# under the License.
"""
-http://developer.openstack.org/api-ref-identity-v3.html#credentials
+http://developer.openstack.org/api-ref/identity/v3/index.html#credentials
"""
from oslo_serialization import jsonutils as json
@@ -30,7 +30,7 @@
"""Creates a credential.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#create-credential
+ api-ref/identity/v3/index.html#create-credential
"""
post_body = json.dumps({'credential': kwargs})
resp, body = self.post('credentials', post_body)
@@ -43,7 +43,7 @@
"""Updates a credential.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3.html#update-credential
+ api-ref/identity/v3/index.html#update-credential
"""
post_body = json.dumps({'credential': kwargs})
resp, body = self.patch('credentials/%s' % credential_id, post_body)
@@ -56,7 +56,8 @@
"""To GET Details of a credential.
For API details, see http://developer.openstack.org/
- api-ref-identity-v3.html#show-credential-details
+ api-ref/identity/v3/index.html#
+ show-credential-details
"""
resp, body = self.get('credentials/%s' % credential_id)
self.expected_success(200, resp.status)
diff --git a/tempest/services/identity/v3/json/trusts_client.py b/tempest/services/identity/v3/json/trusts_client.py
index dedee05..f8ca9c6 100644
--- a/tempest/services/identity/v3/json/trusts_client.py
+++ b/tempest/services/identity/v3/json/trusts_client.py
@@ -24,7 +24,7 @@
"""Creates a trust.
Available params: see http://developer.openstack.org/
- api-ref-identity-v3-ext.html#createTrust
+ api-ref/identity/v3-ext/index.html#create-trust
"""
post_body = json.dumps({'trust': kwargs})
resp, body = self.post('OS-TRUST/trusts', post_body)