Resolve PR comments

Author: nearora-msft

src/azure-cli/azure/cli/command_modules/acs/_params.py

@@ -258,6 +258,11 @@
 ]
 
 # azure container storage
+container_storage_versions = [
+    "1",
+    "2"
+]
+
 storage_pool_types = [
     CONST_STORAGE_POOL_TYPE_AZURE_DISK,
     CONST_STORAGE_POOL_TYPE_EPHEMERAL_DISK,
@@ -515,6 +520,7 @@ def load_arguments(self, _):
         )
         c.argument(
             "container_storage_version",
+            arg_type=get_enum_type(container_storage_versions),
             help="set azure container storage version, the latest version will be installed by default",
         )
         c.argument(
@@ -723,6 +729,7 @@ def load_arguments(self, _):
         )
         c.argument(
             "container_storage_version",
+            arg_type=get_enum_type(container_storage_versions),
             help="set azure container storage version, the latest version will be installed by default",
         )
         c.argument(

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

@@ -9,7 +9,6 @@
 CONST_ACSTOR_V1_K8S_EXTENSION_NAME = "microsoft.azurecontainerstorage"
 CONST_ACSTOR_V1_EXT_INSTALLATION_NAME = "azurecontainerstorage"
 CONST_ACSTOR_VERSION_V1 = "1"
-CONST_SUPPORTED_ACSTOR_VERSIONS = ("1", "2")
 CONST_DISK_TYPE_EPHEMERAL_VOLUME_ONLY = "EphemeralVolumeOnly"
 CONST_DISK_TYPE_PV_WITH_ANNOTATION = "PersistentVolumeWithAnnotation"
 CONST_EPHEMERAL_NVME_PERF_TIER_BASIC = "Basic"

src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py

@@ -52,7 +52,6 @@
     CONST_ACSTOR_EXT_INSTALLATION_NAME,
     CONST_ACSTOR_V1_EXT_INSTALLATION_NAME,
     CONST_ACSTOR_VERSION_V1,
-    CONST_SUPPORTED_ACSTOR_VERSIONS,
 )
 from azure.cli.command_modules.acs._helpers import (
     check_is_managed_aad_cluster,
@@ -6782,15 +6781,8 @@ def set_up_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
         if self.context.raw_param.get("enable_azure_container_storage") is not None:
             self.context.set_intermediate("enable_azure_container_storage", True, overwrite_exists=True)
             container_storage_version = self.context.raw_param.get("container_storage_version")
-            has_container_storage_version = container_storage_version is not None
 
-            if has_container_storage_version and container_storage_version not in CONST_SUPPORTED_ACSTOR_VERSIONS:
-                raise InvalidArgumentValueError(
-                    f'Version {container_storage_version} is not supported for enabling Azure Container Storage. '
-                    f'The only supported versions are {", ".join(CONST_SUPPORTED_ACSTOR_VERSIONS)}'
-                )
-
-            if has_container_storage_version and container_storage_version == CONST_ACSTOR_VERSION_V1:
+            if container_storage_version is not None and container_storage_version == CONST_ACSTOR_VERSION_V1:
                 # read the azure container storage values passed
                 pool_type = self.context.raw_param.get("enable_azure_container_storage")
                 enable_azure_container_storage = pool_type is not None
@@ -8816,12 +8808,6 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
                 ' Please remove this parameter and try again.'
             )
 
-        if container_storage_version is not None and container_storage_version not in CONST_SUPPORTED_ACSTOR_VERSIONS:
-            raise InvalidArgumentValueError(
-                f'Version {container_storage_version} is not supported for enabling Azure Container Storage. '
-                f'The only supported versions are {CONST_SUPPORTED_ACSTOR_VERSIONS}'
-            )
-
         if enable_azure_container_storage_param is not None or disable_azure_container_storage_param is not None:
             self.context.set_intermediate("container_storage_version", container_storage_version, overwrite_exists=True)