Migrated disk update

Author: william051200

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

@@ -208,7 +208,7 @@ def load_command_table(self, _):
         from .operations.ppg import PPGShow
         self.command_table["ppg show"] = PPGShow(loader=self)
 
-    with self.command_group('disk', compute_disk_sdk, operation_group='disks') as g:
+    with self.command_group('disk', operation_group='disks') as g:
         g.custom_command('create', 'create_managed_disk', supports_no_wait=True, table_transformer=transform_disk_create_table_output, validator=process_disk_create_namespace)
         from .operations.disk import DiskUpdate, DiskGrantAccess
         self.command_table["disk grant-access"] = DiskGrantAccess(loader=self)

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

@@ -580,7 +580,6 @@ def create_managed_disk(cmd, resource_group_name, disk_name, location=None,  # p
             '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:

src/azure-cli/azure/cli/command_modules/vm/operations/disk.py

@@ -8,6 +8,8 @@
 
 from azure.cli.core.aaz import has_value, register_command, register_command_group, AAZCommandGroup
 from ..aaz.latest.disk import Update as _DiskUpdate, GrantAccess as _DiskGrantAccess, Show, UpdatePatch as _UpdatePatch
+from ..aaz.latest.disk_encryption_set import Show as DiskEncryptionSetShow
+from ..aaz.latest.disk_access import Show as DiskAccessShow
 
 logger = get_logger(__name__)
 
@@ -45,9 +47,15 @@ def pre_instance_update(self, instance):
 
             disk_encryption_set = args.disk_encryption_set
             if not is_valid_resource_id(disk_encryption_set.to_serialized_data()):
-                disk_encryption_set = resource_id(
-                    subscription=get_subscription_id(self.cli_ctx), resource_group=args.resource_group,
-                    namespace='Microsoft.Compute', type='diskEncryptionSets', name=disk_encryption_set)
+                disk_encryption_set = DiskEncryptionSetShow(cli_ctx=self.cli_ctx)(command_args={
+                    'resource_group': args.resource_group,
+                    'disk_encryption_set_name': disk_encryption_set
+                })
+
+                if disk_encryption_set:
+                    disk_encryption_set = disk_encryption_set['id']
+                else:
+                    disk_encryption_set = None
 
             instance.properties.encryption.disk_encryption_set_id = disk_encryption_set
 
@@ -58,9 +66,16 @@ def pre_instance_update(self, instance):
         if has_value(args.disk_access):
             disk_access = args.disk_access
             if not is_valid_resource_id(disk_access.to_serialized_data()):
-                disk_access = resource_id(
-                    subscription=get_subscription_id(self.cli_ctx), resource_group=args.resource_group,
-                    namespace='Microsoft.Compute', type='diskAccesses', name=disk_access)
+                disk_access = DiskAccessShow(cli_ctx=self.cli_ctx)(command_args={
+                    'resource_group': args.resource_group,
+                    'disk_access_name': disk_access
+                })
+
+                if disk_access:
+                    disk_access = disk_access['id']
+                else:
+                    disk_access = None
+                    
             instance.properties.disk_access_id = disk_access