{Compute} az vm list-skus: Fix filtering available skus (#32066)

Author: yanzhudd

src/azure-cli/azure/cli/command_modules/vm/_vm_utils.py

@@ -133,7 +133,7 @@ def _match_location(loc, locations):
 
 
 # pylint: disable=line-too-long
-def is_sku_available(cmd, sku_info, zone):
+def is_sku_available(sku_info, zone):
     """
     The SKU is unavailable in the following cases:
     1. regional restriction and the region is restricted
@@ -146,16 +146,12 @@ def is_sku_available(cmd, sku_info, zone):
     if not sku_info.get('restrictions', []):
         return is_available
     for restriction in sku_info['restrictions']:
-        if restriction.get('reason_code', '') == 'NotAvailableForSubscription':
-            # The attribute location_info is not supported in versions 2017-03-30 and earlier
-            if cmd.supported_api_version(max_api='2017-03-30'):
-                is_available = False
-                break
+        if restriction.get('reasonCode', '') == 'NotAvailableForSubscription':
             if restriction['type'] == 'Zone' and not (
-                    set(sku_info['location_info'][0].get('zones', []) or []) - set(restriction['restriction_info'].get('zones', []) or [])):
+                    set(sku_info['locationInfo'][0].get('zones', []) or []) - set(restriction['restrictionInfo'].get('zones', []) or [])):
                 is_restrict_zone = True
             if restriction['type'] == 'Location' and (
-                    sku_info['location_info'][0]['location'] in (restriction['restriction_info'].get('locations', []) or [])):
+                    sku_info['locationInfo'][0]['location'] in (restriction['restrictionInfo'].get('locations', []) or [])):
                 is_restrict_location = True
 
             if is_restrict_location or (is_restrict_zone and zone):

src/azure-cli/azure/cli/command_modules/vm/custom.py

@@ -1349,7 +1349,7 @@ def list_skus(cmd, location=None, size=None, zone=None, show_all=None, resource_
     if not show_all:
         available_skus = []
         for sku_info in result:
-            if is_sku_available(cmd, sku_info, zone):
+            if is_sku_available(sku_info, zone):
                 available_skus.append(sku_info)
         result = available_skus
     if resource_type:

src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_list_compute_skus_table_output.yaml

@@ -2299,47 +2299,47 @@ def test_list_compute_skus_partially_unavailable(self, client_factory_mock):
         restriction_info_zone = mock.MagicMock()
         restriction_info_zone.zones = [1, 2, 3]
         restriction_zone = mock.MagicMock()
-        restriction_zone.reason_code = 'NotAvailableForSubscription'
+        restriction_zone.reasonCode = 'NotAvailableForSubscription'
         restriction_zone.type = 'Zone'
-        restriction_zone.restriction_info = restriction_info_zone
+        restriction_zone.restrictionInfo = restriction_info_zone
         restriction_info_location = mock.MagicMock()
         restriction_info_location.locations = ['location']
         restriction_location = mock.MagicMock()
-        restriction_location.reason_code = 'NotAvailableForSubscription'
+        restriction_location.reasonCode = 'NotAvailableForSubscription'
         restriction_location.type = 'Location'
-        restriction_location.restriction_info = restriction_info_location
+        restriction_location.restrictionInfo = restriction_info_location
 
         # zonal restriction but not regional restriction
         restrictions = [restriction_zone]
         np.restrictions = restrictions
         # show skus supporting availability zones
-        is_available = is_sku_available(cmd, np, True)
+        is_available = is_sku_available(np, True)
         self.assertFalse(is_available)
         # not show skus supporting availability zones
-        is_available = is_sku_available(cmd, np, None)
+        is_available = is_sku_available(np, None)
         self.assertTrue(is_available)
 
         # not all zones are restricted
         restriction_info_zone.zones = [1, 2]
-        is_available = is_sku_available(cmd, np, True)
+        is_available = is_sku_available(np, True)
         self.assertTrue(is_available)
-        is_available = is_sku_available(cmd, np, None)
+        is_available = is_sku_available(np, None)
         self.assertTrue(is_available)
 
         # regional restriction but not zonal restriction
         restrictions = [restriction_location]
         np.restrictions = restrictions
-        is_available = is_sku_available(cmd, np, True)
+        is_available = is_sku_available(np, True)
         self.assertFalse(is_available)
-        is_available = is_sku_available(cmd, np, None)
+        is_available = is_sku_available(np, None)
         self.assertFalse(is_available)
 
         # regional restriction and zonal restriction
         restrictions = [restriction_location, restriction_zone]
         np.restrictions = restrictions
-        is_available = is_sku_available(cmd, np, True)
+        is_available = is_sku_available(np, True)
         self.assertFalse(is_available)
-        is_available = is_sku_available(cmd, np, None)
+        is_available = is_sku_available(np, None)
         self.assertFalse(is_available)