Merge "Fix bug in os-availability-zone extension."

1 files changed, 16 insertions, 12 deletions

diff --git a/nova/api/openstack/compute/contrib/availability_zone.py b/nova/api/openstack/compute/contrib/availability_zone.py
index 14602265b..22001b65f 100644
--- a/nova/api/openstack/compute/contrib/availability_zone.py
+++ b/nova/api/openstack/compute/contrib/availability_zone.py
@@ -76,24 +76,28 @@ class AvailabilityZoneController(wsgi.Controller):
         super(AvailabilityZoneController, self).__init__()
         self.servicegroup_api = servicegroup.API()
 
-    def _describe_availability_zones(self, context, **kwargs):
-        ctxt = context.elevated()
-        available_zones, not_available_zones = \
-            availability_zones.get_availability_zones(ctxt)
-
+    def _get_filtered_availability_zones(self, zones, is_available):
         result = []
-        for zone in available_zones:
+        for zone in zones:
             # Hide internal_service_availability_zone
             if zone == CONF.internal_service_availability_zone:
                 continue
             result.append({'zoneName': zone,
-                           'zoneState': {'available': True},
-                           "hosts": None})
-        for zone in not_available_zones:
-            result.append({'zoneName': zone,
-                           'zoneState': {'available': False},
+                           'zoneState': {'available': is_available},
                            "hosts": None})
-        return {'availabilityZoneInfo': result}
+        return result
+
+    def _describe_availability_zones(self, context, **kwargs):
+        ctxt = context.elevated()
+        available_zones, not_available_zones = \
+            availability_zones.get_availability_zones(ctxt)
+
+        filtered_available_zones = \
+            self._get_filtered_availability_zones(available_zones, True)
+        filtered_not_available_zones = \
+            self._get_filtered_availability_zones(not_available_zones, False)
+        return {'availabilityZoneInfo': filtered_available_zones +
+                                        filtered_not_available_zones}
 
     def _describe_availability_zones_verbose(self, context, **kwargs):
         ctxt = context.elevated()