Merge "trivial: Sort AZ helpers alphabetically"

Author: Zuul

openstackclient/common/availability_zone.py

@@ -62,18 +62,6 @@ def _xform_compute_availability_zone(az, include_extra):
     return result
 
 
-def _xform_volume_availability_zone(az):
-    result = []
-    zone_info = {
-        'zone_name': az.name,
-        'zone_status': (
-            'available' if az.state['available'] else 'not available'
-        ),
-    }
-    result.append(zone_info)
-    return result
-
-
 def _xform_network_availability_zone(az):
     result = []
     zone_info = {}
@@ -86,6 +74,18 @@ def _xform_network_availability_zone(az):
     return result
 
 
+def _xform_volume_availability_zone(az):
+    result = []
+    zone_info = {
+        'zone_name': az.name,
+        'zone_status': (
+            'available' if az.state['available'] else 'not available'
+        ),
+    }
+    result.append(zone_info)
+    return result
+
+
 class ListAvailabilityZone(command.Lister):
     _description = _("List availability zones and their status")
 
@@ -132,27 +132,6 @@ def _get_compute_availability_zones(self, parsed_args):
             result += _xform_compute_availability_zone(zone, parsed_args.long)
         return result
 
-    def _get_volume_availability_zones(self, parsed_args):
-        volume_client = sdk_utils.ensure_service_version(
-            self.app.client_manager.sdk_connection.volume, '3'
-        )
-        data = []
-        try:
-            data = list(volume_client.availability_zones())
-        except Exception as e:
-            LOG.debug('Volume availability zone exception: %s', e)
-            if parsed_args.volume:
-                message = _(
-                    "Availability zones list not supported by "
-                    "Block Storage API"
-                )
-                LOG.warning(message)
-
-        result = []
-        for zone in data:
-            result += _xform_volume_availability_zone(zone)
-        return result
-
     def _get_network_availability_zones(self, parsed_args):
         network_client = self.app.client_manager.network
         try:
@@ -174,6 +153,27 @@ def _get_network_availability_zones(self, parsed_args):
             result += _xform_network_availability_zone(zone)
         return result
 
+    def _get_volume_availability_zones(self, parsed_args):
+        volume_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.volume, '3'
+        )
+        data = []
+        try:
+            data = list(volume_client.availability_zones())
+        except Exception as e:
+            LOG.debug('Volume availability zone exception: %s', e)
+            if parsed_args.volume:
+                message = _(
+                    "Availability zones list not supported by "
+                    "Block Storage API"
+                )
+                LOG.warning(message)
+
+        result = []
+        for zone in data:
+            result += _xform_volume_availability_zone(zone)
+        return result
+
     def take_action(self, parsed_args):
         columns: tuple[str, ...] = ('Zone Name', 'Zone Status')
         if parsed_args.long:
@@ -187,17 +187,17 @@ def take_action(self, parsed_args):
         # Show everything by default.
         show_all = (
             not parsed_args.compute
-            and not parsed_args.volume
             and not parsed_args.network
+            and not parsed_args.volume
         )
 
         result = []
         if parsed_args.compute or show_all:
             result += self._get_compute_availability_zones(parsed_args)
-        if parsed_args.volume or show_all:
-            result += self._get_volume_availability_zones(parsed_args)
         if parsed_args.network or show_all:
             result += self._get_network_availability_zones(parsed_args)
+        if parsed_args.volume or show_all:
+            result += self._get_volume_availability_zones(parsed_args)
 
         return (
             columns,

openstackclient/tests/unit/common/test_availability_zone.py

@@ -38,41 +38,28 @@ def _build_compute_az_datalist(compute_az, long_datalist=False):
     return (datalist,)
 
 
-def _build_volume_az_datalist(volume_az, long_datalist=False):
+def _build_network_az_datalist(network_az, long_datalist=False):
     datalist = ()
     if not long_datalist:
-        datalist = (
-            volume_az.name,
-            'available',
-        )
+        datalist = (network_az.name, network_az.state)
     else:
         datalist = (
-            volume_az.name,
-            'available',
-            '',
+            network_az.name,
+            network_az.state,
+            network_az.resource,
             '',
             '',
             '',
         )
     return (datalist,)
 
 
-def _build_network_az_datalist(network_az, long_datalist=False):
+def _build_volume_az_datalist(volume_az, long_datalist=False):
     datalist = ()
     if not long_datalist:
-        datalist = (
-            network_az.name,
-            network_az.state,
-        )
+        datalist = (volume_az.name, 'available')
     else:
-        datalist = (
-            network_az.name,
-            network_az.state,
-            network_az.resource,
-            '',
-            '',
-            '',
-        )
+        datalist = (volume_az.name, 'available', '', '', '', '')
     return (datalist,)
 
 
@@ -82,10 +69,6 @@ class TestAvailabilityZoneList(
     compute_fakes.FakeClientMixin,
     utils.TestCommand,
 ):
-    compute_azs = compute_fakes.create_availability_zones()
-    volume_azs = volume_fakes.create_availability_zones(count=1)
-    network_azs = network_fakes.create_availability_zones()
-
     short_columnslist = ('Zone Name', 'Zone Status')
     long_columnslist = (
         'Zone Name',
@@ -99,11 +82,14 @@ class TestAvailabilityZoneList(
     def setUp(self):
         super().setUp()
 
+        self.compute_azs = compute_fakes.create_availability_zones()
         self.compute_client.availability_zones.return_value = self.compute_azs
+        self.network_azs = network_fakes.create_availability_zones()
+        self.network_client.availability_zones.return_value = self.network_azs
+        self.volume_azs = volume_fakes.create_availability_zones(count=1)
         self.volume_sdk_client.availability_zones.return_value = (
             self.volume_azs
         )
-        self.network_client.availability_zones.return_value = self.network_azs
 
         # Get the command object to test
         self.cmd = availability_zone.ListAvailabilityZone(self.app, None)
@@ -119,17 +105,17 @@ def test_availability_zone_list_no_options(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_sdk_client.availability_zones.assert_called_with()
         self.network_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
         for compute_az in self.compute_azs:
             datalist += _build_compute_az_datalist(compute_az)
-        for volume_az in self.volume_azs:
-            datalist += _build_volume_az_datalist(volume_az)
         for network_az in self.network_azs:
             datalist += _build_network_az_datalist(network_az)
+        for volume_az in self.volume_azs:
+            datalist += _build_volume_az_datalist(volume_az)
         self.assertEqual(datalist, tuple(data))
 
     def test_availability_zone_list_long(self):
@@ -147,23 +133,23 @@ def test_availability_zone_list_long(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_sdk_client.availability_zones.assert_called_with()
         self.network_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.long_columnslist, columns)
         datalist = ()
         for compute_az in self.compute_azs:
             datalist += _build_compute_az_datalist(
                 compute_az, long_datalist=True
             )
-        for volume_az in self.volume_azs:
-            datalist += _build_volume_az_datalist(
-                volume_az, long_datalist=True
-            )
         for network_az in self.network_azs:
             datalist += _build_network_az_datalist(
                 network_az, long_datalist=True
             )
+        for volume_az in self.volume_azs:
+            datalist += _build_volume_az_datalist(
+                volume_az, long_datalist=True
+            )
         self.assertEqual(datalist, tuple(data))
 
     def test_availability_zone_list_compute(self):
@@ -181,21 +167,21 @@ def test_availability_zone_list_compute(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_sdk_client.availability_zones.assert_not_called()
         self.network_client.availability_zones.assert_not_called()
+        self.volume_sdk_client.availability_zones.assert_not_called()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
         for compute_az in self.compute_azs:
             datalist += _build_compute_az_datalist(compute_az)
         self.assertEqual(datalist, tuple(data))
 
-    def test_availability_zone_list_volume(self):
+    def test_availability_zone_list_network(self):
         arglist = [
-            '--volume',
+            '--network',
         ]
         verifylist = [
-            ('volume', True),
+            ('network', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -205,21 +191,21 @@ def test_availability_zone_list_volume(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_not_called()
-        self.volume_sdk_client.availability_zones.assert_called_with()
-        self.network_client.availability_zones.assert_not_called()
+        self.network_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_not_called()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
-        for volume_az in self.volume_azs:
-            datalist += _build_volume_az_datalist(volume_az)
+        for network_az in self.network_azs:
+            datalist += _build_network_az_datalist(network_az)
         self.assertEqual(datalist, tuple(data))
 
-    def test_availability_zone_list_network(self):
+    def test_availability_zone_list_volume(self):
         arglist = [
-            '--network',
+            '--volume',
         ]
         verifylist = [
-            ('network', True),
+            ('volume', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -229,11 +215,11 @@ def test_availability_zone_list_network(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_not_called()
-        self.volume_sdk_client.availability_zones.assert_not_called()
-        self.network_client.availability_zones.assert_called_with()
+        self.network_client.availability_zones.assert_not_called()
+        self.volume_sdk_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
-        for network_az in self.network_azs:
-            datalist += _build_network_az_datalist(network_az)
+        for volume_az in self.volume_azs:
+            datalist += _build_volume_az_datalist(volume_az)
         self.assertEqual(datalist, tuple(data))