From 9312de3af73762d2dea25523b1fd2b7fbde37ff2 Mon Sep 17 00:00:00 2001 From: WuKong Date: Tue, 14 Jul 2015 17:58:16 +0200 Subject: review controllers.py and core.py Change-Id: Ia71986f174f6cbf92868f7535504523292472e25 Signed-off-by: WuKong --- .../unit/test_unit_core_intra_extension_authz.py | 8 ++-- .../tests/moon/unit/test_unit_core_tenant.py | 54 +++++++++++----------- 2 files changed, 31 insertions(+), 31 deletions(-) (limited to 'keystone-moon/keystone/tests') diff --git a/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_authz.py b/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_authz.py index e2e151ed..b07b4c1d 100644 --- a/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_authz.py +++ b/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_authz.py @@ -99,22 +99,22 @@ class TestIntraExtensionAuthzManagerAuthz(tests.TestCase): self.manager.get_tenant_dict ) self.assertRaises( - TenantNotFound, + TenantIDNotFound, self.manager.get_tenant_name, uuid.uuid4().hex ) self.assertRaises( - TenantNotFound, + TenantIDNotFound, self.manager.set_tenant_name, uuid.uuid4().hex, uuid.uuid4().hex ) self.assertRaises( - TenantNotFound, + TenantIDNotFound, self.manager.get_extension_uuid, uuid.uuid4().hex, "authz" ) self.assertRaises( - TenantNotFound, + TenantIDNotFound, self.manager.get_extension_uuid, uuid.uuid4().hex, "admin" ) 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 0762f37a..615b8bbc 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 @@ -47,10 +47,10 @@ class TestTenantManager(tests.TestCase): } } data = self.manager.set_tenant_dict( - tenant_uuid=_uuid, - name=new_mapping[_uuid]["name"], - authz_extension_uuid=new_mapping[_uuid]["authz"], - admin_extension_uuid=new_mapping[_uuid]["admin"] + tenant_id=_uuid, + tenant_name=new_mapping[_uuid]["name"], + intra_authz_ext_id=new_mapping[_uuid]["authz"], + intra_admin_ext_id=new_mapping[_uuid]["admin"] ) self.assertEquals(_uuid, data["id"]) self.assertEquals(data["name"], new_mapping[_uuid]["name"]) @@ -79,10 +79,10 @@ class TestTenantManager(tests.TestCase): } } data = self.manager.set_tenant_dict( - tenant_uuid=_uuid, - name=new_mapping[_uuid]["name"], - authz_extension_uuid=new_mapping[_uuid]["authz"], - admin_extension_uuid=new_mapping[_uuid]["admin"] + tenant_id=_uuid, + tenant_name=new_mapping[_uuid]["name"], + intra_authz_ext_id=new_mapping[_uuid]["authz"], + intra_admin_ext_id=new_mapping[_uuid]["admin"] ) self.assertEquals(_uuid, data["id"]) self.assertEquals(data["name"], new_mapping[_uuid]["name"]) @@ -102,10 +102,10 @@ class TestTenantManager(tests.TestCase): } } data = self.manager.set_tenant_dict( - tenant_uuid=_uuid, - name=new_mapping[_uuid]["name"], - authz_extension_uuid=new_mapping[_uuid]["authz"], - admin_extension_uuid=new_mapping[_uuid]["admin"] + tenant_id=_uuid, + tenant_name=new_mapping[_uuid]["name"], + intra_authz_ext_id=new_mapping[_uuid]["authz"], + intra_admin_ext_id=new_mapping[_uuid]["admin"] ) self.assertEquals(_uuid, data["id"]) self.assertEquals(data["name"], new_mapping[_uuid]["name"]) @@ -127,21 +127,21 @@ class TestTenantManager(tests.TestCase): } } data = self.manager.set_tenant_dict( - tenant_uuid=_uuid, - name=new_mapping[_uuid]["name"], - authz_extension_uuid=new_mapping[_uuid]["authz"], - admin_extension_uuid=new_mapping[_uuid]["admin"] + tenant_id=_uuid, + tenant_name=new_mapping[_uuid]["name"], + intra_authz_ext_id=new_mapping[_uuid]["authz"], + intra_admin_ext_id=new_mapping[_uuid]["admin"] ) self.assertEquals(_uuid, data["id"]) - data = self.manager.get_extension_uuid(_uuid) + data = self.manager.get_extension_id(_uuid) self.assertEqual(data, new_mapping[_uuid]["authz"]) - data = self.manager.get_extension_uuid(_uuid, "admin") + data = self.manager.get_extension_id(_uuid, "admin") self.assertEqual(data, new_mapping[_uuid]["admin"]) def test_unkown_tenant_uuid(self): - self.assertRaises(TenantNotFound, self.manager.get_tenant_name, uuid.uuid4().hex) - self.assertRaises(TenantNotFound, self.manager.set_tenant_name, uuid.uuid4().hex, "new name") - self.assertRaises(TenantNotFound, self.manager.get_extension_uuid, uuid.uuid4().hex) + self.assertRaises(TenantIDNotFound, self.manager.get_tenant_name, uuid.uuid4().hex) + self.assertRaises(TenantIDNotFound, self.manager.set_tenant_name, uuid.uuid4().hex, "new name") + self.assertRaises(TenantIDNotFound, self.manager.get_extension_id, uuid.uuid4().hex) _uuid = uuid.uuid4().hex new_mapping = { _uuid: { @@ -151,12 +151,12 @@ class TestTenantManager(tests.TestCase): } } data = self.manager.set_tenant_dict( - tenant_uuid=_uuid, - name=new_mapping[_uuid]["name"], - authz_extension_uuid=new_mapping[_uuid]["authz"], - admin_extension_uuid="" + tenant_id=_uuid, + tenant_name=new_mapping[_uuid]["name"], + intra_authz_ext_id=new_mapping[_uuid]["authz"], + intra_admin_ext_id="" ) self.assertEquals(_uuid, data["id"]) - self.assertRaises(IntraExtensionNotFound, self.manager.get_extension_uuid, _uuid, "admin") - self.assertRaises(TenantNotFound, self.manager.get_tenant_uuid, uuid.uuid4().hex) + self.assertRaises(IntraExtensionNotFound, self.manager.get_extension_id, _uuid, "admin") + self.assertRaises(TenantIDNotFound, self.manager.get_tenant_uuid, uuid.uuid4().hex) # self.assertRaises(AdminIntraExtensionNotFound, self.manager.get_admin_extension_uuid, uuid.uuid4().hex) -- cgit 1.2.3-korg