[Fix] - Fixed schema output issue

Author: william051200

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

@@ -884,8 +884,8 @@ def setter(vm, external_identities=external_identities):
                 if key not in command_args['mi_user_assigned']:
                     command_args['mi_user_assigned'].append(key)
 
-        from .aaz.latest.vm import Patch
-        update_vm_identity = Patch(cli_ctx=cmd.cli_ctx)(command_args=command_args)
+        from .operations.vm import VMPatch
+        update_vm_identity = VMPatch(cli_ctx=cmd.cli_ctx)(command_args=command_args)
         LongRunningOperation(cmd.cli_ctx)(update_vm_identity)
         result = update_vm_identity.result()
         return result
@@ -1387,7 +1387,7 @@ def get_instance_view(cmd, resource_group_name, vm_name, include_user_data=False
 
 
 def get_vm_by_aaz(cmd, resource_group_name, vm_name, expand=None):
-    from .aaz.latest.vm import Show
+    from .operations.vm import VMShow
     command_args = {
         'resource_group': resource_group_name,
         'vm_name': vm_name,
@@ -1396,7 +1396,7 @@ def get_vm_by_aaz(cmd, resource_group_name, vm_name, expand=None):
     if expand:
         command_args['expand'] = expand
 
-    return Show(cli_ctx=cmd.cli_ctx)(command_args=command_args)
+    return VMShow(cli_ctx=cmd.cli_ctx)(command_args=command_args)
 
 
 def get_vm(cmd, resource_group_name, vm_name, expand=None):
@@ -2568,6 +2568,7 @@ def _remove_identities_by_aaz(cmd, resource_group_name, name, identities, getter
         return None
 
     existing_emsis = [x.lower() for x in (existing_identity.get('userAssignedIdentities') or {}).keys()]
+    existing_identity['userAssignedIdentities'] = {}
 
     if identities:
         emsis_to_remove = [x.lower() for x in identities]
@@ -2584,11 +2585,8 @@ def _remove_identities_by_aaz(cmd, resource_group_name, name, identities, getter
             elif existing_identity['type'] == IdentityType.SYSTEM_ASSIGNED_USER_ASSIGNED.value:
                 existing_identity['type'] = IdentityType.SYSTEM_ASSIGNED.value
 
-        existing_identity['userAssignedIdentities'] = {}
         for emsis in identities:
             existing_identity['userAssignedIdentities'][emsis] = {}
-    else:
-        existing_identity['userAssignedIdentities'] = None
 
     if remove_system_assigned_identity:
         if existing_identity['type'] == IdentityType.SYSTEM_ASSIGNED_USER_ASSIGNED.value \
@@ -2611,15 +2609,15 @@ def setter(resource_group_name, vm_name, vm):
         from ._vm_utils import IdentityType
         if vm.get('identity') and vm.get('identity').get('type') == IdentityType.USER_ASSIGNED.value:
             command_args['mi_user_assigned'] = \
-                vm.get('identity', {}).get('userAssignedIdentities', {}).keys() + ['UserAssigned']
+                list(vm.get('identity', {}).get('userAssignedIdentities', {}).keys()) + ['UserAssigned']
             # NOTE: The literal 'UserAssigned' is intentionally appended as a marker for
             # VMIdentityRemove._format_content, which uses it to apply special handling
             # for purely user-assigned identities. It is not a real identity resource ID.
         elif vm.get('identity') and vm.get('identity').get('type') == IdentityType.SYSTEM_ASSIGNED.value:
             command_args['mi_user_assigned'] = []
             command_args['mi_system_assigned'] = 'True'
         elif vm.get('identity') and vm.get('identity').get('type') == IdentityType.SYSTEM_ASSIGNED_USER_ASSIGNED.value:
-            command_args['mi_user_assigned'] = vm.get('identity', {}).get('userAssignedIdentities', {}).keys()
+            command_args['mi_user_assigned'] = list(vm.get('identity', {}).get('userAssignedIdentities', {}).keys())
             command_args['mi_system_assigned'] = 'True'
         else:
             command_args['mi_user_assigned'] = []

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

@@ -158,8 +158,44 @@ def _output(self, *args, **kwargs):
         return result
 
 
+class VMPatch(_VMPatch):
+    class VirtualMachinesUpdate(_VMPatch.VirtualMachinesUpdate):
+        # Override to solve key conflict of _schema_on_200.resources.Element.properties.type when deserializing
+        @classmethod
+        def _build_schema_on_200(cls):
+            schema = super()._build_schema_on_200()
+
+            del schema.resources.Element.properties._fields['type']
+            schema.resources.Element.properties.type = AAZStrType(
+                serialized_name="typePropertiesType",
+            )
+            return schema
+
+    def _output(self, *args, **kwargs):
+        from azure.cli.core.aaz import AAZUndefined, has_value
+
+        # Resolve flatten conflict
+        # When the type field conflicts, the type in inner layer is ignored and the outer layer is applied
+        if has_value(self.ctx.vars.instance.resources):
+            for resource in self.ctx.vars.instance.resources:
+                if has_value(resource.type):
+                    resource.type = AAZUndefined
+
+        result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True)
+        return result
+
+
 class VMIdentityRemove(_VMPatch):
     def _output(self, *args, **kwargs):
+        from azure.cli.core.aaz import AAZUndefined, has_value
+
+        # Resolve flatten conflict
+        # When the type field conflicts, the type in inner layer is ignored and the outer layer is applied
+        if has_value(self.ctx.vars.instance.resources):
+            for resource in self.ctx.vars.instance.resources:
+                if has_value(resource.type):
+                    resource.type = AAZUndefined
+
         result = self.deserialize_output(self.ctx.vars.instance, client_flatten=True)
 
         identity = result.get('identity')
@@ -178,6 +214,17 @@ def _output(self, *args, **kwargs):
         return result
 
     class VirtualMachinesUpdate(_VMPatch.VirtualMachinesUpdate):
+        # Override to solve key conflict of _schema_on_200.resources.Element.properties.type when deserializing
+        @classmethod
+        def _build_schema_on_200(cls):
+            schema = super()._build_schema_on_200()
+
+            del schema.resources.Element.properties._fields['type']
+            schema.resources.Element.properties.type = AAZStrType(
+                serialized_name="typePropertiesType",
+            )
+            return schema
+
         def _format_content(self, content):
             if isinstance(content, str):
                 content = json.loads(content)