Merge config drive extension response into server controller

As nova extensions has been deprecated already and goal is to
merge all scattered code into main controller side.
Currently schema and request/response extended code are there
among all extensions.

This commit merge the config drive extension resposne into server controller.

Partially implements: blueprint api-extensions-merge-stein

Change-Id: I5725e37b5640b91f388af9b12ac1b3dad4d438a7

Author: gmaanos

nova/api/openstack/compute/config_drive.py

@@ -28,7 +28,6 @@
 from nova.api.openstack.compute import cells
 from nova.api.openstack.compute import certificates
 from nova.api.openstack.compute import cloudpipe
-from nova.api.openstack.compute import config_drive
 from nova.api.openstack.compute import console_auth_tokens
 from nova.api.openstack.compute import console_output
 from nova.api.openstack.compute import consoles
@@ -268,7 +267,6 @@ def _create_controller(main_controller, controller_list,
 server_controller = functools.partial(_create_controller,
     servers.ServersController,
     [
-        config_drive.ConfigDriveController,
         extended_server_attributes.ExtendedServerAttributesController,
         extended_status.ExtendedStatusController,
         extended_volumes.ExtendedVolumesController,

nova/api/openstack/compute/routes.py

@@ -718,7 +718,8 @@ def update(self, req, id, body):
                                                         update_dict)
             return self._view_builder.show(req, instance,
                                            extend_address=False,
-                                           show_AZ=False)
+                                           show_AZ=False,
+                                           show_config_drive=False)
         except exception.InstanceNotFound:
             msg = _("Instance could not be found")
             raise exc.HTTPNotFound(explanation=msg)
@@ -983,7 +984,8 @@ def _action_rebuild(self, req, id, body):
         instance = self._get_server(context, req, id, is_detail=True)
 
         view = self._view_builder.show(req, instance, extend_address=False,
-                                       show_AZ=False)
+                                       show_AZ=False,
+                                       show_config_drive=False)
 
         # Add on the admin_password attribute since the view doesn't do it
         # unless instance passwords are disabled

nova/api/openstack/compute/servers.py

@@ -111,7 +111,7 @@ def get_show_expected_attrs(self, expected_attrs=None):
         return sorted(list(set(self._show_expected_attrs + expected_attrs)))
 
     def show(self, request, instance, extend_address=True,
-             show_extra_specs=None, show_AZ=True):
+             show_extra_specs=None, show_AZ=True, show_config_drive=True):
         """Detailed view of a single instance."""
         ip_v4 = instance.get('access_ip_v4')
         ip_v6 = instance.get('access_ip_v6')
@@ -169,6 +169,9 @@ def show(self, request, instance, extend_address=True,
             # with v2.0.
             server["server"]["OS-EXT-AZ:availability_zone"] = az or ''
 
+        if show_config_drive:
+            server["server"]["config_drive"] = instance["config_drive"]
+
         if api_version_request.is_supported(request, min_version="2.9"):
             server["server"]["locked"] = (True if instance["locked_by"]
                                           else False)

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

@@ -378,6 +378,7 @@ def _get_server_data_dict(self, uuid, image_bookmark, flavor_bookmark,
                 "accessIPv4": '',
                 "accessIPv6": '',
                 "OS-EXT-AZ:availability_zone": "nova",
+                "config_drive": None,
             }
         }
 
@@ -2088,6 +2089,7 @@ def test_rebuild_response_has_no_show_server_only_attributes(self):
                                                body=body).obj
 
         self.assertNotIn('OS-EXT-AZ:availability_zone', body['server'])
+        self.assertNotIn('config_drive', body['server'])
 
     @mock.patch.object(compute_api.API, 'start')
     def test_start(self, mock_start):
@@ -2683,6 +2685,7 @@ def test_update_response_has_no_show_server_only_attributes(self):
         req = self._get_request(body)
         res_dict = self.controller.update(req, FAKE_UUID, body=body)
         self.assertNotIn('OS-EXT-AZ:availability_zone', res_dict['server'])
+        self.assertNotIn('config_drive', res_dict['server'])
 
     def test_update_server_name_too_long(self):
         body = {'server': {'name': 'x' * 256}}
@@ -5992,6 +5995,7 @@ def test_build_server_detail(self):
                 "accessIPv4": '',
                 "accessIPv6": '',
                 "OS-EXT-AZ:availability_zone": "nova",
+                "config_drive": None,
             }
         }
 
@@ -6072,6 +6076,7 @@ def test_build_server_detail_with_fault(self):
                 "accessIPv4": '',
                 "accessIPv6": '',
                 "OS-EXT-AZ:availability_zone": "nova",
+                "config_drive": None,
             }
         }
 
@@ -6251,6 +6256,7 @@ def test_build_server_detail_active_status(self):
                 "accessIPv4": '',
                 "accessIPv6": '',
                 "OS-EXT-AZ:availability_zone": "nova",
+                "config_drive": None,
             }
         }
 
@@ -6328,6 +6334,7 @@ def test_build_server_detail_with_metadata(self):
                 "accessIPv4": '',
                 "accessIPv6": '',
                 "OS-EXT-AZ:availability_zone": "nova",
+                "config_drive": None,
             }
         }