diff options
author | WuKong <rebirthmonkey@gmail.com> | 2015-07-16 18:06:45 +0200 |
---|---|---|
committer | WuKong <rebirthmonkey@gmail.com> | 2015-07-16 18:06:45 +0200 |
commit | 0e4a78d142013af0d1530db688350a83d5d65051 (patch) | |
tree | b8ec692967bff0ef7ceeca24ea6f72ae214b22fd /keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py | |
parent | c10edf3198cda970331bdf6b60166aa8fb611888 (diff) |
reivew code
Change-Id: I912698ca09a6c1161c02502a7ea551a5ee905949
Signed-off-by: WuKong <rebirthmonkey@gmail.com>
Diffstat (limited to 'keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py')
-rw-r--r-- | keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py b/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py index 0e5d69d4..0b7c1d21 100644 --- a/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py +++ b/keystone-moon/keystone/tests/moon/unit/test_unit_core_intra_extension_admin.py @@ -65,7 +65,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase): #self.admin = self.identity_api.create_user(USER) IE["policymodel"] = policy_model IE["name"] = uuid.uuid4().hex - self.ref = self.manager.load_intra_extension(IE) + self.ref = self.manager.load_intra_extension_dict(IE) self.assertIsInstance(self.ref, dict) self.create_tenant(self.ref["id"]) @@ -1170,7 +1170,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase): self.assertEqual(self.ref["id"], subject_categories["intra_extension_uuid"]) self.assertIn(new_subject_category["id"], subject_categories["subject_categories"]) metarule[relation]["subject_categories"].append(new_subject_category["id"]) - _sub_meta_rules = self.manager.set_sub_meta_rule_dict("admin", self.ref["id"], metarule) + _sub_meta_rules = self.manager.del_sub_meta_rule("admin", self.ref["id"], metarule) self.assertIn(relation, metarule) for item in ("subject_categories", "object_categories", "action_categories"): self.assertEqual( @@ -1310,7 +1310,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase): IE["policymodel"] = policy_model IE["name"] = uuid.uuid4().hex - ref = self.admin_manager.load_intra_extension(IE) + ref = self.admin_manager.load_intra_extension_dict(IE) self.assertIsInstance(ref, dict) return ref @@ -2701,11 +2701,11 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase): self.assertRaises( MetaRuleAddNotAuthorized, - self.manager.set_sub_meta_rule_dict, + self.manager.get_sub_meta_rule, demo_user["id"], ref["id"], metarule ) - _sub_meta_rules = self.manager.set_sub_meta_rule_dict(admin_user["id"], ref["id"], metarule) + _sub_meta_rules = self.manager.get_sub_meta_rule(admin_user["id"], ref["id"], metarule) self.assertIn(relation, metarule) for item in ("subject_categories", "object_categories", "action_categories"): self.assertEqual( |