Delete glance property_protection code

Change-Id: I9b685db2581825751ec5cc6075644ce24e191c6f
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>

code/daisy/daisy/api/v1/backup_restore.py

@@ -29,7 +29,6 @@ from daisy import notifier
 from daisy.api import policy
 import daisy.api.v1
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 import daisy.registry.client.v1.api as registry
@@ -71,10 +70,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/clusters.py

@@ -32,7 +32,6 @@ import daisy.api.v1
 from daisy.api.v1 import controller
 from daisy.api.v1 import filters
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 from daisy import i18n
@@ -464,10 +463,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/components.py

@@ -30,7 +30,6 @@ import daisy.api.v1
 from daisy.api.v1 import controller
 from daisy.api.v1 import filters
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 from daisy import i18n
@@ -79,10 +78,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/config_files.py

@@ -30,7 +30,6 @@ import daisy.api.v1
 from daisy.api.v1 import controller
 from daisy.api.v1 import filters
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 from daisy import i18n
@@ -82,10 +81,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/config_sets.py

@@ -30,7 +30,6 @@ import daisy.api.v1
 from daisy.api.v1 import controller
 from daisy.api.v1 import filters
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 from daisy import i18n
@@ -81,10 +80,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/configs.py

@@ -30,7 +30,6 @@ import daisy.api.v1
 from daisy.api.v1 import controller
 from daisy.api.v1 import filters
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 from daisy import i18n
@@ -76,10 +75,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/disk_array.py

@@ -32,7 +32,6 @@ from daisy.api import policy
 import daisy.api.v1
 
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 import daisy.registry.client.v1.api as registry
@@ -81,10 +80,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/host_template.py

@@ -32,7 +32,6 @@ import daisy.api.v1
 from daisy.api.v1 import controller
 from daisy.api.v1 import filters
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 from daisy import i18n
@@ -88,10 +87,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/hosts.py

@@ -31,7 +31,6 @@ import daisy.api.v1
 from daisy.api.v1 import controller
 from daisy.api.v1 import filters
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 from daisy.common import vcpu_pin
@@ -98,10 +97,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/install.py

@@ -32,7 +32,6 @@ from daisy.api import policy
 import daisy.api.v1
 
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 import daisy.registry.client.v1.api as registry
@@ -182,10 +181,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/networks.py

@@ -30,7 +30,6 @@ import daisy.api.v1
 from daisy.api.v1 import controller
 from daisy.api.v1 import filters
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 from daisy import i18n
@@ -90,10 +89,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/roles.py

@@ -30,7 +30,6 @@ import daisy.api.v1
 from daisy.api.v1 import controller
 from daisy.api.v1 import filters
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 from daisy import i18n
@@ -88,10 +87,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/router.py

@@ -40,94 +40,6 @@ class API(wsgi.Router):
     def __init__(self, mapper):
         wsgi.Resource(wsgi.RejectMethodController())
 
-        '''images_resource = images.create_resource()
-
-        mapper.connect("/",
-                       controller=images_resource,
-                       action="index")
-        mapper.connect("/images",
-                       controller=images_resource,
-                       action='index',
-                       conditions={'method': ['GET']})
-        mapper.connect("/images",
-                       controller=images_resource,
-                       action='create',
-                       conditions={'method': ['POST']})
-        mapper.connect("/images",
-                       controller=reject_method_resource,
-                       action='reject',
-                       allowed_methods='GET, POST',
-                       conditions={'method': ['PUT', 'DELETE', 'HEAD',
-                                              'PATCH']})
-        mapper.connect("/images/detail",
-                       controller=images_resource,
-                       action='detail',
-                       conditions={'method': ['GET', 'HEAD']})
-        mapper.connect("/images/detail",
-                       controller=reject_method_resource,
-                       action='reject',
-                       allowed_methods='GET, HEAD',
-                       conditions={'method': ['POST', 'PUT', 'DELETE',
-                                              'PATCH']})
-        mapper.connect("/images/{id}",
-                       controller=images_resource,
-                       action="meta",
-                       conditions=dict(method=["HEAD"]))
-        mapper.connect("/images/{id}",
-                       controller=images_resource,
-                       action="show",
-                       conditions=dict(method=["GET"]))
-        mapper.connect("/images/{id}",
-                       controller=images_resource,
-                       action="update",
-                       conditions=dict(method=["PUT"]))
-        mapper.connect("/images/{id}",
-                       controller=images_resource,
-                       action="delete",
-                       conditions=dict(method=["DELETE"]))
-        mapper.connect("/images/{id}",
-                       controller=reject_method_resource,
-                       action='reject',
-                       allowed_methods='GET, HEAD, PUT, DELETE',
-                       conditions={'method': ['POST', 'PATCH']})
-
-        members_resource = members.create_resource()
-
-        mapper.connect("/images/{image_id}/members",
-                       controller=members_resource,
-                       action="index",
-                       conditions={'method': ['GET']})
-        mapper.connect("/images/{image_id}/members",
-                       controller=members_resource,
-                       action="update_all",
-                       conditions=dict(method=["PUT"]))
-        mapper.connect("/images/{image_id}/members",
-                       controller=reject_method_resource,
-                       action='reject',
-                       allowed_methods='GET, PUT',
-                       conditions={'method': ['POST', 'DELETE', 'HEAD',
-                                              'PATCH']})
-        mapper.connect("/images/{image_id}/members/{id}",
-                       controller=members_resource,
-                       action="show",
-                       conditions={'method': ['GET']})
-        mapper.connect("/images/{image_id}/members/{id}",
-                       controller=members_resource,
-                       action="update",
-                       conditions={'method': ['PUT']})
-        mapper.connect("/images/{image_id}/members/{id}",
-                       controller=members_resource,
-                       action="delete",
-                       conditions={'method': ['DELETE']})
-        mapper.connect("/images/{image_id}/members/{id}",
-                       controller=reject_method_resource,
-                       action='reject',
-                       allowed_methods='GET, PUT, DELETE',
-                       conditions={'method': ['POST', 'HEAD', 'PATCH']})
-        mapper.connect("/shared-images/{id}",
-                       controller=members_resource,
-                       action="index_shared_images")'''
-
         hosts_resource = hosts.create_resource()
 
         mapper.connect("/nodes",

code/daisy/daisy/api/v1/services.py

@@ -30,7 +30,6 @@ import daisy.api.v1
 from daisy.api.v1 import controller
 from daisy.api.v1 import filters
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 from daisy import i18n
@@ -76,10 +75,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""

code/daisy/daisy/api/v1/template.py

@@ -32,7 +32,6 @@ import daisy.api.v1
 from daisy.api.v1 import controller
 from daisy.api.v1 import filters
 from daisy.common import exception
-from daisy.common import property_utils
 from daisy.common import utils
 from daisy.common import wsgi
 from daisy import i18n
@@ -84,10 +83,6 @@ class Controller(controller.BaseController):
         self.notifier = notifier.Notifier()
         registry.configure_registry_client()
         self.policy = policy.Enforcer()
-        if property_utils.is_property_protection_enabled():
-            self.prop_enforcer = property_utils.PropertyRules(self.policy)
-        else:
-            self.prop_enforcer = None
 
     def _enforce(self, req, action, target=None):
         """Authorize an action against our policies"""