From 43da0e268fd88c05e49a3d949e3685a13fa43926 Mon Sep 17 00:00:00 2001
From: asteroide <thomas.duval@orange.com>
Date: Sat, 26 Sep 2015 23:31:49 +0200
Subject: Review the KeystoneMiddleware code, fix some bugs in the authz
 functions.

Change-Id: I9d9966c061fc71cd8ef5ce88217dcdfa63e0722f
---
 .../moon/policies/policy_authz/assignment.json         | 18 +++---------------
 .../examples/moon/policies/policy_authz/rule.json      | 18 +-----------------
 2 files changed, 4 insertions(+), 32 deletions(-)

(limited to 'keystone-moon/examples')

diff --git a/keystone-moon/examples/moon/policies/policy_authz/assignment.json b/keystone-moon/examples/moon/policies/policy_authz/assignment.json
index 6482830c..7a6c722e 100644
--- a/keystone-moon/examples/moon/policies/policy_authz/assignment.json
+++ b/keystone-moon/examples/moon/policies/policy_authz/assignment.json
@@ -43,25 +43,13 @@
 
     "object_assignments": {
         "object_security_level": {
-            "servers": ["low"],
-			"vm1": ["low"],
-			"vm2": ["medium"],
-			"file1": ["low"],
-			"file2": ["medium"]
+            "servers": ["low"]
         },
 		"type": {
-			"servers": ["computing"],
-			"vm1": ["computing"],
-			"vm2": ["computing"],
-			"file1": ["storage"],
-			"file2": ["storage"]
+			"servers": ["computing"]
 		},
 		"object_id": {
-			"servers": ["servers"],
-			"vm1": ["vm1"],
-			"vm2": ["vm2"],
-			"file1": ["file1"],
-			"file2": ["file2"]
+			"servers": ["servers"]
 		}
     }
 }
diff --git a/keystone-moon/examples/moon/policies/policy_authz/rule.json b/keystone-moon/examples/moon/policies/policy_authz/rule.json
index 73e791d7..25f9d93a 100644
--- a/keystone-moon/examples/moon/policies/policy_authz/rule.json
+++ b/keystone-moon/examples/moon/policies/policy_authz/rule.json
@@ -19,23 +19,7 @@
 	],
 	"rbac_rule":[
 		["dev", "xx", "read", "servers"],
-		["dev", "xx", "read", "vm1"],
-		["dev", "xx", "read", "vm2"],
-		["dev", "xx", "read", "file1"],
-		["dev", "xx", "read", "file2"],
-		["dev", "xx", "write", "vm1"],
-		["dev", "xx", "write", "vm2"],
-		["dev", "xx", "write", "file1"],
-		["dev", "xx", "write", "file2"],
 		["admin", "xx", "read", "servers"],
-		["admin", "ft", "read", "servers"],
-		["admin", "ft", "read", "vm1"],
-		["admin", "ft", "read", "vm2"],
-		["admin", "ft", "read", "file1"],
-		["admin", "ft", "read", "file2"],
-		["admin", "ft", "write", "vm1"],
-		["admin", "ft", "write", "vm2"],
-		["admin", "ft", "write", "file1"],
-		["admin", "ft", "write", "file2"]
+		["admin", "ft", "read", "servers"]
 	]
 }
-- 
cgit 1.2.3-korg