Remove identity v2 to v3 test case
Since v2.0 identity api had been removed[1], these tests are no longer needed. [1]https://review.openstack.org/#/c/499783/ Change-Id: Iba1bd2e16fd5d0e816cf495ed10d5d82d8fe8038
This commit is contained in:
Guo Shan
parent
8e61136eff
commit
aeeac733b4
|
|
@ -23,7 +23,6 @@ from oslo_log import log
|
|||
from six.moves import http_client
|
||||
from testtools import matchers
|
||||
|
||||
from keystone.common import controller
|
||||
from keystone.common import sql
|
||||
import keystone.conf
|
||||
from keystone.credential.providers import fernet as credential_fernet
|
||||
|
|
@ -693,109 +692,6 @@ class IdentityTestCase(test_v3.RestfulTestCase):
|
|||
expected_status=http_client.BAD_REQUEST)
|
||||
|
||||
|
||||
class IdentityV3toV2MethodsTestCase(unit.TestCase):
|
||||
"""Test users V3 to V2 conversion methods."""
|
||||
|
||||
def new_user_ref(self, **kwargs):
|
||||
"""Construct a bare bones user ref.
|
||||
|
||||
Omits all optional components.
|
||||
"""
|
||||
ref = unit.new_user_ref(**kwargs)
|
||||
# description is already omitted
|
||||
del ref['email']
|
||||
del ref['enabled']
|
||||
del ref['password']
|
||||
return ref
|
||||
|
||||
def setUp(self):
|
||||
super(IdentityV3toV2MethodsTestCase, self).setUp()
|
||||
self.load_backends()
|
||||
user_id = uuid.uuid4().hex
|
||||
project_id = uuid.uuid4().hex
|
||||
|
||||
# User with only default_project_id in ref
|
||||
self.user1 = self.new_user_ref(
|
||||
id=user_id,
|
||||
name=user_id,
|
||||
project_id=project_id,
|
||||
domain_id=CONF.identity.default_domain_id)
|
||||
# User without default_project_id or tenantId in ref
|
||||
self.user2 = self.new_user_ref(
|
||||
id=user_id,
|
||||
name=user_id,
|
||||
domain_id=CONF.identity.default_domain_id)
|
||||
# User with both tenantId and default_project_id in ref
|
||||
self.user3 = self.new_user_ref(
|
||||
id=user_id,
|
||||
name=user_id,
|
||||
project_id=project_id,
|
||||
tenantId=project_id,
|
||||
domain_id=CONF.identity.default_domain_id)
|
||||
# User with only tenantId in ref
|
||||
self.user4 = self.new_user_ref(
|
||||
id=user_id,
|
||||
name=user_id,
|
||||
tenantId=project_id,
|
||||
domain_id=CONF.identity.default_domain_id)
|
||||
# User with password_expires_at
|
||||
self.user5 = self.new_user_ref(
|
||||
id=user_id,
|
||||
name=user_id,
|
||||
project_id=project_id,
|
||||
domain_id=CONF.identity.default_domain_id,
|
||||
password_expires_at=None)
|
||||
|
||||
# Expected result if the user is meant to have a tenantId element
|
||||
self.expected_user = {'id': user_id,
|
||||
'name': user_id,
|
||||
'username': user_id,
|
||||
'tenantId': project_id}
|
||||
|
||||
# Expected result if the user is not meant to have a tenantId element
|
||||
self.expected_user_no_tenant_id = {'id': user_id,
|
||||
'name': user_id,
|
||||
'username': user_id}
|
||||
|
||||
def test_v3_to_v2_user_method(self):
|
||||
|
||||
updated_user1 = controller.V2Controller.v3_to_v2_user(self.user1)
|
||||
self.assertIs(self.user1, updated_user1)
|
||||
self.assertDictEqual(self.expected_user, self.user1)
|
||||
updated_user2 = controller.V2Controller.v3_to_v2_user(self.user2)
|
||||
self.assertIs(self.user2, updated_user2)
|
||||
self.assertDictEqual(self.expected_user_no_tenant_id, self.user2)
|
||||
updated_user3 = controller.V2Controller.v3_to_v2_user(self.user3)
|
||||
self.assertIs(self.user3, updated_user3)
|
||||
self.assertDictEqual(self.expected_user, self.user3)
|
||||
updated_user4 = controller.V2Controller.v3_to_v2_user(self.user4)
|
||||
self.assertIs(self.user4, updated_user4)
|
||||
self.assertDictEqual(self.expected_user_no_tenant_id, self.user4)
|
||||
# password_expires_at filter test
|
||||
password_expires_at_key = 'password_expires_at'
|
||||
self.assertIn(password_expires_at_key, self.user5)
|
||||
updated_user5 = controller.V2Controller.v3_to_v2_user(self.user5)
|
||||
self.assertIs(self.user5, updated_user5)
|
||||
self.assertNotIn(password_expires_at_key, updated_user5)
|
||||
|
||||
def test_v3_to_v2_user_method_list(self):
|
||||
user_list = [self.user1, self.user2, self.user3, self.user4,
|
||||
self.user5]
|
||||
updated_list = controller.V2Controller.v3_to_v2_user(user_list)
|
||||
|
||||
self.assertEqual(len(user_list), len(updated_list))
|
||||
|
||||
for i, ref in enumerate(updated_list):
|
||||
# Order should not change.
|
||||
self.assertIs(ref, user_list[i])
|
||||
self.assertNotIn('password_expires_at', user_list[i])
|
||||
|
||||
self.assertDictEqual(self.expected_user, self.user1)
|
||||
self.assertDictEqual(self.expected_user_no_tenant_id, self.user2)
|
||||
self.assertDictEqual(self.expected_user, self.user3)
|
||||
self.assertDictEqual(self.expected_user_no_tenant_id, self.user4)
|
||||
|
||||
|
||||
class ChangePasswordTestCase(test_v3.RestfulTestCase):
|
||||
|
||||
def setUp(self):
|
||||
|
|
|
|||
Loading…
Reference in New Issue