Migrated create_managed_disk

Author: william051200

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

@@ -1981,11 +1981,38 @@ def _validate_gallery_image_reference(cmd, namespace):
                                     'format, please refer to the help sample'.format(gallery_image_reference))
 
 
+def _validate_gallery_image_reference_by_aaz(namespace):
+    is_validate = 'gallery_image_reference' in namespace and namespace.gallery_image_reference is not None
+
+    if not is_validate:
+        return
+
+    from azure.cli.command_modules.vm._image_builder import GalleryImageReferenceType
+    from ._vm_utils import is_compute_gallery_image_id, is_community_gallery_image_id, \
+        is_shared_gallery_image_id
+
+    gallery_image_reference = namespace.gallery_image_reference
+    if is_compute_gallery_image_id(gallery_image_reference):
+        namespace.gallery_image_reference_type = GalleryImageReferenceType.COMPUTE.backend_key
+        return
+    if is_community_gallery_image_id(gallery_image_reference):
+        namespace.gallery_image_reference_type = GalleryImageReferenceType.COMMUNITY.backend_key
+        return
+    if is_shared_gallery_image_id(gallery_image_reference):
+        namespace.gallery_image_reference_type = GalleryImageReferenceType.SHARED.backend_key
+        return
+
+    from azure.cli.core.parser import InvalidArgumentValueError
+    raise InvalidArgumentValueError('usage error: {} is an invalid gallery image reference, please provide valid '
+                                    'compute, shared or community gallery image version. For details about valid '
+                                    'format, please refer to the help sample'.format(gallery_image_reference))
+
+
 def process_disk_create_namespace(cmd, namespace):
     from azure.core.exceptions import HttpResponseError
     validate_tags(namespace)
     validate_edge_zone(cmd, namespace)
-    _validate_gallery_image_reference(cmd, namespace)
+    _validate_gallery_image_reference_by_aaz(namespace)
     _validate_security_data_uri(namespace)
     _validate_upload_type(cmd, namespace)
     _validate_secure_vm_disk_encryption_set(namespace)
@@ -2029,10 +2056,10 @@ def _validate_upload_type(cmd, namespace):
 
     if namespace.upload_type == 'UploadWithSecurityData':
 
-        if not cmd.supported_api_version(min_api='2021-08-01', operation_group='disks'):
-            raise ArgumentUsageError(
-                "'UploadWithSecurityData' is not supported in the current profile. "
-                "Please upgrade your profile with 'az cloud set --profile newerProfile' and try again")
+        # if not cmd.supported_api_version(min_api='2021-08-01', operation_group='disks'):
+        #     raise ArgumentUsageError(
+        #         "'UploadWithSecurityData' is not supported in the current profile. "
+        #         "Please upgrade your profile with 'az cloud set --profile newerProfile' and try again")
 
         if not namespace.security_type:
             raise RequiredArgumentMissingError(

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

@@ -550,19 +550,41 @@ def create_managed_disk(cmd, resource_group_name, disk_name, location=None,  # p
             'usage error: --upload-size-bytes is required to create a disk for upload')
 
     if disk_encryption_set is not None and not is_valid_resource_id(disk_encryption_set):
-        disk_encryption_set = resource_id(
-            subscription=get_subscription_id(cmd.cli_ctx), resource_group=resource_group_name,
-            namespace='Microsoft.Compute', type='diskEncryptionSets', name=disk_encryption_set)
+        from .aaz.latest.disk_encryption_set import Show as DiskEncryptionSetShow
+        disk_encryption_set = DiskEncryptionSetShow(cli_ctx=cmd.cli_ctx)(command_args={
+            'resource_group': resource_group_name,
+            'disk_encryption_set_name': disk_encryption_set
+        })
+
+        if disk_encryption_set:
+            disk_encryption_set = disk_encryption_set['id']
+        else:
+            disk_encryption_set = None
 
     if disk_access is not None and not is_valid_resource_id(disk_access):
-        disk_access = resource_id(
-            subscription=get_subscription_id(cmd.cli_ctx), resource_group=resource_group_name,
-            namespace='Microsoft.Compute', type='diskAccesses', name=disk_access)
+        from .aaz.latest.disk_access import Show as DiskAccessShow
+        disk_access = DiskAccessShow(cli_ctx=cmd.cli_ctx)(command_args={
+            'resource_group': resource_group_name,
+            'disk_access_name': disk_access
+        })
+
+        if disk_access:
+            disk_access = disk_access['id']
+        else:
+            disk_access = None
 
     if secure_vm_disk_encryption_set is not None and not is_valid_resource_id(secure_vm_disk_encryption_set):
-        secure_vm_disk_encryption_set = resource_id(
-            subscription=get_subscription_id(cmd.cli_ctx), resource_group=resource_group_name,
-            namespace='Microsoft.Compute', type='diskEncryptionSets', name=secure_vm_disk_encryption_set)
+        from .aaz.latest.disk_encryption_set import Show as DiskEncryptionSetShow
+        secure_vm_disk_encryption_set = DiskEncryptionSetShow(cli_ctx=cmd.cli_ctx)(command_args={
+            'resource_group': resource_group_name,
+            'disk_encryption_set_name': secure_vm_disk_encryption_set
+        })
+
+
+        if secure_vm_disk_encryption_set:
+            secure_vm_disk_encryption_set = secure_vm_disk_encryption_set['id']
+        else:
+            secure_vm_disk_encryption_set = None
 
     encryption = None
     if disk_encryption_set or encryption_type: