Put the ID of aggregation algorithm for a particular IntraExtension in the intraextensions table and generate a static UUID for each aggregation algorithms in the memory backend.

Change-Id: Ic56dc05ca3d7e099e1d529c5bb88b5d93de88ae1

5 files changed, 59 insertions, 56 deletions

diff --git a/keystone-moon/keystone/tests/moon/unit/test_unit_core_configuration.py b/keystone-moon/keystone/tests/moon/unit/test_unit_core_configuration.py
index 83606ff3..efc5acd2 100644
--- a/keystone-moon/keystone/tests/moon/unit/test_unit_core_configuration.py
+++ b/keystone-moon/keystone/tests/moon/unit/test_unit_core_configuration.py
@@ -15,6 +15,8 @@ from keystone.tests.unit import default_fixtures
 from keystone.contrib.moon.core import LogManager
 from keystone.contrib.moon.core import IntraExtensionAdminManager
 from keystone.contrib.moon.core import IntraExtensionRootManager
+from keystone.contrib.moon.core import ConfigurationManager
+from keystone.contrib.moon.core import IntraExtensionAuthzManager
 from keystone.tests.moon.unit import *
 
 CONF = cfg.CONF
@@ -43,7 +45,9 @@ class TestConfigurationManager(tests.TestCase):
         return {
             "moonlog_api": LogManager(),
             "admin_api": IntraExtensionAdminManager(),
-            "root_api": IntraExtensionRootManager()
+            "configuration_api": ConfigurationManager(),
+            "root_api": IntraExtensionRootManager(),
+            "authz_api": IntraExtensionAuthzManager()
         }
 
     def config_overrides(self):
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 e76173e7..c97776d3 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
@@ -11,6 +11,7 @@ import uuid
 from oslo_config import cfg
 from keystone.tests import unit as tests
 from keystone.contrib.moon.core import IntraExtensionAdminManager, IntraExtensionAuthzManager
+from keystone.contrib.moon.core import IntraExtensionRootManager, ConfigurationManager
 from keystone.tests.unit.ksfixtures import database
 from keystone import resource
 from keystone.contrib.moon.exception import *
@@ -61,6 +62,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
             "tenant_api": TenantManager(),
             "admin_api": IntraExtensionAdminManager(),
             "authz_api": IntraExtensionAuthzManager(),
+            "configuration_api": ConfigurationManager(),
             # "resource_api": resource.Manager(),
         }
 
@@ -852,11 +854,8 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.admin_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        aggregation_algorithms = self.admin_manager.get_aggregation_algorithm_dict(admin_subject_id, authz_ie_dict["id"])
-        for key, value in aggregation_algorithms.iteritems():
-            self.assertIsInstance(value, dict)
-            self.assertIn("name", value)
-            self.assertIn("description", value)
+        aggregation_algorithm = self.admin_manager.get_aggregation_algorithm_id(admin_subject_id, authz_ie_dict["id"])
+        self.assertIsInstance(aggregation_algorithm, basestring)
 
         # TODO: need more tests on aggregation_algorithms (set and del)
 
@@ -988,6 +987,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
             "tenant_api": TenantManager(),
             "admin_api": IntraExtensionAdminManager(),
             "authz_api": IntraExtensionAuthzManager(),
+            "configuration_api": ConfigurationManager(),
             # "resource_api": resource.Manager(),
         }
 
@@ -2004,11 +2004,8 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.admin_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        aggregation_algorithms = self.admin_manager.get_aggregation_algorithm_dict(admin_subject_id, authz_ie_dict["id"])
-        for key, value in aggregation_algorithms.iteritems():
-            self.assertIsInstance(value, dict)
-            self.assertIn("name", value)
-            self.assertIn("description", value)
+        aggregation_algorithm = self.admin_manager.get_aggregation_algorithm_id(admin_subject_id, authz_ie_dict["id"])
+        self.assertIsInstance(aggregation_algorithm, basestring)
 
         # TODO: need more tests on aggregation_algorithms (set and del)
 
@@ -2032,7 +2029,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
                 self.assertIn(object_category_id, categories["object_categories"])
             for subject_category_id in value["subject_categories"]:
                 self.assertIn(subject_category_id, categories["subject_categories"])
-        # TODO: need more tests (set and del)
+                # TODO: need more tests (set and del)
 
     def test_sub_rules(self):
         authz_ie_dict = create_intra_extension(self, "policy_authz")
@@ -2052,15 +2049,15 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
         for relation_id in sub_meta_rules:
             rules = self.admin_manager.get_rules_dict(admin_subject_id, authz_ie_dict["id"], relation_id)
             rule_length = len(sub_meta_rules[relation_id]["subject_categories"]) + \
-                len(sub_meta_rules[relation_id]["object_categories"]) + \
-                len(sub_meta_rules[relation_id]["action_categories"]) + 1
+                          len(sub_meta_rules[relation_id]["object_categories"]) + \
+                          len(sub_meta_rules[relation_id]["action_categories"]) + 1
             for rule_id in rules:
                 self.assertEqual(rule_length, len(rules[rule_id]))
                 rule = list(rules[rule_id])
                 for cat, cat_func, func_name in (
-                    ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_scope"),
-                    ("action_categories", self.admin_manager.get_action_scopes_dict, "action_scope"),
-                    ("object_categories", self.admin_manager.get_object_scopes_dict, "object_scope"),
+                        ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_scope"),
+                        ("action_categories", self.admin_manager.get_action_scopes_dict, "action_scope"),
+                        ("object_categories", self.admin_manager.get_object_scopes_dict, "object_scope"),
                 ):
                     for cat_value in sub_meta_rules[relation_id][cat]:
                         scope = cat_func(
@@ -2076,9 +2073,9 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
 
             sub_rule = []
             for cat, cat_func, func_name in (
-                ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_scope"),
-                ("action_categories", self.admin_manager.get_action_scopes_dict, "action_scope"),
-                ("object_categories", self.admin_manager.get_object_scopes_dict, "object_scope"),
+                    ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_scope"),
+                    ("action_categories", self.admin_manager.get_action_scopes_dict, "action_scope"),
+                    ("object_categories", self.admin_manager.get_object_scopes_dict, "object_scope"),
             ):
                 for cat_value in sub_meta_rules[relation_id][cat]:
                     scope = cat_func(
@@ -2101,9 +2098,9 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
 
             for rule_id, rule_value in sub_rules.iteritems():
                 for cat, cat_func, func_name in (
-                    ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_category_scope"),
-                    ("action_categories", self.admin_manager.get_action_scopes_dict, "action_category_scope"),
-                    ("object_categories", self.admin_manager.get_object_scopes_dict, "object_category_scope"),
+                        ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_category_scope"),
+                        ("action_categories", self.admin_manager.get_action_scopes_dict, "action_category_scope"),
+                        ("object_categories", self.admin_manager.get_object_scopes_dict, "object_category_scope"),
                 ):
                     for cat_value in sub_meta_rules[relation_id][cat]:
                         scope = cat_func(
@@ -2114,4 +2111,4 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
                         a_scope = rule_value.pop(0)
                         self.assertIn(a_scope, scope.keys())
 
-        # TODO: add test for the delete function
+                        # TODO: add test for the delete function
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 c96c00b5..8efa4ab8 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
@@ -11,6 +11,7 @@ import uuid
 from oslo_config import cfg
 from keystone.tests import unit as tests
 from keystone.contrib.moon.core import IntraExtensionAdminManager, IntraExtensionAuthzManager, IntraExtensionRootManager
+from keystone.contrib.moon.core import ConfigurationManager
 from keystone.tests.unit.ksfixtures import database
 from keystone import resource
 from keystone.contrib.moon.exception import *
@@ -32,7 +33,7 @@ IE = {
     "description": "a simple description."
 }
 
-@dependency.requires('admin_api', 'authz_api', 'tenant_api', 'configuration_api', 'moonlog_api')
+#@dependency.requires('admin_api', 'authz_api', 'tenant_api', 'configuration_api', 'moonlog_api')
 class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
 
     def setUp(self):
@@ -59,6 +60,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
             "tenant_api": TenantManager(),
             "admin_api": IntraExtensionAdminManager(),
             "authz_api": IntraExtensionAuthzManager(),
+            "configuration_api": ConfigurationManager(),
             # "resource_api": resource.Manager(),
         }
 
@@ -836,11 +838,8 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.admin_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        aggregation_algorithms = self.admin_manager.get_aggregation_algorithm_dict(admin_subject_id, authz_ie_dict["id"])
-        for key, value in aggregation_algorithms.iteritems():
-            self.assertIsInstance(value, dict)
-            self.assertIn("name", value)
-            self.assertIn("description", value)
+        aggregation_algorithm = self.admin_manager.get_aggregation_algorithm_id(admin_subject_id, authz_ie_dict["id"])
+        self.assertIsInstance(aggregation_algorithm, basestring)
 
         # TODO: need more tests on aggregation_algorithms (set and del)
 
@@ -942,7 +941,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
         # TODO: add test for the delete function
 
 
-@dependency.requires('admin_api', 'authz_api', 'tenant_api', 'configuration_api', 'moonlog_api', 'identity_api', 'root_api')
+#@dependency.requires('admin_api', 'authz_api', 'tenant_api', 'configuration_api', 'moonlog_api', 'identity_api', 'root_api')
 class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
 
     def setUp(self):
@@ -971,6 +970,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         return {
             "moonlog_api": LogManager(),
             "tenant_api": TenantManager(),
+            "configuration_api": ConfigurationManager(),
             "admin_api": IntraExtensionAdminManager(),
             "authz_api": IntraExtensionAuthzManager(),
             "root_api": IntraExtensionRootManager(),
@@ -1231,9 +1231,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         aggregation_algorithms = self.configuration_api.get_aggregation_algorithms_dict(admin_subject_id)
         for _id in aggregation_algorithms:
             if aggregation_algorithms[_id]["name"] == "one_true":
-                agg = self.admin_manager.set_aggregation_algorithm_dict(admin_subject_id, authz_ie_dict["id"],
-                                                                        _id,
-                                                                        aggregation_algorithms[_id])
+                agg = self.admin_manager.set_aggregation_algorithm_id(admin_subject_id, authz_ie_dict["id"], _id)
 
         rule = self.admin_manager.add_rule_dict(
             admin_subject_id,
@@ -2228,11 +2226,8 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.admin_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        aggregation_algorithms = self.admin_manager.get_aggregation_algorithm_dict(admin_subject_id, authz_ie_dict["id"])
-        for key, value in aggregation_algorithms.iteritems():
-            self.assertIsInstance(value, dict)
-            self.assertIn("name", value)
-            self.assertIn("description", value)
+        aggregation_algorithm = self.admin_manager.get_aggregation_algorithm_id(admin_subject_id, authz_ie_dict["id"])
+        self.assertIsInstance(aggregation_algorithm, basestring)
 
         # TODO: need more tests on aggregation_algorithms (set and del)
 
@@ -2256,7 +2251,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
                 self.assertIn(object_category_id, categories["object_categories"])
             for subject_category_id in value["subject_categories"]:
                 self.assertIn(subject_category_id, categories["subject_categories"])
-        # TODO: need more tests (set and del)
+                # TODO: need more tests (set and del)
 
     def test_sub_rules(self):
         authz_ie_dict = create_intra_extension(self, "policy_authz")
@@ -2274,15 +2269,15 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         for relation_id in sub_meta_rules:
             rules = self.admin_manager.get_rules_dict(admin_subject_id, authz_ie_dict["id"], relation_id)
             rule_length = len(sub_meta_rules[relation_id]["subject_categories"]) + \
-                len(sub_meta_rules[relation_id]["object_categories"]) + \
-                len(sub_meta_rules[relation_id]["action_categories"]) + 1
+                          len(sub_meta_rules[relation_id]["object_categories"]) + \
+                          len(sub_meta_rules[relation_id]["action_categories"]) + 1
             for rule_id in rules:
                 self.assertEqual(rule_length, len(rules[rule_id]))
                 rule = list(rules[rule_id])
                 for cat, cat_func, func_name in (
-                    ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_scope"),
-                    ("action_categories", self.admin_manager.get_action_scopes_dict, "action_scope"),
-                    ("object_categories", self.admin_manager.get_object_scopes_dict, "object_scope"),
+                        ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_scope"),
+                        ("action_categories", self.admin_manager.get_action_scopes_dict, "action_scope"),
+                        ("object_categories", self.admin_manager.get_object_scopes_dict, "object_scope"),
                 ):
                     for cat_value in sub_meta_rules[relation_id][cat]:
                         scope = cat_func(
@@ -2298,9 +2293,9 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
 
             sub_rule = []
             for cat, cat_func, func_name in (
-                ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_scope"),
-                ("action_categories", self.admin_manager.get_action_scopes_dict, "action_scope"),
-                ("object_categories", self.admin_manager.get_object_scopes_dict, "object_scope"),
+                    ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_scope"),
+                    ("action_categories", self.admin_manager.get_action_scopes_dict, "action_scope"),
+                    ("object_categories", self.admin_manager.get_object_scopes_dict, "object_scope"),
             ):
                 for cat_value in sub_meta_rules[relation_id][cat]:
                     scope = cat_func(
@@ -2323,9 +2318,9 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
 
             for rule_id, rule_value in sub_rules.iteritems():
                 for cat, cat_func, func_name in (
-                    ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_category_scope"),
-                    ("action_categories", self.admin_manager.get_action_scopes_dict, "action_category_scope"),
-                    ("object_categories", self.admin_manager.get_object_scopes_dict, "object_category_scope"),
+                        ("subject_categories", self.admin_manager.get_subject_scopes_dict, "subject_category_scope"),
+                        ("action_categories", self.admin_manager.get_action_scopes_dict, "action_category_scope"),
+                        ("object_categories", self.admin_manager.get_object_scopes_dict, "object_category_scope"),
                 ):
                     for cat_value in sub_meta_rules[relation_id][cat]:
                         scope = cat_func(
@@ -2336,4 +2331,4 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
                         a_scope = rule_value.pop(0)
                         self.assertIn(a_scope, scope.keys())
 
-        # TODO: add test for the delete function
+                        # TODO: add test for the delete function
diff --git a/keystone-moon/keystone/tests/moon/unit/test_unit_core_log.py b/keystone-moon/keystone/tests/moon/unit/test_unit_core_log.py
index 37d210aa..06864cc5 100644
--- a/keystone-moon/keystone/tests/moon/unit/test_unit_core_log.py
+++ b/keystone-moon/keystone/tests/moon/unit/test_unit_core_log.py
@@ -11,7 +11,8 @@ import uuid
 import time
 from oslo_config import cfg
 from keystone.tests import unit as tests
-from keystone.contrib.moon.core import IntraExtensionAdminManager
+from keystone.contrib.moon.core import ConfigurationManager
+from keystone.contrib.moon.core import IntraExtensionAuthzManager
 from keystone.tests.unit.ksfixtures import database
 from keystone import resource
 from keystone.contrib.moon.exception import *
@@ -60,7 +61,9 @@ class TestIntraExtensionAdminManager(tests.TestCase):
     def load_extra_backends(self):
         return {
             "moonlog_api": LogManager(),
+            "authz_api": IntraExtensionAuthzManager(),
             "tenant_api": TenantManager(),
+            "configuration_api": ConfigurationManager(),
             # "resource_api": resource.Manager(),
         }
 
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 f8b2f4d5..794ececc 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
@@ -8,12 +8,13 @@
 import uuid
 from oslo_config import cfg
 from keystone.tests import unit as tests
-from keystone.contrib.moon.core import TenantManager
+from keystone.contrib.moon.core import ConfigurationManager
 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 IntraExtensionRootManager
+from keystone.contrib.moon.core import IntraExtensionAdminManager
 from keystone.common import dependency
 from keystone.tests.moon.unit import *
 
@@ -52,7 +53,10 @@ class TestTenantManager(tests.TestCase):
 
     def load_extra_backends(self):
         return {
-            "moonlog_api": LogManager()
+            "moonlog_api": LogManager(),
+            "admin_api": IntraExtensionAdminManager(),
+            "configuration_api": ConfigurationManager(),
+            "root_api": IntraExtensionRootManager(),
         }
 
     def config_overrides(self):