From 5637b139e1696f665263fcfdaf97f8a2b37c5bfb Mon Sep 17 00:00:00 2001 From: WuKong Date: Wed, 22 Jul 2015 15:46:03 +0200 Subject: [PATCH] finish review code Change-Id: Ie39003b523b287837d4f93f82c035b8f921067a5 Signed-off-by: WuKong --- .../extensions/moon/ExceptionHierarchy-v0.2.pptx | Bin 34849 -> 34159 bytes keystone-moon/keystone/contrib/moon/core.py | 2 +- keystone-moon/keystone/contrib/moon/exception.py | 6 +++--- .../unit/test_unit_core_intra_extension_authz.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/keystone-moon/doc/source/extensions/moon/ExceptionHierarchy-v0.2.pptx b/keystone-moon/doc/source/extensions/moon/ExceptionHierarchy-v0.2.pptx index 96f9a04149571ad5d4d28d2f088e20eae93e8afe..a512a98b6398ef91bc61fc8d54de9d951216ed85 100644 GIT binary patch delta 6066 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 PLggcA(LjO!z30CG9S6%m diff --git a/keystone-moon/keystone/contrib/moon/core.py b/keystone-moon/keystone/contrib/moon/core.py index 7761130e..03467ca5 100644 --- a/keystone-moon/keystone/contrib/moon/core.py +++ b/keystone-moon/keystone/contrib/moon/core.py @@ -1317,7 +1317,7 @@ class IntraExtensionManager(manager.Manager): @enforce(("read", "write"), "aggregation_algorithm") def set_aggregation_algorithm_dict(self, user_id, intra_extension_id, aggregation_algorithm_id, aggregation_algorithm_dict): if aggregation_algorithm_id: - if aggregation_algorithm_id not in self.configuration_api.get_aggregation_algorithms(ROOT_ID): + if aggregation_algorithm_id not in self.configuration_api.get_aggregation_algorithms(ADMIN_ID): raise AggregationAlgorithmUnknown() else: aggregation_algorithm_id = uuid4().hex diff --git a/keystone-moon/keystone/contrib/moon/exception.py b/keystone-moon/keystone/contrib/moon/exception.py index d2e67030..a53a3397 100644 --- a/keystone-moon/keystone/contrib/moon/exception.py +++ b/keystone-moon/keystone/contrib/moon/exception.py @@ -91,10 +91,10 @@ class IntraExtensionUnknown(IntraExtensionException): logger = "Error" -class SuperExtensionUnknown(IntraExtensionUnknown): - message_format = _("The super_extension is unknown.") +class RootExtensionUnknown(IntraExtensionUnknown): + message_format = _("The root_extension is unknown.") code = 400 - title = 'Super Extension Unknown' + title = 'Root Extension Unknown' logger = "Error" 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 8887049f..e397157f 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 @@ -87,7 +87,7 @@ class TestIntraExtensionAuthzManagerAuthz(tests.TestCase): def create_intra_extension(self, policy_model="policy_authz"): - IE["policymodel"] = policy_model + IE["model"] = policy_model IE["name"] = uuid.uuid4().hex ref = self.admin_manager.load_intra_extension_dict(DEFAULT_USER_ID, IE) self.assertIsInstance(ref, dict) -- 2.16.6