Merge "Remove the deprecated API extensions policies"

Author: Zuul

nova/api/openstack/compute/config_drive.py

@@ -16,7 +16,6 @@
 """Config Drive extension."""
 
 from nova.api.openstack import wsgi
-from nova.policies import config_drive as cd_policies
 
 ATTRIBUTE_NAME = "config_drive"
 
@@ -37,14 +36,10 @@ def _show(self, req, resp_obj):
 
     @wsgi.extends
     def show(self, req, resp_obj, id):
-        context = req.environ['nova.context']
-        if context.can(cd_policies.BASE_POLICY_NAME, fatal=False):
-            self._show(req, resp_obj)
+        self._show(req, resp_obj)
 
     @wsgi.extends
     def detail(self, req, resp_obj):
-        context = req.environ['nova.context']
-        if 'servers' in resp_obj.obj and context.can(
-                cd_policies.BASE_POLICY_NAME, fatal=False):
+        if 'servers' in resp_obj.obj:
             servers = resp_obj.obj['servers']
             self._add_config_drive(req, servers)

nova/api/openstack/compute/extended_availability_zone.py

@@ -17,7 +17,6 @@
 
 from nova.api.openstack import wsgi
 from nova import availability_zones as avail_zone
-from nova.policies import extended_availability_zone as eaz_policies
 
 PREFIX = "OS-EXT-AZ"
 
@@ -34,16 +33,14 @@ def _extend_server(self, context, server, instance):
     @wsgi.extends
     def show(self, req, resp_obj, id):
         context = req.environ['nova.context']
-        if context.can(eaz_policies.BASE_POLICY_NAME, fatal=False):
-            server = resp_obj.obj['server']
-            db_instance = req.get_db_instance(server['id'])
-            self._extend_server(context, server, db_instance)
+        server = resp_obj.obj['server']
+        db_instance = req.get_db_instance(server['id'])
+        self._extend_server(context, server, db_instance)
 
     @wsgi.extends
     def detail(self, req, resp_obj):
         context = req.environ['nova.context']
-        if context.can(eaz_policies.BASE_POLICY_NAME, fatal=False):
-            servers = list(resp_obj.obj['servers'])
-            for server in servers:
-                db_instance = req.get_db_instance(server['id'])
-                self._extend_server(context, server, db_instance)
+        servers = list(resp_obj.obj['servers'])
+        for server in servers:
+            db_instance = req.get_db_instance(server['id'])
+            self._extend_server(context, server, db_instance)

nova/api/openstack/compute/extended_status.py

@@ -15,7 +15,6 @@
 """The Extended Status Admin API extension."""
 
 from nova.api.openstack import wsgi
-from nova.policies import extended_status as es_policies
 
 
 class ExtendedStatusController(wsgi.Controller):
@@ -32,21 +31,17 @@ def _extend_server(self, server, instance):
 
     @wsgi.extends
     def show(self, req, resp_obj, id):
-        context = req.environ['nova.context']
-        if context.can(es_policies.BASE_POLICY_NAME, fatal=False):
-            server = resp_obj.obj['server']
-            db_instance = req.get_db_instance(server['id'])
-            # server['id'] is guaranteed to be in the cache due to
-            # the core API adding it in its 'show' method.
-            self._extend_server(server, db_instance)
+        server = resp_obj.obj['server']
+        db_instance = req.get_db_instance(server['id'])
+        # server['id'] is guaranteed to be in the cache due to
+        # the core API adding it in its 'show' method.
+        self._extend_server(server, db_instance)
 
     @wsgi.extends
     def detail(self, req, resp_obj):
-        context = req.environ['nova.context']
-        if context.can(es_policies.BASE_POLICY_NAME, fatal=False):
-            servers = list(resp_obj.obj['servers'])
-            for server in servers:
-                db_instance = req.get_db_instance(server['id'])
-                # server['id'] is guaranteed to be in the cache due to
-                # the core API adding it in its 'detail' method.
-                self._extend_server(server, db_instance)
+        servers = list(resp_obj.obj['servers'])
+        for server in servers:
+            db_instance = req.get_db_instance(server['id'])
+            # server['id'] is guaranteed to be in the cache due to
+            # the core API adding it in its 'detail' method.
+            self._extend_server(server, db_instance)

nova/api/openstack/compute/extended_volumes.py

@@ -19,13 +19,12 @@
 from nova.api.openstack import wsgi
 from nova import context
 from nova import objects
-from nova.policies import extended_volumes as ev_policies
 
 LOG = logging.getLogger(__name__)
 
 
 class ExtendedVolumesController(wsgi.Controller):
-    def _extend_server(self, context, server, req, bdms):
+    def _extend_server(self, server, req, bdms):
         volumes_attached = []
         for bdm in bdms:
             if bdm.get('volume_id'):
@@ -43,12 +42,11 @@ def _extend_server(self, context, server, req, bdms):
     @wsgi.extends
     def show(self, req, resp_obj, id):
         context = req.environ['nova.context']
-        if context.can(ev_policies.BASE_POLICY_NAME, fatal=False):
-            server = resp_obj.obj['server']
-            bdms = objects.BlockDeviceMappingList.bdms_by_instance_uuid(
-                context, [server['id']])
-            instance_bdms = self._get_instance_bdms(bdms, server)
-            self._extend_server(context, server, req, instance_bdms)
+        server = resp_obj.obj['server']
+        bdms = objects.BlockDeviceMappingList.bdms_by_instance_uuid(
+            context, [server['id']])
+        instance_bdms = self._get_instance_bdms(bdms, server)
+        self._extend_server(server, req, instance_bdms)
 
     @staticmethod
     def _get_instance_bdms_in_multiple_cells(ctxt, servers):
@@ -82,12 +80,11 @@ def _get_instance_bdms_in_multiple_cells(ctxt, servers):
     @wsgi.extends
     def detail(self, req, resp_obj):
         context = req.environ['nova.context']
-        if context.can(ev_policies.BASE_POLICY_NAME, fatal=False):
-            servers = list(resp_obj.obj['servers'])
-            bdms = self._get_instance_bdms_in_multiple_cells(context, servers)
-            for server in servers:
-                instance_bdms = self._get_instance_bdms(bdms, server)
-                self._extend_server(context, server, req, instance_bdms)
+        servers = list(resp_obj.obj['servers'])
+        bdms = self._get_instance_bdms_in_multiple_cells(context, servers)
+        for server in servers:
+            instance_bdms = self._get_instance_bdms(bdms, server)
+            self._extend_server(server, req, instance_bdms)
 
     def _get_instance_bdms(self, bdms, server):
         # server['id'] is guaranteed to be in the cache due to

nova/api/openstack/compute/image_size.py

@@ -14,7 +14,6 @@
 #    under the License.
 
 from nova.api.openstack import wsgi
-from nova.policies import image_size as is_policies
 
 
 class ImageSizeController(wsgi.Controller):
@@ -28,21 +27,17 @@ def _extend_image(self, image, image_cache):
 
     @wsgi.extends
     def show(self, req, resp_obj, id):
-        context = req.environ["nova.context"]
-        if context.can(is_policies.BASE_POLICY_NAME, fatal=False):
-            image_resp = resp_obj.obj['image']
-            # image guaranteed to be in the cache due to the core API adding
-            # it in its 'show' method
-            image_cached = req.get_db_item('images', image_resp['id'])
-            self._extend_image(image_resp, image_cached)
+        image_resp = resp_obj.obj['image']
+        # image guaranteed to be in the cache due to the core API adding
+        # it in its 'show' method
+        image_cached = req.get_db_item('images', image_resp['id'])
+        self._extend_image(image_resp, image_cached)
 
     @wsgi.extends
     def detail(self, req, resp_obj):
-        context = req.environ['nova.context']
-        if context.can(is_policies.BASE_POLICY_NAME, fatal=False):
-            images_resp = list(resp_obj.obj['images'])
-            # images guaranteed to be in the cache due to the core API adding
-            # it in its 'detail' method
-            for image in images_resp:
-                image_cached = req.get_db_item('images', image['id'])
-                self._extend_image(image, image_cached)
+        images_resp = list(resp_obj.obj['images'])
+        # images guaranteed to be in the cache due to the core API adding
+        # it in its 'detail' method
+        for image in images_resp:
+            image_cached = req.get_db_item('images', image['id'])
+            self._extend_image(image, image_cached)

nova/api/openstack/compute/keypairs.py

@@ -306,14 +306,10 @@ def _show(self, req, resp_obj):
 
     @wsgi.extends
     def show(self, req, resp_obj, id):
-        context = req.environ['nova.context']
-        if context.can(kp_policies.BASE_POLICY_NAME, fatal=False):
-            self._show(req, resp_obj)
+        self._show(req, resp_obj)
 
     @wsgi.extends
     def detail(self, req, resp_obj):
-        context = req.environ['nova.context']
-        if 'servers' in resp_obj.obj and context.can(
-                kp_policies.BASE_POLICY_NAME, fatal=False):
+        if 'servers' in resp_obj.obj:
             servers = resp_obj.obj['servers']
             self._add_key_name(req, servers)

nova/api/openstack/compute/security_groups.py

@@ -490,9 +490,6 @@ def _extend_servers(self, req, servers):
             return
         key = "security_groups"
         context = req.environ['nova.context']
-        if not context.can(sg_policies.BASE_POLICY_NAME, fatal=False):
-            return
-
         if not openstack_driver.is_neutron_security_groups():
             for server in servers:
                 instance = req.get_db_instance(server['id'])

nova/api/openstack/compute/server_usage.py

@@ -13,7 +13,6 @@
 #   under the License.
 
 from nova.api.openstack import wsgi
-from nova.policies import server_usage as su_policies
 
 
 resp_topic = "OS-SRV-USG"
@@ -33,21 +32,17 @@ def _extend_server(self, server, instance):
 
     @wsgi.extends
     def show(self, req, resp_obj, id):
-        context = req.environ['nova.context']
-        if context.can(su_policies.BASE_POLICY_NAME, fatal=False):
-            server = resp_obj.obj['server']
-            db_instance = req.get_db_instance(server['id'])
-            # server['id'] is guaranteed to be in the cache due to
-            # the core API adding it in its 'show' method.
-            self._extend_server(server, db_instance)
+        server = resp_obj.obj['server']
+        db_instance = req.get_db_instance(server['id'])
+        # server['id'] is guaranteed to be in the cache due to
+        # the core API adding it in its 'show' method.
+        self._extend_server(server, db_instance)
 
     @wsgi.extends
     def detail(self, req, resp_obj):
-        context = req.environ['nova.context']
-        if context.can(su_policies.BASE_POLICY_NAME, fatal=False):
-            servers = list(resp_obj.obj['servers'])
-            for server in servers:
-                db_instance = req.get_db_instance(server['id'])
-                # server['id'] is guaranteed to be in the cache due to
-                # the core API adding it in its 'detail' method.
-                self._extend_server(server, db_instance)
+        servers = list(resp_obj.obj['servers'])
+        for server in servers:
+            db_instance = req.get_db_instance(server['id'])
+            # server['id'] is guaranteed to be in the cache due to
+            # the core API adding it in its 'detail' method.
+            self._extend_server(server, db_instance)

nova/api/openstack/compute/views/flavors.py

@@ -15,8 +15,6 @@
 
 from nova.api.openstack import api_version_request
 from nova.api.openstack import common
-from nova.policies import flavor_access as fa_policies
-from nova.policies import flavor_rxtx as fr_policies
 
 FLAVOR_DESCRIPTION_MICROVERSION = '2.55'
 FLAVOR_EXTRA_SPECS_MICROVERSION = '2.61'
@@ -27,12 +25,10 @@ class ViewBuilder(common.ViewBuilder):
     _collection_name = "flavors"
 
     def basic(self, request, flavor, include_description=False,
-              update_is_public=None, update_rxtx_factor=None,
               include_extra_specs=False):
-        # include_extra_specs & update_is_public & update_rxtx_factor are
-        # placeholder param which are not used in this method as basic() method
-        # is used by index() (GET /flavors) which does not return those keys in
-        # response.
+        # include_extra_specs is placeholder param which is not used in
+        # this method as basic() method is used by index() (GET /flavors)
+        # which does not return those keys in response.
         flavor_dict = {
             "flavor": {
                 "id": flavor["flavorid"],
@@ -49,7 +45,6 @@ def basic(self, request, flavor, include_description=False,
         return flavor_dict
 
     def show(self, request, flavor, include_description=False,
-             update_is_public=None, update_rxtx_factor=None,
              include_extra_specs=False):
         flavor_dict = {
             "flavor": {
@@ -61,6 +56,8 @@ def show(self, request, flavor, include_description=False,
                 "OS-FLV-EXT-DATA:ephemeral": flavor["ephemeral_gb"],
                 "OS-FLV-DISABLED:disabled": flavor["disabled"],
                 "vcpus": flavor["vcpus"],
+                "os-flavor-access:is_public": flavor['is_public'],
+                "rxtx_factor": flavor['rxtx_factor'] or "",
                 "links": self._get_links(request,
                                          flavor["flavorid"],
                                          self._collection_name),
@@ -73,26 +70,6 @@ def show(self, request, flavor, include_description=False,
         if include_extra_specs:
             flavor_dict['flavor']['extra_specs'] = flavor.extra_specs
 
-        # TODO(gmann): 'update_is_public' & 'update_rxtx_factor' are policies
-        # checks. Once os-flavor-access & os-flavor-rxtx policies are
-        # removed, 'os-flavor-access:is_public' and 'rxtx_factor' need to be
-        # added in response without any check.
-
-        # Evaluate the policies when using show method directly.
-        context = request.environ['nova.context']
-        if update_is_public is None:
-            update_is_public = context.can(fa_policies.BASE_POLICY_NAME,
-                                           fatal=False)
-        if update_rxtx_factor is None:
-            update_rxtx_factor = context.can(fr_policies.BASE_POLICY_NAME,
-                                             fatal=False)
-        if update_is_public:
-            flavor_dict['flavor'].update({
-                "os-flavor-access:is_public": flavor['is_public']})
-        if update_rxtx_factor:
-            flavor_dict['flavor'].update(
-                {"rxtx_factor": flavor['rxtx_factor'] or ""})
-
         return flavor_dict
 
     def index(self, request, flavors):
@@ -108,20 +85,12 @@ def detail(self, request, flavors, include_extra_specs=False):
         coll_name = self._collection_name + '/detail'
         include_description = api_version_request.is_supported(
             request, FLAVOR_DESCRIPTION_MICROVERSION)
-        context = request.environ['nova.context']
-        update_is_public = context.can(fa_policies.BASE_POLICY_NAME,
-                                       fatal=False)
-        update_rxtx_factor = context.can(fr_policies.BASE_POLICY_NAME,
-                                         fatal=False)
         return self._list_view(self.show, request, flavors, coll_name,
                                include_description=include_description,
-                               update_is_public=update_is_public,
-                               update_rxtx_factor=update_rxtx_factor,
                                include_extra_specs=include_extra_specs)
 
     def _list_view(self, func, request, flavors, coll_name,
-                   include_description=False, update_is_public=None,
-                   update_rxtx_factor=None, include_extra_specs=False):
+                   include_description=False, include_extra_specs=False):
         """Provide a view for a list of flavors.
 
         :param func: Function used to format the flavor data
@@ -131,17 +100,12 @@ def _list_view(self, func, request, flavors, coll_name,
                           for a pagination query
         :param include_description: If the flavor.description should be
                                     included in the response dict.
-        :param update_is_public: If the flavor.is_public field should be
-                                 included in the response dict.
-        :param update_rxtx_factor: If the flavor.rxtx_factor field should be
-                                   included in the response dict.
         :param include_extra_specs: If the flavor.extra_specs should be
                                     included in the response dict.
 
         :returns: Flavor reply data in dictionary format
         """
         flavor_list = [func(request, flavor, include_description,
-                            update_is_public, update_rxtx_factor,
                             include_extra_specs)["flavor"]
                        for flavor in flavors]
         flavors_links = self._get_collection_links(request,