Improve some exception logs mainly for debugging purposes.

Change-Id: Ie6b2ba1bfdc5e8729605e935481669b90990b2d8

diff --git a/keystone-moon/keystone/contrib/moon/core.py b/keystone-moon/keystone/contrib/moon/core.py
index 4cb178e..6f9832e 100644 (file)
--- a/keystone-moon/keystone/contrib/moon/core.py
+++ b/keystone-moon/keystone/contrib/moon/core.py
@@ -1242,14 +1242,14 @@ class IntraExtensionManager(manager.Manager):
     def get_object_dict(self, user_id, intra_extension_id, object_id):
         objects_dict = self.driver.get_objects_dict(intra_extension_id)
         if object_id not in objects_dict:
-            raise ObjectUnknown("Unknown object name: {}".format(object_id))
+            raise ObjectUnknown("Unknown object id: {}".format(object_id))
         return objects_dict[object_id]
 
     @filter_input
     @enforce(("read", "write"), "objects")
     def del_object(self, user_id, intra_extension_id, object_id):
         if object_id not in self.driver.get_objects_dict(intra_extension_id):
-            raise ObjectUnknown("Unknown object name: {}".format(object_id))
+            raise ObjectUnknown("Unknown object id: {}".format(object_id))
         # Destroy assignments related to this category
         for object_category_id in self.driver.get_object_categories_dict(intra_extension_id):
             for _object_id in self.driver.get_objects_dict(intra_extension_id):
@@ -1573,7 +1573,7 @@ class IntraExtensionManager(manager.Manager):
     @enforce("read", "object_categories")
     def get_object_assignment_list(self, user_id, intra_extension_id, object_id, object_category_id):
         if object_id not in self.driver.get_objects_dict(intra_extension_id):
-            raise ObjectUnknown("Unknown object name: {}".format(object_id))
+            raise ObjectUnknown("Unknown object id: {}".format(object_id))
         if object_category_id not in self.driver.get_object_categories_dict(intra_extension_id):
             raise ObjectCategoryUnknown()
         return self.driver.get_object_assignment_list(intra_extension_id, object_id, object_category_id)
@@ -1584,7 +1584,7 @@ class IntraExtensionManager(manager.Manager):
     @enforce("read", "object_categories")
     def add_object_assignment_list(self, user_id, intra_extension_id, object_id, object_category_id, object_scope_id):
         if object_id not in self.driver.get_objects_dict(intra_extension_id):
-            raise ObjectUnknown("Unknown object name: {}".format(object_id))
+            raise ObjectUnknown("Unknown object id: {}".format(object_id))
         if object_category_id not in self.driver.get_object_categories_dict(intra_extension_id):
             raise ObjectCategoryUnknown()
         if object_scope_id not in self.driver.get_object_scopes_dict(intra_extension_id, object_category_id):
@@ -1600,7 +1600,7 @@ class IntraExtensionManager(manager.Manager):
     @enforce("read", "object_scopes")
     def del_object_assignment(self, user_id, intra_extension_id, object_id, object_category_id, object_scope_id):
         if object_id not in self.driver.get_objects_dict(intra_extension_id):
-            raise ObjectUnknown("Unknown object name: {}".format(object_id))
+            raise ObjectUnknown("Unknown object id: {}".format(object_id))
         if object_category_id not in self.driver.get_object_categories_dict(intra_extension_id):
             raise ObjectCategoryUnknown()
         if object_scope_id not in self.driver.get_object_scopes_dict(intra_extension_id, object_category_id):
@@ -1836,7 +1836,7 @@ class IntraExtensionAuthzManager(IntraExtensionManager):
                 subject_id = _subject_id
                 break
         if not subject_id:
-            raise SubjectUnknown()
+            raise SubjectUnknown("Unknown subject id: {}".format(subject_k_id))
         objects_dict = self.driver.get_objects_dict(intra_extension_id)
         object_id = None
         for _object_id in objects_dict:
@@ -1844,7 +1844,7 @@ class IntraExtensionAuthzManager(IntraExtensionManager):
                 object_id = _object_id
                 break
         if not object_id:
-            raise ObjectUnknown("Unknown object name: {}".format(object_id))
+            raise ObjectUnknown("Unknown object name: {}".format(object_name))
 
         actions_dict = self.driver.get_actions_dict(intra_extension_id)
         action_id = None
@@ -1853,7 +1853,7 @@ class IntraExtensionAuthzManager(IntraExtensionManager):
                 action_id = _action_id
                 break
         if not action_id:
-            raise ActionUnknown()
+            raise ActionUnknown("Unknown action name: {}".format(action_name))
         return super(IntraExtensionAuthzManager, self).authz(intra_extension_id, subject_id, object_id, action_id)
 
     def add_subject_dict(self, user_id, intra_extension_id, subject_dict):