From 51f7872f4902093cb0f0d445737c5892dd784191 Mon Sep 17 00:00:00 2001 From: asteroide Date: Fri, 31 Jul 2015 16:49:31 +0200 Subject: Play unit tests and modify code accordingly. (some tests are still not OK). Change-Id: I021081710411be12ffbbb0a3c8192626dbf9f8ce --- .../moon/policies/policy_admin/assignment.json | 12 +++++------ .../moon/policies/policy_admin/perimeter.json | 12 +++++------ .../examples/moon/policies/policy_admin/rule.json | 24 +++++++++++----------- .../examples/moon/policies/policy_admin/scope.json | 12 +++++------ 4 files changed, 30 insertions(+), 30 deletions(-) (limited to 'keystone-moon/examples') diff --git a/keystone-moon/examples/moon/policies/policy_admin/assignment.json b/keystone-moon/examples/moon/policies/policy_admin/assignment.json index b77bd810..2c339a39 100644 --- a/keystone-moon/examples/moon/policies/policy_admin/assignment.json +++ b/keystone-moon/examples/moon/policies/policy_admin/assignment.json @@ -18,9 +18,9 @@ "authz.subject_categories": ["authz.subject_categories"], "authz.object_categories": ["authz.object_categories"], "authz.action_categories": ["authz.action_categories"], - "authz.subject_category_scopes": ["authz.subject_category_scopes"], - "authz.object_category_scopes": ["authz.object_category_scopes"], - "authz.action_category_scopes": ["authz.action_category_scopes"], + "authz.subject_scopes": ["authz.subject_scopes"], + "authz.object_scopes": ["authz.object_scopes"], + "authz.action_scopes": ["authz.action_scopes"], "authz.subject_assignments": ["authz.subject_assignments"], "authz.object_assignments": ["authz.object_assignments"], "authz.action_assignments": ["authz.action_assignments"], @@ -33,9 +33,9 @@ "admin.subject_categories": ["admin.subject_categories"], "admin.object_categories": ["admin.object_categories"], "admin.action_categories": ["admin.action_categories"], - "admin.subject_category_scopes": ["admin.subject_category_scopes"], - "admin.object_category_scopes": ["admin.object_category_scopes"], - "admin.action_category_scopes": ["admin.action_category_scopes"], + "admin.subject_scopes": ["admin.subject_scopes"], + "admin.object_scopes": ["admin.object_scopes"], + "admin.action_scopes": ["admin.action_scopes"], "admin.subject_assignments": ["admin.subject_assignments"], "admin.object_assignments": ["admin.object_assignments"], "admin.action_assignments": ["admin.action_assignments"], diff --git a/keystone-moon/examples/moon/policies/policy_admin/perimeter.json b/keystone-moon/examples/moon/policies/policy_admin/perimeter.json index a796dae9..3fe71bb5 100644 --- a/keystone-moon/examples/moon/policies/policy_admin/perimeter.json +++ b/keystone-moon/examples/moon/policies/policy_admin/perimeter.json @@ -13,9 +13,9 @@ "authz.subject_categories", "authz.object_categories", "authz.action_categories", - "authz.subject_category_scopes", - "authz.object_category_scopes", - "authz.action_category_scopes", + "authz.subject_scopes", + "authz.object_scopes", + "authz.action_scopes", "authz.subject_assignments", "authz.object_assignments", "authz.action_assignments", @@ -28,9 +28,9 @@ "admin.subject_categories", "admin.object_categories", "admin.action_categories", - "admin.subject_category_scopes", - "admin.object_category_scopes", - "admin.action_category_scopes", + "admin.subject_scopes", + "admin.object_scopes", + "admin.action_scopes", "admin.subject_assignments", "admin.object_assignments", "admin.action_assignments", diff --git a/keystone-moon/examples/moon/policies/policy_admin/rule.json b/keystone-moon/examples/moon/policies/policy_admin/rule.json index e80c61c1..020dac41 100644 --- a/keystone-moon/examples/moon/policies/policy_admin/rule.json +++ b/keystone-moon/examples/moon/policies/policy_admin/rule.json @@ -6,9 +6,9 @@ ["root_role" , "read", "authz.subject_categories"], ["root_role" , "read", "authz.object_categories"], ["root_role" , "read", "authz.action_categories"], - ["root_role" , "read", "authz.subject_category_scopes"], - ["root_role" , "read", "authz.object_category_scopes"], - ["root_role" , "read", "authz.action_category_scopes"], + ["root_role" , "read", "authz.subject_scopes"], + ["root_role" , "read", "authz.object_scopes"], + ["root_role" , "read", "authz.action_scopes"], ["root_role" , "read", "authz.subject_assignments"], ["root_role" , "read", "authz.object_assignments"], ["root_role" , "read", "authz.action_assignments"], @@ -21,9 +21,9 @@ ["root_role" , "write", "authz.subject_categories"], ["root_role" , "write", "authz.object_categories"], ["root_role" , "write", "authz.action_categories"], - ["root_role" , "write", "authz.subject_category_scopes"], - ["root_role" , "write", "authz.object_category_scopes"], - ["root_role" , "write", "authz.action_category_scopes"], + ["root_role" , "write", "authz.subject_scopes"], + ["root_role" , "write", "authz.object_scopes"], + ["root_role" , "write", "authz.action_scopes"], ["root_role" , "write", "authz.subject_assignments"], ["root_role" , "write", "authz.object_assignments"], ["root_role" , "write", "authz.action_assignments"], @@ -36,9 +36,9 @@ ["root_role" , "read", "admin.subject_categories"], ["root_role" , "read", "admin.object_categories"], ["root_role" , "read", "admin.action_categories"], - ["root_role" , "read", "admin.subject_category_scopes"], - ["root_role" , "read", "admin.object_category_scopes"], - ["root_role" , "read", "admin.action_category_scopes"], + ["root_role" , "read", "admin.subject_scopes"], + ["root_role" , "read", "admin.object_scopes"], + ["root_role" , "read", "admin.action_scopes"], ["root_role" , "read", "admin.subject_assignments"], ["root_role" , "read", "admin.object_assignments"], ["root_role" , "read", "admin.action_assignments"], @@ -51,9 +51,9 @@ ["root_role" , "write", "admin.subject_categories"], ["root_role" , "write", "admin.object_categories"], ["root_role" , "write", "admin.action_categories"], - ["root_role" , "write", "admin.subject_category_scopes"], - ["root_role" , "write", "admin.object_category_scopes"], - ["root_role" , "write", "admin.action_category_scopes"], + ["root_role" , "write", "admin.subject_scopes"], + ["root_role" , "write", "admin.object_scopes"], + ["root_role" , "write", "admin.action_scopes"], ["root_role" , "write", "admin.subject_assignments"], ["root_role" , "write", "admin.object_assignments"], ["root_role" , "write", "admin.action_assignments"], diff --git a/keystone-moon/examples/moon/policies/policy_admin/scope.json b/keystone-moon/examples/moon/policies/policy_admin/scope.json index 9de90206..c8b4908a 100644 --- a/keystone-moon/examples/moon/policies/policy_admin/scope.json +++ b/keystone-moon/examples/moon/policies/policy_admin/scope.json @@ -18,9 +18,9 @@ "authz.subject_categories", "authz.object_categories", "authz.action_categories", - "authz.subject_category_scopes", - "authz.object_category_scopes", - "authz.action_category_scopes", + "authz.subject_scopes", + "authz.object_scopes", + "authz.action_scopes", "authz.subject_assignments", "authz.object_assignments", "authz.action_assignments", @@ -33,9 +33,9 @@ "admin.subject_categories", "admin.object_categories", "admin.action_categories", - "admin.subject_category_scopes", - "admin.object_category_scopes", - "admin.action_category_scopes", + "admin.subject_scopes", + "admin.object_scopes", + "admin.action_scopes", "admin.subject_assignments", "admin.object_assignments", "admin.action_assignments", -- cgit 1.2.3-korg