diff options
| -rw-r--r-- | keystone-moon/keystone/contrib/moon/controllers.py | 772 | ||||
| -rw-r--r-- | keystone-moon/keystone/contrib/moon/routers.py | 310 |
2 files changed, 594 insertions, 488 deletions
diff --git a/keystone-moon/keystone/contrib/moon/controllers.py b/keystone-moon/keystone/contrib/moon/controllers.py index 7de7cdf5..1a3f4b4b 100644 --- a/keystone-moon/keystone/contrib/moon/controllers.py +++ b/keystone-moon/keystone/contrib/moon/controllers.py @@ -37,6 +37,36 @@ class Authz_v3(controller.V3Controller): "action_name": action_name} +class Configuration(controller.V3Controller): + collection_name = 'configurations' + member_name = 'configuration' + + def __init__(self): + super(Configuration, self).__init__() + + @controller.protected() + def get_templetes(self, context, **kw): + user_id = self._get_user_uuid_from_token(context["token_id"]) + # TODO: belowing code should be move to core.py in the admin_api + nodes = glob.glob(os.path.join(CONF.moon.policy_directory, "*")) + return { + "authz_templetes": + [os.path.basename(n) for n in nodes if os.path.isdir(n)] + } + + @controller.protected() + def get_aggregation_algorithms(self, context, **kw): + user_id = self._get_user_uuid_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + return self.admin_api.get_aggregation_algorithms(user_id, ie_id) + + @controller.protected() + def get_sub_meta_rule_algorithms(self, context, **kw): + user_id = self._get_user_uuid_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + return self.admin_api.get_sub_meta_rule_algorithms(user_id, ie_id) + + @dependency.requires('admin_api', 'authz_api') class IntraExtensions(controller.V3Controller): collection_name = 'intra_extensions' @@ -45,7 +75,7 @@ class IntraExtensions(controller.V3Controller): def __init__(self): super(IntraExtensions, self).__init__() - def _get_user_from_token(self, token_id): + def _get_user_id_from_token(self, token_id): response = self.token_provider_api.validate_token(token_id) token_ref = token_model.KeystoneToken(token_id=token_id, token_data=response) return token_ref['user'] @@ -53,443 +83,515 @@ class IntraExtensions(controller.V3Controller): # IntraExtension functions @controller.protected() def get_intra_extensions(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - return { - "intra_extensions": - self.admin_api.get_intra_extension_list() - } + user_id = self._get_user_id_from_token(context["token_id"]) + return self.admin_api.get_intra_extension_dict(user_id) + + @controller.protected() + def add_intra_extension(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + intra_extension_dict = dict() + # TODO: replace kw by a tangible dict with known variables + return self.admin_api.load_intra_extension_dict(user_id, intra_extension_dict) @controller.protected() def get_intra_extension(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - return { - "intra_extensions": - self.admin_api.get_intra_extension(uuid=kw['intra_extensions_id']) - } + user_id = self._get_user_id_from_token(context["token_id"]) + intra_extension_id = kw['intra_extension_id'] + return self.admin_api.get_intra_extension_dict(user_id)[intra_extension_id] @controller.protected() - def create_intra_extension(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - return self.admin_api.load_intra_extension(kw) + def del_intra_extension(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + if "intra_extension_id" not in kw: + raise IntraExtensionNotFound + intra_extension_id = kw['intra_extension_id'] + return self.admin_api.del_intra_extension(user_id, intra_extension_id) + # Metadata functions @controller.protected() - def delete_intra_extension(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - if "intra_extensions_id" not in kw: - raise exception.Error - return self.admin_api.delete_intra_extension(kw["intra_extensions_id"]) + def get_subject_categories(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + return self.admin_api.get_subject_category_dict(user_id, ie_id) - # Perimeter functions @controller.protected() - def get_subjects(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - return self.admin_api.get_subject_dict(user, ie_uuid) + def add_subject_category(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + subject_category_name = kw["subject_category_name"] + return self.admin_api.add_subject_category(user_id, ie_id, subject_category_name) @controller.protected() - def add_subject(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - subject = kw["subject_id"] - return self.admin_api.add_subject_dict(user, ie_uuid, subject) + def get_subject_category(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + subject_category_id = kw["subject_category_id"] + return self.admin_api.get_subject_category_dict(user_id, ie_id)[subject_category_id] @controller.protected() - def del_subject(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - subject = kw["subject_id"] - return self.admin_api.del_subject(user, ie_uuid, subject) + def del_subject_category(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + subject_category_id = kw["subject_category_id"] + return self.admin_api.del_subject_category(user_id, ie_id, subject_category_id) @controller.protected() - def get_objects(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - return self.admin_api.get_object_dict(user, ie_uuid) + def get_object_categories(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + return self.admin_api.get_object_category_dict(user_id, ie_id) @controller.protected() - def add_object(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - object_id = kw["object_id"] - return self.admin_api.add_object_dict(user, ie_uuid, object_id) + def add_object_category(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + object_category_name = kw["object_category_name"] + return self.admin_api.add_object_category(user_id, ie_id, object_category_name) @controller.protected() - def del_object(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - object_id = kw["object_id"] - return self.admin_api.del_object(user, ie_uuid, object_id) + def get_object_category(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + object_category_id = kw["object_category_id"] + return self.admin_api.get_object_category_dict(user_id, ie_id)[object_category_id] @controller.protected() - def get_actions(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - return self.admin_api.get_action_dict(user, ie_uuid) + def del_object_category(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + object_category_id = kw["object_category_id"] + return self.admin_api.del_object_category(user_id, ie_id, object_category_id) @controller.protected() - def add_action(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - action = kw["action_id"] - return self.admin_api.add_action_dict(user, ie_uuid, action) + def get_action_categories(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + return self.admin_api.get_action_category_dict(user_id, ie_id) @controller.protected() - def del_action(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - action = kw["action_id"] - return self.admin_api.del_action(user, ie_uuid, action) + def add_action_category(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + action_category_name = kw["action_category_name"] + return self.admin_api.add_action_category_dict(user_id, ie_id, action_category_name) - # Metadata functions @controller.protected() - def get_subject_categories(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - return self.admin_api.get_subject_category_dict(user, ie_uuid) + def get_action_category(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + action_category_id = kw["action_category_id"] + return self.admin_api.get_action_category_dict(user_id, ie_id)[action_category_id] @controller.protected() - def add_subject_category(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - subject_category = kw["subject_category_id"] - return self.admin_api.add_subject_category_dict(user, ie_uuid, subject_category) + def del_action_category(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + action_category_id = kw["action_category_id"] + return self.admin_api.del_action_category(user_id, ie_id, action_category_id) + # Perimeter functions @controller.protected() - def del_subject_category(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - subject_category = kw["subject_category_id"] - return self.admin_api.del_subject_category(user, ie_uuid, subject_category) + def get_subjects(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + return self.admin_api.get_subject_dict(user_id, ie_id) @controller.protected() - def get_object_categories(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - return self.admin_api.get_object_category_dict(user, ie_uuid) + def add_subject(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + subject_name = kw["subject_name"] + return self.admin_api.add_subject_dict(user_id, ie_id, subject_name) @controller.protected() - def add_object_category(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - object_category = kw["object_category_id"] - return self.admin_api.add_object_category_dict(user, ie_uuid, object_category) + def get_subject(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + subject_id = kw["subject_id"] + return self.admin_api.get_subject_dict(user_id, ie_id)[subject_id] @controller.protected() - def del_object_category(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - object_category = kw["object_category_id"] - return self.admin_api.del_object_category(user, ie_uuid, object_category) + def del_subject(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + subject_id = kw["subject_id"] + return self.admin_api.del_subject(user_id, ie_id, subject_id) @controller.protected() - def get_action_categories(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - return self.admin_api.get_action_category_dict(user, ie_uuid) + def get_objects(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + return self.admin_api.get_object_dict(user_id, ie_id) @controller.protected() - def add_action_category(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - action_category = kw["action_category_id"] - return self.admin_api.add_action_category_dict(user, ie_uuid, action_category) + def add_object(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + object_name = kw["object_name"] + return self.admin_api.add_object_dict(user_id, ie_id, object_name) @controller.protected() - def del_action_category(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - action_category = kw["action_category_id"] - return self.admin_api.del_action_category(user, ie_uuid, action_category) + def get_object(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + object_id = kw["object_id"] + return self.admin_api.get_object_dict(user_id, ie_id)[object_id] + + @controller.protected() + def del_object(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + object_id = kw["object_id"] + return self.admin_api.del_object(user_id, ie_id, object_id) + + @controller.protected() + def get_actions(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + return self.admin_api.get_action_dict(user_id, ie_id) + + @controller.protected() + def add_action(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + action_name = kw["action_name"] + return self.admin_api.add_action_dict(user_id, ie_id, action_name) + + @controller.protected() + def get_action(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + action_id = kw["action_id"] + return self.admin_api.get_action_dict(user_id, ie_id)[action_id] + + @controller.protected() + def del_action(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + action_id = kw["action_id"] + return self.admin_api.del_action(user_id, ie_id, action_id) # Scope functions @controller.protected() - def get_subject_category_scope(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - category_id = kw["subject_category_id"] - return self.admin_api.get_subject_category_scope_dict(user, ie_uuid, category_id) + def get_subject_category_scopes(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + subject_category_id = kw["subject_category_id"] + return self.admin_api.get_subject_category_scope_dict(user_id, ie_id, subject_category_id) @controller.protected() def add_subject_category_scope(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - subject_category = kw["subject_category_id"] - subject_category_scope = kw["subject_category_scope_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + subject_category_id = kw["subject_category_id"] + subject_category_scope_name = kw["subject_category_scope_name"] return self.admin_api.add_subject_category_scope_dict( - user, - ie_uuid, - subject_category, - subject_category_scope) + user_id, + ie_id, + subject_category_id, + subject_category_scope_name) + + @controller.protected() + def get_subject_category_scope(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + subject_category_id = kw["subject_category_id"] + subject_category_scope_id = kw["subject_category_scope_id"] + return self.admin_api.get_subject_category_scope_dict(user_id, ie_id, subject_category_id)[subject_category_scope_id] @controller.protected() def del_subject_category_scope(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - subject_category = kw["subject_category_id"] - subject_category_scope = kw["subject_category_scope_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + subject_category_id = kw["subject_category_id"] + subject_category_scope_id = kw["subject_category_scope_id"] return self.admin_api.del_subject_category_scope( - user, - ie_uuid, - subject_category, - subject_category_scope) + user_id, + ie_id, + subject_category_id, + subject_category_scope_id) @controller.protected() - def get_object_category_scope(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - category_id = kw["object_category_id"] - return self.admin_api.get_object_category_scope_dict(user, ie_uuid, category_id) + def get_object_category_scopes(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + object_category_id = kw["object_category_id"] + return self.admin_api.get_object_category_scope_dict(user_id, ie_id, object_category_id) @controller.protected() def add_object_category_scope(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - object_category = kw["object_category_id"] - object_category_scope = kw["object_category_scope_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + object_category_id = kw["object_category_id"] + object_category_scope_name = kw["object_category_scope_name"] return self.admin_api.add_object_category_scope_dict( - user, - ie_uuid, - object_category, - object_category_scope) + user_id, + ie_id, + object_category_id, + object_category_scope_name) + + @controller.protected() + def get_object_category_scope(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + object_category_id = kw["object_category_id"] + object_category_scope_id = kw["object_category_scope_id"] + return self.admin_api.get_object_category_scope_dict(user_id, ie_id, object_category_id)[object_category_scope_id] @controller.protected() def del_object_category_scope(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - object_category = kw["object_category_id"] - object_category_scope = kw["object_category_scope_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + object_category_id = kw["object_category_id"] + object_category_scope_id = kw["object_category_scope_id"] return self.admin_api.del_object_category_scope( - user, - ie_uuid, - object_category, - object_category_scope) + user_id, + ie_id, + object_category_id, + object_category_scope_id) @controller.protected() - def get_action_category_scope(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - category_id = kw["action_category_id"] - return self.admin_api.get_action_category_scope_dict(user, ie_uuid, category_id) + def get_action_category_scopes(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + action_category_id = kw["action_category_id"] + return self.admin_api.get_action_category_scope_dict(user_id, ie_id, action_category_id) @controller.protected() def add_action_category_scope(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - action_category = kw["action_category_id"] - action_category_scope = kw["action_category_scope_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + action_category_id = kw["action_category_id"] + action_category_scope_name = kw["action_category_scope_name"] return self.admin_api.add_action_category_scope_dict( - user, - ie_uuid, - action_category, - action_category_scope) + user_id, + ie_id, + action_category_id, + action_category_scope_name) + + @controller.protected() + def get_action_category_scope(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + action_category_id = kw["action_category_id"] + action_category_scope_id = kw["action_category_scope_id"] + return self.admin_api.get_action_category_scope_dict(user_id, ie_id, action_category_id)[action_category_scope_id] @controller.protected() def del_action_category_scope(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - action_category = kw["action_category_id"] - action_category_scope = kw["action_category_scope_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + action_category_id = kw["action_category_id"] + action_category_scope_id = kw["action_category_scope_id"] return self.admin_api.del_action_category_scope( - user, - ie_uuid, - action_category, - action_category_scope) + user_id, + ie_id, + action_category_id, + action_category_scope_id) # Assignment functions + # XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX @controller.protected() def get_subject_assignments(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] subject_id = kw["subject_id"] - return self.admin_api.get_subject_category_assignment_dict(user, ie_uuid, subject_id) + return self.admin_api.get_subject_category_assignment_dict(user_id, ie_id, subject_id) @controller.protected() def add_subject_assignment(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] subject_id = kw["subject_id"] - subject_category = kw["subject_category"] - subject_category_scope = kw["subject_category_scope"] + subject_category_id = kw["subject_category_id"] + subject_category_scope_id = kw["subject_category_scope_id"] return self.admin_api.add_subject_category_assignment_dict( - user, - ie_uuid, - subject_id, - subject_category, - subject_category_scope) + user_id, + ie_id, + subject_id, + subject_category_id, + subject_category_scope_id) @controller.protected() def del_subject_assignment(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] subject_id = kw["subject_id"] - subject_category = kw["subject_category"] - subject_category_scope = kw["subject_category_scope"] + subject_category_id = kw["subject_category_id"] + subject_category_scope_id = kw["subject_category_scope_id"] return self.admin_api.del_subject_category_assignment( - user, - ie_uuid, - subject_id, - subject_category, - subject_category_scope) + user_id, + ie_id, + subject_id, + subject_category_id, + subject_category_scope_id) @controller.protected() def get_object_assignments(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] object_id = kw["object_id"] - return self.admin_api.get_object_category_assignment_dict(user, ie_uuid, object_id) + return self.admin_api.get_object_category_assignment_dict(user_id, ie_id, object_id) @controller.protected() def add_object_assignment(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] object_id = kw["object_id"] - object_category = kw["object_category"] - object_category_scope = kw["object_category_scope"] + object_category_id = kw["object_category_id"] + object_category_scope_id = kw["object_category_scope_id"] return self.admin_api.add_object_category_assignment_dict( - user, - ie_uuid, - object_id, - object_category, - object_category_scope) + user_id, + ie_id, + object_id, + object_category_id, + object_category_scope_id) @controller.protected() def del_object_assignment(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] object_id = kw["object_id"] - object_category = kw["object_category"] - object_category_scope = kw["object_category_scope"] + object_category_id = kw["object_category_id"] + object_category_scope_id = kw["object_category_scope_id"] return self.admin_api.del_object_category_assignment( - user, - ie_uuid, - object_id, - object_category, - object_category_scope) + user_id, + ie_id, + object_id, + object_category_id, + object_category_scope_id) @controller.protected() def get_action_assignments(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] action_id = kw["action_id"] - return self.admin_api.get_action_category_assignment_dict(user, ie_uuid, action_id) + return self.admin_api.get_action_category_assignment_dict(user_id, ie_id, action_id) @controller.protected() def add_action_assignment(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] action_id = kw["action_id"] - action_category = kw["action_category"] - action_category_scope = kw["action_category_scope"] + action_category_id = kw["action_category"] + action_category_scope_id = kw["action_category_scope"] return self.admin_api.add_action_category_assignment_dict( - user, - ie_uuid, - action_id, - action_category, - action_category_scope) + user_id, + ie_id, + action_id, + action_category_id, + action_category_scope_id) @controller.protected() def del_action_assignment(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] action_id = kw["action_id"] - action_category = kw["action_category"] - action_category_scope = kw["action_category_scope"] + action_category_id = kw["action_category_id"] + action_category_scope_id = kw["action_category_scope_id"] return self.admin_api.del_object_category_assignment( - user, - ie_uuid, - action_id, - action_category, - action_category_scope) + user_id, + ie_id, + action_id, + action_category_id, + action_category_scope_id) # Metarule functions @controller.protected() - def get_aggregation_algorithms(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - return self.admin_api.get_aggregation_algorithms(user, ie_uuid) + def add_aggregation_algorithm(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + aggregation_algorithm_id = kw["aggregation_algorithm_id"] + return self.admin_api.add_aggregation_algorithm( + user_id, + ie_id, + aggregation_algorithm_id) @controller.protected() def get_aggregation_algorithm(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - return self.admin_api.get_aggregation_algorithm(user, ie_uuid) - - @controller.protected() - def set_aggregation_algorithm(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - aggregation_algorithm = kw["aggregation_algorithm"] - return self.admin_api.set_aggregation_algorithm(user, ie_uuid, aggregation_algorithm) + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + return self.admin_api.get_aggregation_algorithm(user_id, ie_id) + + @controller.protected() + def del_aggregation_algorithm(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + aggregation_algorithm_id = kw["aggregation_algorithm_id"] + return self.admin_api.set_aggregation_algorithm( + user_id, + ie_id, + aggregation_algorithm_id) + + @controller.protected() + def get_sub_meta_rules(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + return self.admin_api.get_sub_meta_rules(user_id, ie_id) + + @controller.protected() + def add_sub_meta_rule(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + sub_meta_rule_dict = dict() + sub_meta_rule_dict['subject_categories'] = kw["subject_categories"] + sub_meta_rule_dict['object_categories'] = kw["object_categories"] + sub_meta_rule_dict['action_categories'] = kw["action_categories"] + sub_meta_rule_dict['aggregation_algorithm_id'] = kw["aggregation_algorithm_id"] + return self.admin_api.set_sub_meta_rule( + user_id, + ie_id, + sub_meta_rule_dict) @controller.protected() def get_sub_meta_rule(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - return self.admin_api.get_sub_meta_rule(user, ie_uuid) - - @controller.protected() - def set_sub_meta_rule(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw.pop("intra_extensions_id") - # subject_categories = kw["subject_categories"] - # action_categories = kw["action_categories"] - # object_categories = kw["object_categories"] - # relation = kw["relation"] - # aggregation_algorithm = kw["aggregation_algorithm"] - return self.admin_api.set_sub_meta_rule( - user, - ie_uuid, - kw) + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + sub_meta_rule_id = kw["sub_meta_rule_id"] + return self.admin_api.get_sub_meta_rules(user_id, ie_id)[sub_meta_rule_id] @controller.protected() - def get_sub_meta_rule_relations(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - return self.admin_api.get_sub_meta_rule_relations(user, ie_uuid) + def del_sub_meta_rule(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw.pop("intra_extension_id") + sub_meta_rule_id = kw["sub_meta_rule_id"] + return self.admin_api.set_sub_meta_rule( + user_id, + ie_id, + sub_meta_rule_id) # Rules functions @controller.protected() - def get_sub_rules(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - return self.admin_api.get_sub_rules(user, ie_uuid) + def get_rules(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + sub_meta_rule_id = kw["sub_meta_rule_id"] + return self.admin_api.get_rule_dict(user_id, ie_id, sub_meta_rule_id) @controller.protected() - def set_sub_rule(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - sub_rule = kw["rule"] - relation = kw["relation"] - return self.admin_api.set_sub_rule(user, ie_uuid, relation, sub_rule) + def add_rule(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + sub_meta_rule_id = kw["sub_meta_rule_id"] + rule_list = list() + # TODO: build rule_dict + return self.admin_api.add_rule_list(user_id, ie_id, sub_meta_rule_id, rule_list) @controller.protected() - def del_sub_rule(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) - ie_uuid = kw["intra_extensions_id"] - relation_name = kw["relation_name"] - rule = kw["rule"] - return self.admin_api.del_sub_rule( - user, - ie_uuid, - relation_name, - rule) - - -class AuthzPolicies(controller.V3Controller): - collection_name = 'authz_policies' - member_name = 'authz_policy' - - def __init__(self): - super(AuthzPolicies, self).__init__() + def get_rule(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + sub_meta_rule_id = kw["sub_meta_rule_id"] + rule_id = kw["rule_id"] + return self.admin_api.get_rule_dict(user_id, ie_id, sub_meta_rule_id)[rule_id] @controller.protected() - def get_authz_policies(self, context, **kw): - nodes = glob.glob(os.path.join(CONF.moon.policy_directory, "*")) - return { - "authz_policies": - [os.path.basename(n) for n in nodes if os.path.isdir(n)] - } - + def del_rule(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + ie_id = kw["intra_extension_id"] + sub_meta_rule_id = kw["sub_meta_rule_id"] + rule_id = kw["rule_id"] + return self.admin_api.get_rule(user_id, ie_id, sub_meta_rule_id, rule_id) @dependency.requires('tenant_api', 'resource_api') class Tenants(controller.V3Controller): @@ -497,47 +599,58 @@ class Tenants(controller.V3Controller): def __init__(self): super(Tenants, self).__init__() - def _get_user_from_token(self, token_id): + def _get_user_id_from_token(self, token_id): response = self.token_provider_api.validate_token(token_id) token_ref = token_model.KeystoneToken(token_id=token_id, token_data=response) return token_ref['user'] @controller.protected() def get_tenants(self, context, **kw): - # user = self._get_user_from_token(context["token_id"]) - return { - "tenants": - self.tenant_api.get_tenant_dict() - } + user_id = self._get_user_id_from_token(context["token_id"]) + return self.tenant_api.get_tenant_dict(user_id) + + @controller.protected() + def add_tenant(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + tenant_dict = dict() + tenant_dict["tenant_name"] = kw.get("tenant_name") + tenant_dict["intra_authz_ext_id"] = kw.get("intra_authz_ext_id") + tenant_dict["intra_admin_ext_id"] = kw.get("intra_admin_ext_id") + return self.tenant_api.add_tenant_dict(user_id, tenant_dict) @controller.protected() def get_tenant(self, context, **kw): - # user = self._get_user_from_token(context["token_id"]) + user_id = self._get_user_id_from_token(context["token_id"]) tenant_uuid = kw.get("tenant_uuid") - return { - "tenant": - self.tenant_api.get_tenant_dict()[tenant_uuid] - } + return self.tenant_api.get_tenant_dict(user_id)[tenant_uuid] @controller.protected() - def set_tenant(self, context, **kw): - # user = self._get_user_from_token(context["token_id"]) - tenant_uuid = kw.get("id") - name = self.resource_api.get_project(tenant_uuid)["name"] - authz = kw.get("authz") - admin = kw.get("admin") - self.tenant_api.set_tenant_dict(tenant_uuid, name, authz, admin) - return { - "tenant": - self.tenant_api.get_tenant_dict()[tenant_uuid] - } + def del_tenant(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + tenant_uuid = kw.get("tenant_uuid") + return self.tenant_api.del_tenant(user_id, tenant_uuid) + # TODO: get tenant name from keystone @controller.protected() def delete_tenant(self, context, **kw): # user = self._get_user_from_token(context["token_id"]) tenant_uuid = kw.get("tenant_uuid") self.tenant_api.set_tenant_dict(tenant_uuid, None, None, None) + # TODO: get tenant name from keystone + """def load_tenant(self, context, **kw): + user_id = self._get_user_id_from_token(context["token_id"]) + tenant_id = kw["tenant_id"] + tenant_name = self.resource_api.get_project(tenant_id)["name"] + intra_authz_ext_id = kw.get("intra_authz_ext_id") + intra_admin_ext_id = kw.get("intra_admin_ext_id") + self.tenant_api.add_tenant_dict( + user_id, + tenant_id, + tenant_name, + intra_authz_ext_id, + intra_admin_ext_id) + """ @dependency.requires('authz_api') class InterExtensions(controller.V3Controller): @@ -563,7 +676,7 @@ class InterExtensions(controller.V3Controller): # user = self._get_user_from_token(context["token_id"]) # return { # "inter_extensions": - # self.interextension_api.get_inter_extension(uuid=kw['inter_extensions_id']) + # self.interextension_api.get_inter_extension(uuid=kw['inter_extension_id']) # } # @controller.protected() @@ -574,9 +687,9 @@ class InterExtensions(controller.V3Controller): # @controller.protected() # def delete_inter_extension(self, context, **kw): # user = self._get_user_from_token(context["token_id"]) - # if "inter_extensions_id" not in kw: + # if "inter_extension_id" not in kw: # raise exception.Error - # return self.interextension_api.delete_inter_extension(kw["inter_extensions_id"]) + # return self.interextension_api.delete_inter_extension(kw["inter_extension_id"]) @dependency.requires('authz_api') @@ -599,12 +712,9 @@ class Logs(controller.V3Controller): @controller.protected() def get_logs(self, context, **kw): - user = self._get_user_from_token(context["token_id"]) + user_id = self._get_user_id_from_token(context["token_id"]) options = kw.get("options", "") # FIXME (dthom): the authorization for get_logs must be done with an intra_extension #if self.authz_api.admin(user["name"], "logs", "read"): - return { - "logs": - self.moonlog_api.get_logs(options) - } + return self.moonlog_api.get_logs(user_id, options) diff --git a/keystone-moon/keystone/contrib/moon/routers.py b/keystone-moon/keystone/contrib/moon/routers.py index e1eb1130..5a038869 100644 --- a/keystone-moon/keystone/contrib/moon/routers.py +++ b/keystone-moon/keystone/contrib/moon/routers.py @@ -26,8 +26,8 @@ class Routers(wsgi.RoutersBase): def append_v3_routers(self, mapper, routers): # Controllers creation authz_controller = controllers.Authz_v3() + configuration_controller = controllers.Configuration() intra_ext_controller = controllers.IntraExtensions() - authz_policies_controller = controllers.AuthzPolicies() tenants_controller = controllers.Tenants() logs_controller = controllers.Logs() inter_ext_controller = controllers.InterExtensions() @@ -45,344 +45,345 @@ class Routers(wsgi.RoutersBase): 'action_id': self._get_path('actions'), }) + # Configuration route + self._add_resource( + mapper, configuration_controller, + path=self.PATH_PREFIX+'/configuration/templetes', + get_action='get_templetes', + rel=self._get_rel('templetes'), + path_vars={}) + self._add_resource( + mapper, configuration_controller, + path=self.PATH_PREFIX+'/configuration/aggregation_algorithms', + get_action='get_aggregation_algorithms', + rel=self._get_rel('aggregation_algorithms'), + path_vars={}) + self._add_resource( + mapper, configuration_controller, + path=self.PATH_PREFIX+'/configuration/sub_meta_rule_relations', + get_action='get_sub_meta_rule_algorithms', + rel=self._get_rel('sub_meta_rule_algorithms'), + path_vars={}) + # IntraExtensions route self._add_resource( mapper, intra_ext_controller, path=self.PATH_PREFIX+'/intra_extensions', get_action='get_intra_extensions', - post_action='create_intra_extension', + post_action='add_intra_extension', rel=self._get_rel('intra_extensions'), path_vars={}) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}', get_action='get_intra_extension', - delete_action='delete_intra_extension', + delete_action='del_intra_extension', rel=self._get_rel('intra_extensions'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) - self._add_resource( - mapper, authz_policies_controller, - path=self.PATH_PREFIX+'/authz_policies', - get_action='get_authz_policies', - rel=self._get_rel('authz_policies'), - path_vars={}) - - # Perimeter route + # Metadata route self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/subjects', - get_action='get_subjects', - post_action='add_subject', - rel=self._get_rel('subjects'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/subject_categories', + get_action='get_subject_categories', + post_action='add_subject_category', + rel=self._get_rel('subject_categories'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/subjects/{subject_id}', - delete_action='del_subject', - rel=self._get_rel('subjects'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/subject_categories/{subject_category_id}', + get_action='get_subject_category', + delete_action='del_subject_category', + rel=self._get_rel('subject_categories'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/objects', - get_action='get_objects', - post_action='add_object', - rel=self._get_rel('subjects'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/object_categories', + get_action='get_object_categories', + post_action='add_object_category', + rel=self._get_rel('object_categories'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/objects/{object_id}', - delete_action='del_object', - rel=self._get_rel('objects'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/object_categories/{object_category_id}', + get_action='get_object_category', + delete_action='del_object_category', + rel=self._get_rel('object_categories'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/actions', - get_action='get_actions', - post_action='add_action', - rel=self._get_rel('actions'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/action_categories', + get_action='get_action_categories', + post_action='add_action_category', + rel=self._get_rel('action_categories'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/actions/{action_id}', - delete_action='del_action', - rel=self._get_rel('actions'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/action_categories/{action_category_id}', + get_action='get_action_category', + delete_action='del_action_category', + rel=self._get_rel('action_categories'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) - # Metadata route + # Perimeter route self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/subject_categories', - get_action='get_subject_categories', - post_action='add_subject_category', - rel=self._get_rel('subject_categories'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/subjects', + get_action='get_subjects', + post_action='add_subject', + rel=self._get_rel('subjects'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/subject_categories/{subject_category_id}', - delete_action='del_subject_category', - rel=self._get_rel('subject_categories'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/subjects/{subject_id}', + get_action='get_subject', + delete_action='del_subject', + rel=self._get_rel('subjects'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/object_categories', - get_action='get_object_categories', - post_action='add_object_category', - rel=self._get_rel('object_categories'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/objects', + get_action='get_objects', + post_action='add_object', + rel=self._get_rel('subjects'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/object_categories/{object_category_id}', - delete_action='del_object_category', - rel=self._get_rel('object_categories'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/objects/{object_id}', + get_action='get_object', + delete_action='del_object', + rel=self._get_rel('objects'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/action_categories', - get_action='get_action_categories', - post_action='add_action_category', - rel=self._get_rel('action_categories'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/actions', + get_action='get_actions', + post_action='add_action', + rel=self._get_rel('actions'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/action_categories/{action_category_id}', - delete_action='del_action_category', - rel=self._get_rel('action_categories'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/actions/{action_id}', + get_action='get_action', + delete_action='del_action', + rel=self._get_rel('actions'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) # Scope route self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/subject_category_scope', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/subject_category_scopes/{subject_category_id}', + get_action='get_subject_category_scopes', post_action='add_subject_category_scope', rel=self._get_rel('subject_category_scope'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/subject_category_scope/{subject_category_id}', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/subject_category_scopes/{subject_category_id}/{subject_category_scope_id}', get_action='get_subject_category_scope', - rel=self._get_rel('subject_category_scope'), - path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), - }) - self._add_resource( - mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/subject_category_scope/{subject_category_id}/{subject_category_scope_id}', delete_action='del_subject_category_scope', rel=self._get_rel('subject_category_scope'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/object_category_scope', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/object_category_scopes/{object_category_id}', + get_action='get_object_category_scopes', post_action='add_object_category_scope', rel=self._get_rel('object_category_scope'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/object_category_scope/{object_category_id}', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/object_category_scopes/{object_category_id}/{object_category_scope_id}', get_action='get_object_category_scope', - rel=self._get_rel('object_category_scope'), - path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), - }) - self._add_resource( - mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/object_category_scope/{object_category_id}/{object_category_scope_id}', delete_action='del_object_category_scope', rel=self._get_rel('object_category_scope'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/action_category_scope', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/action_category_scopes/{action_category_id}', + get_action='get_action_category_scopes', post_action='add_action_category_scope', rel=self._get_rel('action_category_scope'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/action_category_scope/{action_category_id}', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/action_category_scopes/{action_category_id}/{action_category_scope_id}', get_action='get_action_category_scope', - rel=self._get_rel('action_category_scope'), - path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), - }) - self._add_resource( - mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/action_category_scope/{action_category_id}/{action_category_scope_id}', delete_action='del_action_category_scope', rel=self._get_rel('action_category_scope'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) - + # Assignment route + # XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/subject_assignments/{subject_id}', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/subject_assignments/{subject_id}', get_action='get_subject_assignments', rel=self._get_rel('subject_assignments'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/subject_assignments', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/subject_assignments', post_action='add_subject_assignment', rel=self._get_rel('subject_assignments'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/' - 'subject_assignments/{subject_id}/{subject_category}/{subject_category_scope}', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/' + 'subject_assignments/{subject_id}/{subject_category_id}/{subject_category_scope_id}', delete_action='del_subject_assignment', rel=self._get_rel('subject_assignments'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/object_assignments/{object_id}', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/object_assignments/{object_id}', get_action='get_object_assignments', rel=self._get_rel('object_assignments'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/object_assignments', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/object_assignments', post_action='add_object_assignment', rel=self._get_rel('object_assignments'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/' + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/' 'object_assignments/{object_id}/{object_category}/{object_category_scope}', delete_action='del_object_assignment', rel=self._get_rel('object_assignments'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/action_assignments/{action_id}', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/action_assignments/{action_id}', get_action='get_action_assignments', rel=self._get_rel('action_assignments'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/action_assignments', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/action_assignments', post_action='add_action_assignment', rel=self._get_rel('action_assignments'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/' + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/' 'action_assignments/{action_id}/{action_category}/{action_category_scope}', delete_action='del_action_assignment', rel=self._get_rel('action_assignments'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) # Metarule route self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/aggregation_algorithms', - get_action='get_aggregation_algorithms', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/aggregation_algorithms', + post_action='add_aggregation_algorithm', rel=self._get_rel('aggregation_algorithms'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) - self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/aggregation_algorithm', + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/aggregation_algorithms/{aggregation_algorithm_id}', get_action='get_aggregation_algorithm', - post_action='set_aggregation_algorithm', + delete_action='del_aggregation_algorithm', rel=self._get_rel('aggregation_algorithms'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) - self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/sub_meta_rule', - get_action='get_sub_meta_rule', - post_action='set_sub_meta_rule', - rel=self._get_rel('sub_meta_rule'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/sub_meta_rules', + get_action='get_sub_meta_rules', + post_action='add_sub_meta_rule', + rel=self._get_rel('sub_meta_rules'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) - self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/sub_meta_rule_relations', - get_action='get_sub_meta_rule_relations', - rel=self._get_rel('sub_meta_rule_relations'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/sub_meta_rule/{sub_meta_rule_id}', + get_action='get_sub_meta_rule', + delete_action='del_sub_meta_rule', + rel=self._get_rel('sub_meta_rules'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) # Rules route self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/sub_rules', - get_action='get_sub_rules', - post_action='set_sub_rule', - rel=self._get_rel('sub_rules'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/rules/{sub_meta_rule_id}', + get_action='get_rules', + post_action='add_rule', + rel=self._get_rel('rules'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) self._add_resource( mapper, intra_ext_controller, - path=self.PATH_PREFIX+'/intra_extensions/{intra_extensions_id}/sub_rules/{relation_name}/{rule}', - delete_action='del_sub_rule', - rel=self._get_rel('sub_rules'), + path=self.PATH_PREFIX+'/intra_extensions/{intra_extension_id}/rules/{sub_meta_rule_id}/{rule_id}', + get_action='get_rule', + delete_action='del_rule', + rel=self._get_rel('rules'), path_vars={ - 'intra_extensions_id': self._get_path('intra_extensions'), + 'intra_extension_id': self._get_path('intra_extensions'), }) # Tenants route @@ -390,19 +391,14 @@ class Routers(wsgi.RoutersBase): mapper, tenants_controller, path=self.PATH_PREFIX+'/tenants', get_action='get_tenants', - rel=self._get_rel('tenants'), - path_vars={}) - self._add_resource( - mapper, tenants_controller, - path=self.PATH_PREFIX+'/tenant', - post_action='set_tenant', + post_action='add_tenant', rel=self._get_rel('tenants'), path_vars={}) self._add_resource( mapper, tenants_controller, path=self.PATH_PREFIX+'/tenant/{tenant_uuid}', get_action='get_tenant', - delete_action='delete_tenant', + delete_action='del_tenant', rel=self._get_rel('tenants'), path_vars={ 'tenant_uuid': self._get_path('tenants'), @@ -434,10 +430,10 @@ class Routers(wsgi.RoutersBase): # path_vars={}) # self._add_resource( # mapper, inter_ext_controller, - # path=self.PATH_PREFIX+'/inter_extensions/{inter_extensions_id}', + # path=self.PATH_PREFIX+'/inter_extensions/{inter_extension_id}', # get_action='get_inter_extension', # delete_action='delete_inter_extension', # rel=self._get_rel('inter_extensions'), # path_vars={ - # 'inter_extensions_id': self._get_path('inter_extensions'), + # 'inter_extension_id': self._get_path('inter_extensions'), # }) |