Made readonly more explicit...

1 files changed, 29 insertions, 29 deletions

diff --git a/etc/neutron/policy.json b/etc/neutron/policy.json
index 77ba25f..ccdb827 100644
--- a/etc/neutron/policy.json
+++ b/etc/neutron/policy.json
@@ -1,12 +1,12 @@
 {
     "deny_readonly": "not role:readonly",
     "context_is_admin":  "role:admin",
-    "owner": "tenant_id:%(tenant_id)s",
+    "owner": "tenant_id:%(tenant_id)s and rule:deny_readonly",
     "admin_or_owner": "rule:context_is_admin or rule:owner",
-    "context_is_advsvc":  "role:advsvc",
+    "context_is_advsvc":  "role:advsvc and rule:deny_readonly",
     "admin_or_network_owner": "rule:context_is_admin or tenant_id:%(network:tenant_id)s or role:network_admin",
     "admin_owner_or_network_owner": "rule:owner or rule:admin_or_network_owner",
-    "admin_only": "rule:context_is_admin",
+    "admin_only": "rule:context_is_admin and rule:deny_readonly",
     "regular_user": "rule:deny_readonly",
     "shared": "field:networks:shared=True",
     "shared_subnetpools": "field:subnetpools:shared=True",
@@ -14,29 +14,29 @@
     "external": "field:networks:router:external=True",
     "default": "rule:admin_or_owner",
 
-    "create_subnet": "rule:admin_or_network_owner",
+    "create_subnet": "rule:admin_or_network_owner and rule:deny_readonly",
     "create_subnet:segment_id": "rule:admin_only",
     "create_subnet:service_types": "rule:admin_only",
     "get_subnet": "rule:admin_or_owner or rule:shared",
     "get_subnet:segment_id": "rule:admin_only",
-    "update_subnet": "rule:admin_or_network_owner",
+    "update_subnet": "rule:admin_or_network_owner and rule:deny_readonly",
     "update_subnet:service_types": "rule:admin_only",
-    "delete_subnet": "rule:admin_or_network_owner",
+    "delete_subnet": "rule:admin_or_network_owner and rule:deny_readonly",
 
     "create_subnetpool": "rule:deny_readonly",
     "create_subnetpool:shared": "rule:admin_only",
     "create_subnetpool:is_default": "rule:admin_only",
     "get_subnetpool": "rule:admin_or_owner or rule:shared_subnetpools",
-    "update_subnetpool": "rule:admin_or_owner",
+    "update_subnetpool": "rule:admin_or_owner and rule:deny_readonly",
     "update_subnetpool:is_default": "rule:admin_only",
-    "delete_subnetpool": "rule:admin_or_owner",
+    "delete_subnetpool": "rule:admin_or_owner and rule:deny_readonly",
 
     "create_address_scope": "rule:deny_readonly",
     "create_address_scope:shared": "rule:admin_only",
     "get_address_scope": "rule:admin_or_owner or rule:shared_address_scopes",
-    "update_address_scope": "rule:admin_or_owner",
+    "update_address_scope": "rule:admin_or_owner and rule:deny_readonly",
     "update_address_scope:shared": "rule:admin_only",
-    "delete_address_scope": "rule:admin_or_owner",
+    "delete_address_scope": "rule:admin_or_owner and rule:deny_readonly",
 
     "create_network": "rule:deny_readonly",
     "get_network": "rule:admin_or_owner or rule:shared or rule:external or rule:context_is_advsvc",
@@ -55,14 +55,14 @@
     "create_network:provider:network_type": "rule:admin_only",
     "create_network:provider:physical_network": "rule:admin_only",
     "create_network:provider:segmentation_id": "rule:admin_only",
-    "update_network": "rule:admin_or_owner",
+    "update_network": "rule:admin_or_owner and rule:deny_readonly",
     "update_network:segments": "rule:admin_only",
     "update_network:shared": "rule:admin_only",
     "update_network:provider:network_type": "rule:admin_only",
     "update_network:provider:physical_network": "rule:admin_only",
     "update_network:provider:segmentation_id": "rule:admin_only",
     "update_network:router:external": "rule:admin_only",
-    "delete_network": "rule:admin_or_owner",
+    "delete_network": "rule:admin_or_owner and rule:deny_readonly",
 
     "create_segment": "rule:admin_only",
     "get_segment": "rule:admin_only",
@@ -78,7 +78,7 @@
     "create_port:binding:host_id": "rule:admin_only",
     "create_port:binding:profile": "rule:admin_only",
     "create_port:mac_learning_enabled": "rule:context_is_advsvc or rule:admin_or_network_owner",
-    "create_port:allowed_address_pairs": "rule:admin_or_network_owner",
+    "create_port:allowed_address_pairs": "rule:admin_or_network_owner and rule:deny_readonly",
     "get_port": "rule:context_is_advsvc or rule:admin_owner_or_network_owner",
     "get_port:queue_id": "rule:admin_only",
     "get_port:binding:vif_type": "rule:admin_only",
@@ -90,14 +90,14 @@
     "update_port:mac_address": "rule:admin_only or rule:context_is_advsvc",
     "update_port:fixed_ips": "rule:context_is_advsvc or rule:admin_or_network_owner",
     "update_port:port_security_enabled": "rule:context_is_advsvc or rule:admin_or_network_owner",
-    "update_port:binding:host_id": "rule:admin_only",
-    "update_port:binding:profile": "rule:admin_only",
+    "update_port:binding:host_id": "rule:admin_only and rule:deny_readonly",
+    "update_port:binding:profile": "rule:admin_only and rule:deny_readonly",
     "update_port:mac_learning_enabled": "rule:context_is_advsvc or rule:admin_or_network_owner",
-    "update_port:allowed_address_pairs": "rule:admin_or_network_owner",
+    "update_port:allowed_address_pairs": "rule:admin_or_network_owner and rule:deny_readonly",
     "delete_port": "rule:context_is_advsvc or rule:admin_owner_or_network_owner",
 
     "get_router:ha": "rule:admin_only",
-    "create_router": "rule:regular_user",
+    "create_router": "rule:regular_user and rule:deny_readonly",
     "create_router:external_gateway_info:enable_snat": "rule:admin_only",
     "create_router:distributed": "rule:admin_only",
     "create_router:ha": "rule:admin_only",
@@ -106,16 +106,16 @@
     "update_router:external_gateway_info:enable_snat": "rule:admin_only",
     "update_router:distributed": "rule:admin_only",
     "update_router:ha": "rule:admin_only",
-    "delete_router": "rule:admin_or_owner",
+    "delete_router": "rule:admin_or_owner and rule:deny_readonly",
 
-    "add_router_interface": "rule:admin_or_owner",
-    "remove_router_interface": "rule:admin_or_owner",
+    "add_router_interface": "rule:admin_or_owner and rule:deny_readonly",
+    "remove_router_interface": "rule:admin_or_owner and rule:deny_readonly",
 
     "create_router:external_gateway_info:external_fixed_ips": "rule:admin_only",
     "update_router:external_gateway_info:external_fixed_ips": "rule:admin_only",
 
-    "insert_rule": "rule:admin_or_owner",
-    "remove_rule": "rule:admin_or_owner",
+    "insert_rule": "rule:admin_or_owner and rule:deny_readonly",
+    "remove_rule": "rule:admin_or_owner and rule:deny_readonly",
 
     "create_qos_queue": "rule:admin_only",
     "get_qos_queue": "rule:admin_only",
@@ -137,10 +137,10 @@
     "get_agent-loadbalancers": "rule:admin_only",
     "get_loadbalancer-hosting-agent": "rule:admin_only",
 
-    "create_floatingip": "rule:regular_user",
+    "create_floatingip": "rule:regular_user and rule:deny_readonly",
     "create_floatingip:floating_ip_address": "rule:admin_only",
-    "update_floatingip": "rule:admin_or_owner",
-    "delete_floatingip": "rule:admin_or_owner",
+    "update_floatingip": "rule:admin_or_owner and rule:deny_readonly",
+    "delete_floatingip": "rule:admin_or_owner and rule:deny_readonly",
     "get_floatingip": "rule:admin_or_owner",
 
     "create_network_profile": "rule:admin_only",
@@ -206,10 +206,10 @@
     "get_flavor_service_profile": "rule:regular_user",
     "get_auto_allocated_topology": "rule:admin_or_owner",
 
-    "create_trunk": "rule:regular_user",
+    "create_trunk": "rule:regular_user and rule:deny_readonly",
     "get_trunk": "rule:admin_or_owner",
-    "delete_trunk": "rule:admin_or_owner",
+    "delete_trunk": "rule:admin_or_owner and rule:deny_readonly",
     "get_subports": "",
-    "add_subports": "rule:admin_or_owner",
-    "remove_subports": "rule:admin_or_owner"
+    "add_subports": "rule:admin_or_owner and rule:deny_readonly",
+    "remove_subports": "rule:admin_or_owner and rule:deny_readonly"
 }