[AKS] az aks create/update: Update the VM SKU regex validation to include larger set of VMs for Azure Container Storage (#29726)

Author: mukhoakash

src/azure-cli/azure/cli/command_modules/acs/azurecontainerstorage/_helpers.py

@@ -414,12 +414,15 @@ def get_desired_resource_value_args(
 # Returns -1 if there is a problem with parsing the vm_size.
 def get_cores_from_sku(vm_size):
     cpu_value = -1
-    pattern = r'standard_([a-z]+)(\d+)([a-z]*)_v(\d+)'
+    pattern = r'([a-z])+(\d+)[a-z]*(?=_v(\d+)[^_]*$|$)'
     match = re.search(pattern, vm_size.lower())
     if match:
         series_prefix = match.group(1)
         size_val = int(match.group(2))
-        version = int(match.group(4))
+        version_val = match.group(3)
+        version = -1
+        if version_val is not None:
+            version = int(version_val)
 
         cpu_value = size_val
         # https://learn.microsoft.com/en-us/azure/virtual-machines/dv2-dsv2-series

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_validators.py

@@ -985,6 +985,91 @@ def test_enable_with_premiumv2_sku_and_azure_disk(self):
             )
         self.assertEqual(str(cm.exception), err)
 
+    def test_enable_with_insufficient_cores_1(self):
+        storage_pool_name = "valid-name"
+        storage_pool_sku = acstor_consts.CONST_STORAGE_POOL_SKU_PREMIUM_LRS
+        storage_pool_type = acstor_consts.CONST_STORAGE_POOL_TYPE_AZURE_DISK
+        nodepool_list = "pool1"
+        agentpools = [{"name": "pool1", "vm_size": "Standard_D2s_v2", "count": 3, "zoned": False}]
+        err = (
+            "Cannot operate Azure Container Storage on a node pool consisting of "
+            "nodes with cores less than 4. Node pool: pool1 with node size: Standard_D2s_v2 "
+            "which is assigned for Azure Container Storage has nodes with 2 cores."
+        )
+        with self.assertRaises(InvalidArgumentValueError) as cm:
+            acstor_validator.validate_enable_azure_container_storage_params(
+                storage_pool_type, storage_pool_name, storage_pool_sku, None, None, nodepool_list, agentpools, False, False, False, False, False, None, None, acstor_consts.CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY, acstor_consts.CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD
+            )
+        self.assertEqual(str(cm.exception), err)
+
+    def test_enable_with_insufficient_cores_2(self):
+        storage_pool_name = "valid-name"
+        storage_pool_sku = acstor_consts.CONST_STORAGE_POOL_SKU_PREMIUM_LRS
+        storage_pool_type = acstor_consts.CONST_STORAGE_POOL_TYPE_AZURE_DISK
+        nodepool_list = "pool1"
+        agentpools = [{"name": "pool1", "vm_size": "Standard_H100-D2s_v2", "count": 3, "zoned": False}]
+        err = (
+            "Cannot operate Azure Container Storage on a node pool consisting of "
+            "nodes with cores less than 4. Node pool: pool1 with node size: Standard_H100-D2s_v2 "
+            "which is assigned for Azure Container Storage has nodes with 2 cores."
+        )
+        with self.assertRaises(InvalidArgumentValueError) as cm:
+            acstor_validator.validate_enable_azure_container_storage_params(
+                storage_pool_type, storage_pool_name, storage_pool_sku, None, None, nodepool_list, agentpools, False, False, False, False, False, None, None, acstor_consts.CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY, acstor_consts.CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD
+            )
+        self.assertEqual(str(cm.exception), err)
+
+    def test_enable_with_insufficient_cores_3(self):
+        storage_pool_name = "valid-name"
+        storage_pool_sku = acstor_consts.CONST_STORAGE_POOL_SKU_PREMIUM_LRS
+        storage_pool_type = acstor_consts.CONST_STORAGE_POOL_TYPE_AZURE_DISK
+        nodepool_list = "pool1"
+        agentpools = [{"name": "pool1", "vm_size": "Standard_H100-D2s", "count": 3, "zoned": False}]
+        err = (
+            "Cannot operate Azure Container Storage on a node pool consisting of "
+            "nodes with cores less than 4. Node pool: pool1 with node size: Standard_H100-D2s "
+            "which is assigned for Azure Container Storage has nodes with 2 cores."
+        )
+        with self.assertRaises(InvalidArgumentValueError) as cm:
+            acstor_validator.validate_enable_azure_container_storage_params(
+                storage_pool_type, storage_pool_name, storage_pool_sku, None, None, nodepool_list, agentpools, False, False, False, False, False, None, None, acstor_consts.CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY, acstor_consts.CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD
+            )
+        self.assertEqual(str(cm.exception), err)
+
+    def test_enable_with_insufficient_cores_4(self):
+        storage_pool_name = "valid-name"
+        storage_pool_sku = acstor_consts.CONST_STORAGE_POOL_SKU_PREMIUM_LRS
+        storage_pool_type = acstor_consts.CONST_STORAGE_POOL_TYPE_AZURE_DISK
+        nodepool_list = "pool1"
+        agentpools = [{"name": "pool1", "vm_size": "Standard_H2", "count": 3, "zoned": False}]
+        err = (
+            "Cannot operate Azure Container Storage on a node pool consisting of "
+            "nodes with cores less than 4. Node pool: pool1 with node size: Standard_H2 "
+            "which is assigned for Azure Container Storage has nodes with 2 cores."
+        )
+        with self.assertRaises(InvalidArgumentValueError) as cm:
+            acstor_validator.validate_enable_azure_container_storage_params(
+                storage_pool_type, storage_pool_name, storage_pool_sku, None, None, nodepool_list, agentpools, False, False, False, False, False, None, None, acstor_consts.CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY, acstor_consts.CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD
+            )
+        self.assertEqual(str(cm.exception), err)
+
+    def test_enable_with_insufficient_cores_5(self):
+        storage_pool_name = "valid-name"
+        storage_pool_sku = acstor_consts.CONST_STORAGE_POOL_SKU_PREMIUM_LRS
+        storage_pool_type = acstor_consts.CONST_STORAGE_POOL_TYPE_AZURE_DISK
+        nodepool_list = "pool1"
+        agentpools = [{"name": "pool1", "vm_size": "Standard_D2s", "count": 3, "zoned": False}]
+        err = (
+            "Cannot operate Azure Container Storage on a node pool consisting of "
+            "nodes with cores less than 4. Node pool: pool1 with node size: Standard_D2s "
+            "which is assigned for Azure Container Storage has nodes with 2 cores."
+        )
+        with self.assertRaises(InvalidArgumentValueError) as cm:
+            acstor_validator.validate_enable_azure_container_storage_params(
+                storage_pool_type, storage_pool_name, storage_pool_sku, None, None, nodepool_list, agentpools, False, False, False, False, False, None, None, acstor_consts.CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY, acstor_consts.CONST_EPHEMERAL_NVME_PERF_TIER_STANDARD
+            )
+        self.assertEqual(str(cm.exception), err)
+
     def test_enable_with_option_and_non_ephemeral_disk_pool(self):
         storage_pool_name = "valid-name"
         storage_pool_option = acstor_consts.CONST_STORAGE_POOL_OPTION_NVME