Remove duplicated identity v2 clients
On the commit I3c09396f36a82d484de226cfe27848b6916cb636 , we kept these clients intentionaly to avoid breaking the other gates. Now we are ready to remove them by putting patches on https://review.openstack.org/#/q/status:open+branch:master+topic:use-tempest-lib Change-Id: I769e09771e28119a19d3462b233518ba5ae7426e Depends-On: I74a5d5ed43f758b88a22ded293d85d046005d41f
This commit is contained in:
Ken'ichi Ohmichi
parent
6406a4432d
commit
20a1d1144d
|
|
@ -1,107 +0,0 @@
|
|||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from oslo_serialization import jsonutils as json
|
||||
from six.moves.urllib import parse as urllib
|
||||
|
||||
from tempest.lib.common import rest_client
|
||||
|
||||
|
||||
class RolesClient(rest_client.RestClient):
|
||||
api_version = "v2.0"
|
||||
|
||||
def create_role(self, **kwargs):
|
||||
"""Create a role.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#createRole
|
||||
"""
|
||||
post_body = json.dumps({'role': kwargs})
|
||||
resp, body = self.post('OS-KSADM/roles', post_body)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def show_role(self, role_id_or_name):
|
||||
"""Get a role by its id or name.
|
||||
|
||||
Available params: see
|
||||
http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#showRoleByID
|
||||
OR
|
||||
http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#showRoleByName
|
||||
"""
|
||||
resp, body = self.get('OS-KSADM/roles/%s' % role_id_or_name)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def list_roles(self, **params):
|
||||
"""Returns roles.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#listRoles
|
||||
"""
|
||||
url = 'OS-KSADM/roles'
|
||||
if params:
|
||||
url += '?%s' % urllib.urlencode(params)
|
||||
resp, body = self.get(url)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def delete_role(self, role_id):
|
||||
"""Delete a role.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#deleteRole
|
||||
"""
|
||||
resp, body = self.delete('OS-KSADM/roles/%s' % str(role_id))
|
||||
self.expected_success(204, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def create_user_role_on_project(self, tenant_id, user_id, role_id):
|
||||
"""Add roles to a user on a tenant.
|
||||
|
||||
Available params: see
|
||||
http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#grantRoleToUserOnTenant
|
||||
"""
|
||||
resp, body = self.put('/tenants/%s/users/%s/roles/OS-KSADM/%s' %
|
||||
(tenant_id, user_id, role_id), "")
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def list_user_roles_on_project(self, tenant_id, user_id, **params):
|
||||
"""Returns a list of roles assigned to a user for a tenant."""
|
||||
# TODO(gmann): Need to write API-ref link, Bug# 1592711
|
||||
url = '/tenants/%s/users/%s/roles' % (tenant_id, user_id)
|
||||
if params:
|
||||
url += '?%s' % urllib.urlencode(params)
|
||||
resp, body = self.get(url)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def delete_role_from_user_on_project(self, tenant_id, user_id, role_id):
|
||||
"""Removes a role assignment for a user on a tenant.
|
||||
|
||||
Available params: see
|
||||
http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#revokeRoleFromUserOnTenant
|
||||
"""
|
||||
resp, body = self.delete('/tenants/%s/users/%s/roles/OS-KSADM/%s' %
|
||||
(tenant_id, user_id, role_id))
|
||||
self.expected_success(204, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
# Copyright 2015 Red Hat, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from oslo_serialization import jsonutils as json
|
||||
from six.moves.urllib import parse as urllib
|
||||
|
||||
from tempest.lib.common import rest_client
|
||||
|
||||
|
||||
class TenantsClient(rest_client.RestClient):
|
||||
api_version = "v2.0"
|
||||
|
||||
def create_tenant(self, **kwargs):
|
||||
"""Create a tenant
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#createTenant
|
||||
"""
|
||||
post_body = json.dumps({'tenant': kwargs})
|
||||
resp, body = self.post('tenants', post_body)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def delete_tenant(self, tenant_id):
|
||||
"""Delete a tenant.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#deleteTenant
|
||||
"""
|
||||
resp, body = self.delete('tenants/%s' % str(tenant_id))
|
||||
self.expected_success(204, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def show_tenant(self, tenant_id):
|
||||
"""Get tenant details.
|
||||
|
||||
Available params: see
|
||||
http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#admin-showTenantById
|
||||
"""
|
||||
resp, body = self.get('tenants/%s' % str(tenant_id))
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def list_tenants(self, **params):
|
||||
"""Returns tenants.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#admin-listTenants
|
||||
"""
|
||||
url = 'tenants'
|
||||
if params:
|
||||
url += '?%s' % urllib.urlencode(params)
|
||||
resp, body = self.get(url)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def update_tenant(self, tenant_id, **kwargs):
|
||||
"""Updates a tenant.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#updateTenant
|
||||
"""
|
||||
if 'id' not in kwargs:
|
||||
kwargs['id'] = tenant_id
|
||||
post_body = json.dumps({'tenant': kwargs})
|
||||
resp, body = self.post('tenants/%s' % tenant_id, post_body)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def list_tenant_users(self, tenant_id, **params):
|
||||
"""List users for a Tenant.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#listUsersForTenant
|
||||
"""
|
||||
url = '/tenants/%s/users' % tenant_id
|
||||
if params:
|
||||
url += '?%s' % urllib.urlencode(params)
|
||||
resp, body = self.get(url)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
|
@ -1,152 +0,0 @@
|
|||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from oslo_serialization import jsonutils as json
|
||||
from six.moves.urllib import parse as urllib
|
||||
|
||||
from tempest.lib.common import rest_client
|
||||
|
||||
|
||||
class UsersClient(rest_client.RestClient):
|
||||
api_version = "v2.0"
|
||||
|
||||
def create_user(self, **kwargs):
|
||||
"""Create a user.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-admin-v2.html#admin-createUser
|
||||
"""
|
||||
post_body = json.dumps({'user': kwargs})
|
||||
resp, body = self.post('users', post_body)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def update_user(self, user_id, **kwargs):
|
||||
"""Updates a user.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-admin-v2.html#admin-updateUser
|
||||
"""
|
||||
put_body = json.dumps({'user': kwargs})
|
||||
resp, body = self.put('users/%s' % user_id, put_body)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def show_user(self, user_id):
|
||||
"""GET a user.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-admin-v2.html#admin-showUser
|
||||
"""
|
||||
resp, body = self.get("users/%s" % user_id)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def delete_user(self, user_id):
|
||||
"""Delete a user.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-admin-v2.html#admin-deleteUser
|
||||
"""
|
||||
resp, body = self.delete("users/%s" % user_id)
|
||||
self.expected_success(204, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def list_users(self, **params):
|
||||
"""Get the list of users.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-admin-v2.html#admin-listUsers
|
||||
"""
|
||||
url = "users"
|
||||
if params:
|
||||
url += '?%s' % urllib.urlencode(params)
|
||||
resp, body = self.get(url)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def update_user_enabled(self, user_id, **kwargs):
|
||||
"""Enables or disables a user.
|
||||
|
||||
Available params: see http://developer.openstack.org/
|
||||
api-ref-identity-v2-ext.html#enableUser
|
||||
"""
|
||||
# NOTE: The URL (users/<id>/enabled) is different from the api-site
|
||||
# one (users/<id>/OS-KSADM/enabled) , but they are the same API
|
||||
# because of the fact that in keystone/contrib/admin_crud/core.py
|
||||
# both api use same action='set_user_enabled'
|
||||
put_body = json.dumps({'user': kwargs})
|
||||
resp, body = self.put('users/%s/enabled' % user_id, put_body)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def update_user_password(self, user_id, **kwargs):
|
||||
"""Update User Password."""
|
||||
# TODO(piyush): Current api-site doesn't contain this API description.
|
||||
# After fixing the api-site, we need to fix here also for putting the
|
||||
# link to api-site.
|
||||
# LP: https://bugs.launchpad.net/openstack-api-site/+bug/1524147
|
||||
put_body = json.dumps({'user': kwargs})
|
||||
resp, body = self.put('users/%s/OS-KSADM/password' % user_id, put_body)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def update_user_own_password(self, user_id, **kwargs):
|
||||
"""User updates own password"""
|
||||
# TODO(piyush): Current api-site doesn't contain this API description.
|
||||
# After fixing the api-site, we need to fix here also for putting the
|
||||
# link to api-site.
|
||||
# LP: https://bugs.launchpad.net/openstack-api-site/+bug/1524153
|
||||
# NOTE: This API is used for updating user password by itself.
|
||||
# Ref: http://lists.openstack.org/pipermail/openstack-dev/2015-December
|
||||
# /081803.html
|
||||
patch_body = json.dumps({'user': kwargs})
|
||||
resp, body = self.patch('OS-KSCRUD/users/%s' % user_id, patch_body)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def create_user_ec2_credential(self, user_id, **kwargs):
|
||||
# TODO(piyush): Current api-site doesn't contain this API description.
|
||||
# After fixing the api-site, we need to fix here also for putting the
|
||||
# link to api-site.
|
||||
post_body = json.dumps(kwargs)
|
||||
resp, body = self.post('/users/%s/credentials/OS-EC2' % user_id,
|
||||
post_body)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def delete_user_ec2_credential(self, user_id, access):
|
||||
resp, body = self.delete('/users/%s/credentials/OS-EC2/%s' %
|
||||
(user_id, access))
|
||||
self.expected_success(204, resp.status)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def list_user_ec2_credentials(self, user_id):
|
||||
resp, body = self.get('/users/%s/credentials/OS-EC2' % user_id)
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def show_user_ec2_credential(self, user_id, access):
|
||||
resp, body = self.get('/users/%s/credentials/OS-EC2/%s' %
|
||||
(user_id, access))
|
||||
self.expected_success(200, resp.status)
|
||||
body = json.loads(body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
Loading…
Reference in New Issue