finish review code

Change-Id: Ie39003b523b287837d4f93f82c035b8f921067a5
Signed-off-by: WuKong <rebirthmonkey@gmail.com>

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 96f9a04..a512a98 100644 (file)
Binary files a/keystone-moon/doc/source/extensions/moon/ExceptionHierarchy-v0.2.pptx and b/keystone-moon/doc/source/extensions/moon/ExceptionHierarchy-v0.2.pptx differ

diff --git a/keystone-moon/keystone/contrib/moon/core.py b/keystone-moon/keystone/contrib/moon/core.py
index 7761130..03467ca 100644 (file)
--- 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 d2e6703..a53a339 100644 (file)
--- 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 8887049..e397157 100644 (file)
--- 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)