diff options
Diffstat (limited to 'keystone-moon/keystone/tests')
| -rw-r--r-- | keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py | 62 |
1 files changed, 36 insertions, 26 deletions
diff --git a/keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py b/keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py index d122b25b..6d656488 100644 --- a/keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py +++ b/keystone-moon/keystone/tests/moon/unit/test_unit_core_tenant.py @@ -13,6 +13,7 @@ from keystone.tests.unit.ksfixtures import database from keystone.contrib.moon.exception import * from keystone.tests.unit import default_fixtures from keystone.contrib.moon.core import LogManager +from keystone.contrib.moon.core import ConfigurationManager from keystone.contrib.moon.core import ADMIN_ID from keystone.common import dependency @@ -31,6 +32,7 @@ IE = { @dependency.requires('admin_api') class TestTenantManager(tests.TestCase): + ADMIN_ID = None def setUp(self): self.useFixture(database.Database()) @@ -39,8 +41,13 @@ class TestTenantManager(tests.TestCase): self.load_fixtures(default_fixtures) self.admin = self.create_user(username="admin") self.demo = self.create_user(username="demo") - self.manager = TenantManager() self.root_intra_extension = self.create_intra_extension(policy_model="policy_root") + # force re-initialization of the ADMIN_ID variable + from keystone.contrib.moon.core import ADMIN_ID + self.ADMIN_ID = ADMIN_ID + self.manager = TenantManager() + self.configuration_api = ConfigurationManager() + # self.configuration_api.init_default_variables() def load_extra_backends(self): return { @@ -74,7 +81,10 @@ class TestTenantManager(tests.TestCase): if "authz" in policy_model: genre = "authz" IE["genre"] = genre - ref = self.admin_api.load_intra_extension_dict(ADMIN_ID, intra_extension_dict=IE) + # force re-initialization of the ADMIN_ID variable + from keystone.contrib.moon.core import ADMIN_ID + self.ADMIN_ID = ADMIN_ID + ref = self.admin_api.load_intra_extension_dict(self.ADMIN_ID, intra_extension_dict=IE) self.assertIsInstance(ref, dict) return ref @@ -88,16 +98,16 @@ class TestTenantManager(tests.TestCase): "intra_authz_extension": authz_intra_extension['id'], "intra_admin_extension": admin_intra_extension['id'], } - data = self.manager.add_tenant_dict(user_id=ADMIN_ID, tenant_dict=new_tenant) + data = self.manager.add_tenant_dict(user_id=self.ADMIN_ID, tenant_dict=new_tenant) self.assertEquals(new_tenant["id"], data["id"]) self.assertEquals(new_tenant["name"], data['tenant']["name"]) self.assertEquals(new_tenant["intra_authz_extension"], data['tenant']["intra_authz_extension"]) self.assertEquals(new_tenant["intra_admin_extension"], data['tenant']["intra_admin_extension"]) - data = self.manager.get_tenants_dict(ADMIN_ID) + data = self.manager.get_tenants_dict(self.ADMIN_ID) self.assertNotEqual(data, {}) - data = self.admin_api.get_intra_extension_dict(ADMIN_ID, new_tenant["intra_authz_extension"]) + data = self.admin_api.get_intra_extension_dict(self.ADMIN_ID, new_tenant["intra_authz_extension"]) self.assertEquals(new_tenant["intra_authz_extension"], data["id"]) - data = self.admin_api.get_intra_extension_dict(ADMIN_ID, new_tenant["intra_admin_extension"]) + data = self.admin_api.get_intra_extension_dict(self.ADMIN_ID, new_tenant["intra_admin_extension"]) self.assertEquals(new_tenant["intra_admin_extension"], data["id"]) def test_del_tenant(self): @@ -110,15 +120,15 @@ class TestTenantManager(tests.TestCase): "intra_authz_extension": authz_intra_extension['id'], "intra_admin_extension": admin_intra_extension['id'], } - data = self.manager.add_tenant_dict(user_id=ADMIN_ID, tenant_dict=new_tenant) + data = self.manager.add_tenant_dict(user_id=self.ADMIN_ID, tenant_dict=new_tenant) self.assertEquals(new_tenant["id"], data["id"]) self.assertEquals(new_tenant["name"], data['tenant']["name"]) self.assertEquals(new_tenant["intra_authz_extension"], data['tenant']["intra_authz_extension"]) self.assertEquals(new_tenant["intra_admin_extension"], data['tenant']["intra_admin_extension"]) - data = self.manager.get_tenants_dict(ADMIN_ID) + data = self.manager.get_tenants_dict(self.ADMIN_ID) self.assertNotEqual(data, {}) - self.manager.del_tenant(ADMIN_ID, new_tenant["id"]) - data = self.manager.get_tenants_dict(ADMIN_ID) + self.manager.del_tenant(self.ADMIN_ID, new_tenant["id"]) + data = self.manager.get_tenants_dict(self.ADMIN_ID) self.assertEqual(data, {}) def test_set_tenant(self): @@ -131,25 +141,25 @@ class TestTenantManager(tests.TestCase): "intra_authz_extension": authz_intra_extension['id'], "intra_admin_extension": admin_intra_extension['id'], } - data = self.manager.add_tenant_dict(user_id=ADMIN_ID, tenant_dict=new_tenant) + data = self.manager.add_tenant_dict(user_id=self.ADMIN_ID, tenant_dict=new_tenant) self.assertEquals(new_tenant["id"], data["id"]) self.assertEquals(new_tenant["name"], data['tenant']["name"]) self.assertEquals(new_tenant["intra_authz_extension"], data['tenant']["intra_authz_extension"]) self.assertEquals(new_tenant["intra_admin_extension"], data['tenant']["intra_admin_extension"]) - data = self.manager.get_tenants_dict(ADMIN_ID) + data = self.manager.get_tenants_dict(self.ADMIN_ID) self.assertNotEqual(data, {}) new_tenant["name"] = "demo2" - data = self.manager.set_tenant_dict(user_id=ADMIN_ID, tenant_id=new_tenant["id"], tenant_dict=new_tenant) + data = self.manager.set_tenant_dict(user_id=self.ADMIN_ID, tenant_id=new_tenant["id"], tenant_dict=new_tenant) self.assertEquals(new_tenant["id"], data["id"]) self.assertEquals(new_tenant["name"], data['tenant']["name"]) self.assertEquals(new_tenant["intra_authz_extension"], data['tenant']["intra_authz_extension"]) self.assertEquals(new_tenant["intra_admin_extension"], data['tenant']["intra_admin_extension"]) def test_exception_tenant_unknown(self): - self.assertRaises(TenantUnknown, self.manager.get_tenant_dict, ADMIN_ID, uuid.uuid4().hex) - self.assertRaises(TenantUnknown, self.manager.del_tenant, ADMIN_ID, uuid.uuid4().hex) - self.assertRaises(TenantUnknown, self.manager.set_tenant_dict, ADMIN_ID, uuid.uuid4().hex, {}) + self.assertRaises(TenantUnknown, self.manager.get_tenant_dict, self.ADMIN_ID, uuid.uuid4().hex) + self.assertRaises(TenantUnknown, self.manager.del_tenant, self.ADMIN_ID, uuid.uuid4().hex) + self.assertRaises(TenantUnknown, self.manager.set_tenant_dict, self.ADMIN_ID, uuid.uuid4().hex, {}) authz_intra_extension = self.create_intra_extension(policy_model="policy_authz") admin_intra_extension = self.create_intra_extension(policy_model="policy_admin") @@ -160,15 +170,15 @@ class TestTenantManager(tests.TestCase): "intra_authz_extension": authz_intra_extension['id'], "intra_admin_extension": admin_intra_extension['id'], } - data = self.manager.add_tenant_dict(user_id=ADMIN_ID, tenant_dict=new_tenant) + data = self.manager.add_tenant_dict(user_id=self.ADMIN_ID, tenant_dict=new_tenant) self.assertEquals(new_tenant["id"], data["id"]) self.assertEquals(new_tenant["name"], data['tenant']["name"]) self.assertEquals(new_tenant["intra_authz_extension"], data['tenant']["intra_authz_extension"]) self.assertEquals(new_tenant["intra_admin_extension"], data['tenant']["intra_admin_extension"]) - data = self.manager.get_tenants_dict(ADMIN_ID) + data = self.manager.get_tenants_dict(self.ADMIN_ID) self.assertNotEqual(data, {}) - self.assertRaises(TenantUnknown, self.manager.get_tenant_dict, ADMIN_ID, uuid.uuid4().hex) + self.assertRaises(TenantUnknown, self.manager.get_tenant_dict, self.ADMIN_ID, uuid.uuid4().hex) def test_exception_tenant_added_name_existing(self): authz_intra_extension = self.create_intra_extension(policy_model="policy_authz") @@ -180,15 +190,15 @@ class TestTenantManager(tests.TestCase): "intra_authz_extension": authz_intra_extension['id'], "intra_admin_extension": admin_intra_extension['id'], } - data = self.manager.add_tenant_dict(user_id=ADMIN_ID, tenant_dict=new_tenant) + data = self.manager.add_tenant_dict(user_id=self.ADMIN_ID, tenant_dict=new_tenant) self.assertEquals(new_tenant["id"], data["id"]) self.assertEquals(new_tenant["name"], data['tenant']["name"]) self.assertEquals(new_tenant["intra_authz_extension"], data['tenant']["intra_authz_extension"]) self.assertEquals(new_tenant["intra_admin_extension"], data['tenant']["intra_admin_extension"]) - data = self.manager.get_tenants_dict(ADMIN_ID) + data = self.manager.get_tenants_dict(self.ADMIN_ID) self.assertNotEqual(data, {}) - self.assertRaises(TenantAddedNameExisting, self.manager.add_tenant_dict, ADMIN_ID, new_tenant) + self.assertRaises(TenantAddedNameExisting, self.manager.add_tenant_dict, self.ADMIN_ID, new_tenant) def test_exception_tenant_no_intra_extension(self): authz_intra_extension = self.create_intra_extension(policy_model="policy_authz") @@ -201,16 +211,16 @@ class TestTenantManager(tests.TestCase): "intra_admin_extension": admin_intra_extension['id'], } new_tenant['intra_authz_extension'] = None - self.assertRaises(TenantNoIntraAuthzExtension, self.manager.add_tenant_dict, ADMIN_ID, new_tenant) + self.assertRaises(TenantNoIntraAuthzExtension, self.manager.add_tenant_dict, self.ADMIN_ID, new_tenant) new_tenant['intra_authz_extension'] = authz_intra_extension['id'] - data = self.manager.add_tenant_dict(user_id=ADMIN_ID, tenant_dict=new_tenant) + data = self.manager.add_tenant_dict(user_id=self.ADMIN_ID, tenant_dict=new_tenant) self.assertEquals(new_tenant["id"], data["id"]) self.assertEquals(new_tenant["name"], data['tenant']["name"]) self.assertEquals(new_tenant["intra_authz_extension"], data['tenant']["intra_authz_extension"]) self.assertEquals(new_tenant["intra_admin_extension"], data['tenant']["intra_admin_extension"]) - data = self.manager.get_tenants_dict(ADMIN_ID) + data = self.manager.get_tenants_dict(self.ADMIN_ID) self.assertNotEqual(data, {}) new_tenant['intra_authz_extension'] = None new_tenant['name'] = "demo2" - self.assertRaises(TenantNoIntraAuthzExtension, self.manager.set_tenant_dict, ADMIN_ID, new_tenant["id"], new_tenant) + self.assertRaises(TenantNoIntraAuthzExtension, self.manager.set_tenant_dict, self.ADMIN_ID, new_tenant["id"], new_tenant) |