Merge extended availability zone 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 extended AZ resposne into server controller.

Partially implements: blueprint api-extensions-merge-stein

Change-Id: Iebed7756c4599fbf03a5cf1130c047ee8f22d21c

Author: gmaanos

nova/api/openstack/compute/extended_availability_zone.py

@@ -35,7 +35,6 @@
 from nova.api.openstack.compute import create_backup
 from nova.api.openstack.compute import deferred_delete
 from nova.api.openstack.compute import evacuate
-from nova.api.openstack.compute import extended_availability_zone
 from nova.api.openstack.compute import extended_server_attributes
 from nova.api.openstack.compute import extended_status
 from nova.api.openstack.compute import extended_volumes
@@ -270,7 +269,6 @@ def _create_controller(main_controller, controller_list,
     servers.ServersController,
     [
         config_drive.ConfigDriveController,
-        extended_availability_zone.ExtendedAZController,
         extended_server_attributes.ExtendedServerAttributesController,
         extended_status.ExtendedStatusController,
         extended_volumes.ExtendedVolumesController,

nova/api/openstack/compute/routes.py

@@ -717,7 +717,8 @@ def update(self, req, id, body):
             instance = self.compute_api.update_instance(ctxt, instance,
                                                         update_dict)
             return self._view_builder.show(req, instance,
-                                           extend_address=False)
+                                           extend_address=False,
+                                           show_AZ=False)
         except exception.InstanceNotFound:
             msg = _("Instance could not be found")
             raise exc.HTTPNotFound(explanation=msg)
@@ -981,7 +982,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)
+        view = self._view_builder.show(req, instance, extend_address=False,
+                                       show_AZ=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

@@ -21,6 +21,7 @@
 from nova.api.openstack.compute.views import addresses as views_addresses
 from nova.api.openstack.compute.views import flavors as views_flavors
 from nova.api.openstack.compute.views import images as views_images
+from nova import availability_zones as avail_zone
 from nova import context as nova_context
 from nova import exception
 from nova import objects
@@ -110,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_extra_specs=None, show_AZ=True):
         """Detailed view of a single instance."""
         ip_v4 = instance.get('access_ip_v4')
         ip_v6 = instance.get('access_ip_v6')
@@ -160,6 +161,14 @@ def show(self, request, instance, extend_address=True,
         if server["server"]["status"] in self._progress_statuses:
             server["server"]["progress"] = instance.get("progress", 0)
 
+        if show_AZ:
+            context = request.environ['nova.context']
+            az = avail_zone.get_instance_availability_zone(context, instance)
+            # NOTE(mriedem): The OS-EXT-AZ prefix should not be used for new
+            # attributes after v2.1. They are only in v2.1 for backward compat
+            # with v2.0.
+            server["server"]["OS-EXT-AZ:availability_zone"] = az or ''
+
         if api_version_request.is_supported(request, min_version="2.9"):
             server["server"]["locked"] = (True if instance["locked_by"]
                                           else False)