review code

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

2 files changed, 69 insertions, 69 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 c671e9ca..60122b9d 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
@@ -179,7 +179,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
 
         new_subject_category = {"name": "subject_category_test", "description": "subject_category_test"}
 
-        subject_categories = self.admin_manager.add_subject_category(admin_subject_id, authz_ie_dict["id"], new_subject_category)
+        subject_categories = self.admin_manager.add_subject_category_dict(admin_subject_id, authz_ie_dict["id"], new_subject_category)
         _subject_categories = dict(subject_categories)
         self.assertEqual(len(_subject_categories.keys()), 1)
         new_subject_category["id"] = _subject_categories.keys()[0]
@@ -210,7 +210,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
                                                           {"name": "demo", "description": "demo"})
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
-        object_categories = self.manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"])
+        object_categories = self.manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"])
         self.assertIsInstance(object_categories, dict)
         for key, value in object_categories.iteritems():
             self.assertIsInstance(value, dict)
@@ -219,7 +219,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
 
         new_object_category = {"name": "object_category_test", "description": "object_category_test"}
 
-        object_categories = self.admin_manager.add_object_category(admin_subject_id, authz_ie_dict["id"], new_object_category)
+        object_categories = self.admin_manager.add_object_category_dict(admin_subject_id, authz_ie_dict["id"], new_object_category)
         _object_categories = dict(object_categories)
         self.assertEqual(len(_object_categories.keys()), 1)
         new_object_category["id"] = _object_categories.keys()[0]
@@ -233,7 +233,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
         # Delete the new object_category
 
         self.admin_manager.del_object_category(admin_subject_id, authz_ie_dict["id"], new_object_category["id"])
-        object_categories = self.manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"])
+        object_categories = self.manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"])
         for key, value in object_categories.iteritems():
             self.assertIsInstance(value, dict)
             self.assertIn("name", value)
@@ -251,7 +251,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
                                                           {"name": "demo", "description": "demo"})
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
-        action_categories = self.manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+        action_categories = self.manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         self.assertIsInstance(action_categories, dict)
         for key, value in action_categories.iteritems():
             self.assertIsInstance(value, dict)
@@ -260,7 +260,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
 
         new_action_category = {"name": "action_category_test", "description": "action_category_test"}
 
-        action_categories = self.admin_manager.add_action_category(admin_subject_id, authz_ie_dict["id"], new_action_category)
+        action_categories = self.admin_manager.add_action_category_dict(admin_subject_id, authz_ie_dict["id"], new_action_category)
         _action_categories = dict(action_categories)
         self.assertEqual(len(_action_categories.keys()), 1)
         new_action_category["id"] = _action_categories.keys()[0]
@@ -274,7 +274,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
         # Delete the new action_category
 
         self.admin_manager.del_action_category(admin_subject_id, authz_ie_dict["id"], new_action_category["id"])
-        action_categories = self.manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+        action_categories = self.manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         for key, value in action_categories.iteritems():
             self.assertIsInstance(value, dict)
             self.assertIn("name", value)
@@ -293,7 +293,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        subject_categories = self.admin_manager.add_subject_category(
+        subject_categories = self.admin_manager.add_subject_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -356,7 +356,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        object_categories = self.admin_manager.add_object_category(
+        object_categories = self.admin_manager.add_object_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -419,7 +419,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        action_categories = self.admin_manager.add_action_category(
+        action_categories = self.admin_manager.add_action_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -488,7 +488,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
 
         subjects_dict = self.manager.get_subjects_dict(admin_subject_id, authz_ie_dict["id"])
 
-        subject_categories = self.admin_manager.add_subject_category(
+        subject_categories = self.admin_manager.add_subject_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -617,7 +617,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
         if not object_vm1_id or not object_vm2_id:
             raise Exception("Cannot run tests, database is corrupted ? (need upload and list in objects)")
 
-        object_categories = self.admin_manager.add_object_category(
+        object_categories = self.admin_manager.add_object_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -746,7 +746,7 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
         if not action_upload_id or not action_list_id:
             raise Exception("Cannot run tests, database is corrupted ? (need upload and list in actions)")
 
-        action_categories = self.admin_manager.add_action_category(
+        action_categories = self.admin_manager.add_action_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -875,8 +875,8 @@ class TestIntraExtensionAdminManagerOK(tests.TestCase):
         self.assertIsInstance(sub_meta_rules, dict)
         categories = {
             "subject_categories": self.admin_manager.get_subject_categories_dict(admin_subject_id, authz_ie_dict["id"]),
-            "object_categories": self.admin_manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"]),
-            "action_categories": self.admin_manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+            "object_categories": self.admin_manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"]),
+            "action_categories": self.admin_manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         }
         for key, value in sub_meta_rules.iteritems():
             self.assertIsInstance(value, dict)
@@ -1192,10 +1192,10 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
         new_subject_category = {"name": "subject_category_test", "description": "subject_category_test"}
         self.assertRaises(
             AuthzException,
-            self.manager.add_subject_category,
+            self.manager.add_subject_category_dict,
             demo_subject_id, admin_ie_dict["id"], new_subject_category)
 
-        subject_categories = self.admin_manager.add_subject_category(admin_subject_id, authz_ie_dict["id"], new_subject_category)
+        subject_categories = self.admin_manager.add_subject_category_dict(admin_subject_id, authz_ie_dict["id"], new_subject_category)
         _subject_categories = dict(subject_categories)
         self.assertEqual(len(_subject_categories.keys()), 1)
         new_subject_category["id"] = _subject_categories.keys()[0]
@@ -1231,7 +1231,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
                                                           {"name": "demo", "description": "demo"})
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
-        object_categories = self.manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"])
+        object_categories = self.manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"])
         self.assertIsInstance(object_categories, dict)
         for key, value in object_categories.iteritems():
             self.assertIsInstance(value, dict)
@@ -1241,10 +1241,10 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
         new_object_category = {"name": "object_category_test", "description": "object_category_test"}
         self.assertRaises(
             AuthzException,
-            self.manager.add_object_category,
+            self.manager.add_object_category_dict,
             demo_subject_id, admin_ie_dict["id"], new_object_category)
 
-        object_categories = self.admin_manager.add_object_category(admin_subject_id, authz_ie_dict["id"], new_object_category)
+        object_categories = self.admin_manager.add_object_category_dict(admin_subject_id, authz_ie_dict["id"], new_object_category)
         _object_categories = dict(object_categories)
         self.assertEqual(len(_object_categories.keys()), 1)
         new_object_category["id"] = _object_categories.keys()[0]
@@ -1262,7 +1262,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
             demo_subject_id, authz_ie_dict["id"], new_object_category["id"])
 
         self.admin_manager.del_object_category(admin_subject_id, authz_ie_dict["id"], new_object_category["id"])
-        object_categories = self.manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"])
+        object_categories = self.manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"])
         for key, value in object_categories.iteritems():
             self.assertIsInstance(value, dict)
             self.assertIn("name", value)
@@ -1280,7 +1280,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
                                                           {"name": "demo", "description": "demo"})
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
-        action_categories = self.manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+        action_categories = self.manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         self.assertIsInstance(action_categories, dict)
         for key, value in action_categories.iteritems():
             self.assertIsInstance(value, dict)
@@ -1290,10 +1290,10 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
         new_action_category = {"name": "action_category_test", "description": "action_category_test"}
         self.assertRaises(
             AuthzException,
-            self.manager.add_action_category,
+            self.manager.add_action_category_dict,
             demo_subject_id, admin_ie_dict["id"], new_action_category)
 
-        action_categories = self.admin_manager.add_action_category(admin_subject_id, authz_ie_dict["id"], new_action_category)
+        action_categories = self.admin_manager.add_action_category_dict(admin_subject_id, authz_ie_dict["id"], new_action_category)
         _action_categories = dict(action_categories)
         self.assertEqual(len(_action_categories.keys()), 1)
         new_action_category["id"] = _action_categories.keys()[0]
@@ -1311,7 +1311,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
             demo_subject_id, authz_ie_dict["id"], new_action_category["id"])
 
         self.admin_manager.del_action_category(admin_subject_id, authz_ie_dict["id"], new_action_category["id"])
-        action_categories = self.manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+        action_categories = self.manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         for key, value in action_categories.iteritems():
             self.assertIsInstance(value, dict)
             self.assertIn("name", value)
@@ -1330,7 +1330,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        subject_categories = self.admin_manager.add_subject_category(
+        subject_categories = self.admin_manager.add_subject_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -1402,7 +1402,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        object_categories = self.admin_manager.add_object_category(
+        object_categories = self.admin_manager.add_object_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -1474,7 +1474,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        action_categories = self.admin_manager.add_action_category(
+        action_categories = self.admin_manager.add_action_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -1552,7 +1552,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
 
         subjects_dict = self.manager.get_subjects_dict(admin_subject_id, authz_ie_dict["id"])
 
-        subject_categories = self.admin_manager.add_subject_category(
+        subject_categories = self.admin_manager.add_subject_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -1710,7 +1710,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
         if not object_vm1_id or not object_vm2_id:
             raise Exception("Cannot run tests, database is corrupted ? (need upload and list in objects)")
 
-        object_categories = self.admin_manager.add_object_category(
+        object_categories = self.admin_manager.add_object_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -1868,7 +1868,7 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
         if not action_upload_id or not action_list_id:
             raise Exception("Cannot run tests, database is corrupted ? (need upload and list in actions)")
 
-        action_categories = self.admin_manager.add_action_category(
+        action_categories = self.admin_manager.add_action_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -2026,8 +2026,8 @@ class TestIntraExtensionAdminManagerKO(tests.TestCase):
         self.assertIsInstance(sub_meta_rules, dict)
         categories = {
             "subject_categories": self.admin_manager.get_subject_categories_dict(admin_subject_id, authz_ie_dict["id"]),
-            "object_categories": self.admin_manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"]),
-            "action_categories": self.admin_manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+            "object_categories": self.admin_manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"]),
+            "action_categories": self.admin_manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         }
         for key, value in sub_meta_rules.iteritems():
             self.assertIsInstance(value, dict)
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 07cea87a..2f75acaf 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
@@ -177,7 +177,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
 
         new_subject_category = {"name": "subject_category_test", "description": "subject_category_test"}
 
-        subject_categories = self.admin_manager.add_subject_category(admin_subject_id, authz_ie_dict["id"], new_subject_category)
+        subject_categories = self.admin_manager.add_subject_category_dict(admin_subject_id, authz_ie_dict["id"], new_subject_category)
         _subject_categories = dict(subject_categories)
         self.assertEqual(len(_subject_categories.keys()), 1)
         new_subject_category["id"] = _subject_categories.keys()[0]
@@ -208,7 +208,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
                                                           {"name": "demo", "description": "demo"})
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
-        object_categories = self.manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"])
+        object_categories = self.manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"])
         self.assertIsInstance(object_categories, dict)
         for key, value in object_categories.iteritems():
             self.assertIsInstance(value, dict)
@@ -217,7 +217,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
 
         new_object_category = {"name": "object_category_test", "description": "object_category_test"}
 
-        object_categories = self.admin_manager.add_object_category(admin_subject_id, authz_ie_dict["id"], new_object_category)
+        object_categories = self.admin_manager.add_object_category_dict(admin_subject_id, authz_ie_dict["id"], new_object_category)
         _object_categories = dict(object_categories)
         self.assertEqual(len(_object_categories.keys()), 1)
         new_object_category["id"] = _object_categories.keys()[0]
@@ -231,7 +231,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
         # Delete the new object_category
 
         self.admin_manager.del_object_category(admin_subject_id, authz_ie_dict["id"], new_object_category["id"])
-        object_categories = self.manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"])
+        object_categories = self.manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"])
         for key, value in object_categories.iteritems():
             self.assertIsInstance(value, dict)
             self.assertIn("name", value)
@@ -249,7 +249,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
                                                           {"name": "demo", "description": "demo"})
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
-        action_categories = self.manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+        action_categories = self.manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         self.assertIsInstance(action_categories, dict)
         for key, value in action_categories.iteritems():
             self.assertIsInstance(value, dict)
@@ -258,7 +258,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
 
         new_action_category = {"name": "action_category_test", "description": "action_category_test"}
 
-        action_categories = self.admin_manager.add_action_category(admin_subject_id, authz_ie_dict["id"], new_action_category)
+        action_categories = self.admin_manager.add_action_category_dict(admin_subject_id, authz_ie_dict["id"], new_action_category)
         _action_categories = dict(action_categories)
         self.assertEqual(len(_action_categories.keys()), 1)
         new_action_category["id"] = _action_categories.keys()[0]
@@ -272,7 +272,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
         # Delete the new action_category
 
         self.admin_manager.del_action_category(admin_subject_id, authz_ie_dict["id"], new_action_category["id"])
-        action_categories = self.manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+        action_categories = self.manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         for key, value in action_categories.iteritems():
             self.assertIsInstance(value, dict)
             self.assertIn("name", value)
@@ -291,7 +291,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        subject_categories = self.admin_manager.add_subject_category(
+        subject_categories = self.admin_manager.add_subject_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -354,7 +354,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        object_categories = self.admin_manager.add_object_category(
+        object_categories = self.admin_manager.add_object_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -417,7 +417,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        action_categories = self.admin_manager.add_action_category(
+        action_categories = self.admin_manager.add_action_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -486,7 +486,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
 
         subjects_dict = self.manager.get_subjects_dict(admin_subject_id, authz_ie_dict["id"])
 
-        subject_categories = self.admin_manager.add_subject_category(
+        subject_categories = self.admin_manager.add_subject_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -615,7 +615,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
         if not object_vm1_id or not object_vm2_id:
             raise Exception("Cannot run tests, database is corrupted ? (need upload and list in objects)")
 
-        object_categories = self.admin_manager.add_object_category(
+        object_categories = self.admin_manager.add_object_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -744,7 +744,7 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
         if not action_upload_id or not action_list_id:
             raise Exception("Cannot run tests, database is corrupted ? (need upload and list in actions)")
 
-        action_categories = self.admin_manager.add_action_category(
+        action_categories = self.admin_manager.add_action_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -873,8 +873,8 @@ class TestIntraExtensionAuthzManagerAuthzOK(tests.TestCase):
         self.assertIsInstance(sub_meta_rules, dict)
         categories = {
             "subject_categories": self.admin_manager.get_subject_categories_dict(admin_subject_id, authz_ie_dict["id"]),
-            "object_categories": self.admin_manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"]),
-            "action_categories": self.admin_manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+            "object_categories": self.admin_manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"]),
+            "action_categories": self.admin_manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         }
         for key, value in sub_meta_rules.iteritems():
             self.assertIsInstance(value, dict)
@@ -1125,7 +1125,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
 
         # Add a subject scope and test ObjectCategoryAssignmentOutOfScope
         my_subject_category = {"name": "my_subject_category", "description": "my_subject_category description"}
-        _tmp = self.manager.add_subject_category(
+        _tmp = self.manager.add_subject_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             my_subject_category
@@ -1149,7 +1149,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
 
         # Add an object scope and test ActionCategoryAssignmentOutOfScope
         my_object_category = {"name": "my_object_category", "description": "my_object_category description"}
-        _tmp = self.manager.add_object_category(
+        _tmp = self.manager.add_object_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             my_object_category
@@ -1173,7 +1173,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
 
         # Add an action scope and test SubjectCategoryAssignmentUnknown
         my_action_category = {"name": "my_action_category", "description": "my_action_category description"}
-        _tmp = self.manager.add_action_category(
+        _tmp = self.manager.add_action_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             my_action_category
@@ -1473,10 +1473,10 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         new_subject_category = {"name": "subject_category_test", "description": "subject_category_test"}
         self.assertRaises(
             AuthzException,
-            self.manager.add_subject_category,
+            self.manager.add_subject_category_dict,
             demo_subject_id, admin_ie_dict["id"], new_subject_category)
 
-        subject_categories = self.admin_manager.add_subject_category(admin_subject_id, authz_ie_dict["id"], new_subject_category)
+        subject_categories = self.admin_manager.add_subject_category_dict(admin_subject_id, authz_ie_dict["id"], new_subject_category)
         _subject_categories = dict(subject_categories)
         self.assertEqual(len(_subject_categories.keys()), 1)
         new_subject_category["id"] = _subject_categories.keys()[0]
@@ -1512,7 +1512,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
                                                           {"name": "demo", "description": "demo"})
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
-        object_categories = self.manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"])
+        object_categories = self.manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"])
         self.assertIsInstance(object_categories, dict)
         for key, value in object_categories.iteritems():
             self.assertIsInstance(value, dict)
@@ -1522,10 +1522,10 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         new_object_category = {"name": "object_category_test", "description": "object_category_test"}
         self.assertRaises(
             AuthzException,
-            self.manager.add_object_category,
+            self.manager.add_object_category_dict,
             demo_subject_id, admin_ie_dict["id"], new_object_category)
 
-        object_categories = self.admin_manager.add_object_category(admin_subject_id, authz_ie_dict["id"], new_object_category)
+        object_categories = self.admin_manager.add_object_category_dict(admin_subject_id, authz_ie_dict["id"], new_object_category)
         _object_categories = dict(object_categories)
         self.assertEqual(len(_object_categories.keys()), 1)
         new_object_category["id"] = _object_categories.keys()[0]
@@ -1543,7 +1543,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
             demo_subject_id, authz_ie_dict["id"], new_object_category["id"])
 
         self.admin_manager.del_object_category(admin_subject_id, authz_ie_dict["id"], new_object_category["id"])
-        object_categories = self.manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"])
+        object_categories = self.manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"])
         for key, value in object_categories.iteritems():
             self.assertIsInstance(value, dict)
             self.assertIn("name", value)
@@ -1561,7 +1561,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
                                                           {"name": "demo", "description": "demo"})
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
-        action_categories = self.manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+        action_categories = self.manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         self.assertIsInstance(action_categories, dict)
         for key, value in action_categories.iteritems():
             self.assertIsInstance(value, dict)
@@ -1571,10 +1571,10 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         new_action_category = {"name": "action_category_test", "description": "action_category_test"}
         self.assertRaises(
             AuthzException,
-            self.manager.add_action_category,
+            self.manager.add_action_category_dict,
             demo_subject_id, admin_ie_dict["id"], new_action_category)
 
-        action_categories = self.admin_manager.add_action_category(admin_subject_id, authz_ie_dict["id"], new_action_category)
+        action_categories = self.admin_manager.add_action_category_dict(admin_subject_id, authz_ie_dict["id"], new_action_category)
         _action_categories = dict(action_categories)
         self.assertEqual(len(_action_categories.keys()), 1)
         new_action_category["id"] = _action_categories.keys()[0]
@@ -1592,7 +1592,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
             demo_subject_id, authz_ie_dict["id"], new_action_category["id"])
 
         self.admin_manager.del_action_category(admin_subject_id, authz_ie_dict["id"], new_action_category["id"])
-        action_categories = self.manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+        action_categories = self.manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         for key, value in action_categories.iteritems():
             self.assertIsInstance(value, dict)
             self.assertIn("name", value)
@@ -1611,7 +1611,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        subject_categories = self.admin_manager.add_subject_category(
+        subject_categories = self.admin_manager.add_subject_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -1683,7 +1683,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        object_categories = self.admin_manager.add_object_category(
+        object_categories = self.admin_manager.add_object_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -1755,7 +1755,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         demo_subject_id, demo_subject_dict = \
             self.tenant_api.get_subject_dict_from_keystone_name(tenant['id'], admin_ie_dict['id'], 'demo').iteritems().next()
 
-        action_categories = self.admin_manager.add_action_category(
+        action_categories = self.admin_manager.add_action_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -1833,7 +1833,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
 
         subjects_dict = self.manager.get_subjects_dict(admin_subject_id, authz_ie_dict["id"])
 
-        subject_categories = self.admin_manager.add_subject_category(
+        subject_categories = self.admin_manager.add_subject_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -1991,7 +1991,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         if not object_vm1_id or not object_vm2_id:
             raise Exception("Cannot run tests, database is corrupted ? (need upload and list in objects)")
 
-        object_categories = self.admin_manager.add_object_category(
+        object_categories = self.admin_manager.add_object_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -2149,7 +2149,7 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         if not action_upload_id or not action_list_id:
             raise Exception("Cannot run tests, database is corrupted ? (need upload and list in actions)")
 
-        action_categories = self.admin_manager.add_action_category(
+        action_categories = self.admin_manager.add_action_category_dict(
             admin_subject_id,
             authz_ie_dict["id"],
             {
@@ -2307,8 +2307,8 @@ class TestIntraExtensionAuthzManagerAuthzKO(tests.TestCase):
         self.assertIsInstance(sub_meta_rules, dict)
         categories = {
             "subject_categories": self.admin_manager.get_subject_categories_dict(admin_subject_id, authz_ie_dict["id"]),
-            "object_categories": self.admin_manager.get_object_category_dict(admin_subject_id, authz_ie_dict["id"]),
-            "action_categories": self.admin_manager.get_action_category_dict(admin_subject_id, authz_ie_dict["id"])
+            "object_categories": self.admin_manager.get_object_categories_dict(admin_subject_id, authz_ie_dict["id"]),
+            "action_categories": self.admin_manager.get_action_categories_dict(admin_subject_id, authz_ie_dict["id"])
         }
         for key, value in sub_meta_rules.iteritems():
             self.assertIsInstance(value, dict)