[VM] Hotfix: Fix the bad request issue when creating VMSS in Azure Stack

src/azure-cli/azure/cli/command_modules/resource/_win_vt.py

@@ -47,7 +47,7 @@ def _set_conout_mode(mode):
 def _update_conout_mode(mode):
     old_mode = _get_conout_mode()
     if old_mode & mode != mode:
-        mode = old_mode | mode
+        mode = old_mode | mode  # pylint: disable=unsupported-binary-operation
         _set_conout_mode(mode)
 
 

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

@@ -928,15 +928,7 @@ def build_vmss_resource(cmd, name, naming_prefix, location, tags, overprovision,
     vmss_properties = {
         'overprovision': overprovision,
         'upgradePolicy': {
-            'mode': upgrade_policy_mode,
-            'rollingUpgradePolicy': {
-                'maxBatchInstancePercent': max_batch_instance_percent,
-                'maxUnhealthyInstancePercent': max_unhealthy_instance_percent,
-                'maxUnhealthyUpgradedInstancePercent': max_unhealthy_upgraded_instance_percent,
-                'pauseTimeBetweenBatches': pause_time_between_batches,
-                'enableCrossZoneUpgrade': enable_cross_zone_upgrade,
-                'prioritizeUnhealthyInstances': prioritize_unhealthy_instances
-            }
+            'mode': upgrade_policy_mode
         },
         'virtualMachineProfile': {
             'storageProfile': storage_properties,
@@ -946,6 +938,31 @@ def build_vmss_resource(cmd, name, naming_prefix, location, tags, overprovision,
         }
     }
 
+    if cmd.supported_api_version(min_api='2020-12-01', operation_group='virtual_machine_scale_sets'):
+        vmss_properties['upgradePolicy']['rollingUpgradePolicy'] = {}
+        rolling_upgrade_policy = vmss_properties['upgradePolicy']['rollingUpgradePolicy']
+
+        if max_batch_instance_percent is not None:
+            rolling_upgrade_policy['maxBatchInstancePercent'] = max_batch_instance_percent
+
+        if max_unhealthy_instance_percent is not None:
+            rolling_upgrade_policy['maxUnhealthyInstancePercent'] = max_unhealthy_instance_percent
+
+        if max_unhealthy_upgraded_instance_percent is not None:
+            rolling_upgrade_policy['maxUnhealthyUpgradedInstancePercent'] = max_unhealthy_upgraded_instance_percent
+
+        if pause_time_between_batches is not None:
+            rolling_upgrade_policy['pauseTimeBetweenBatches'] = pause_time_between_batches
+
+        if enable_cross_zone_upgrade is not None:
+            rolling_upgrade_policy['enableCrossZoneUpgrade'] = enable_cross_zone_upgrade
+
+        if prioritize_unhealthy_instances is not None:
+            rolling_upgrade_policy['prioritizeUnhealthyInstances'] = prioritize_unhealthy_instances
+
+        if not rolling_upgrade_policy:
+            del rolling_upgrade_policy
+
     if not specialized:
         vmss_properties['virtualMachineProfile']['osProfile'] = os_profile
 

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

@@ -3229,15 +3229,27 @@ def set_vmss_extension(cmd, resource_group_name, vmss_name, extension_name, publ
             extension_profile.extensions = [x for x in extensions if
                                             x.type_properties_type.lower() != extension_name.lower() or x.publisher.lower() != publisher.lower()]  # pylint: disable=line-too-long
 
-    ext = VirtualMachineScaleSetExtension(name=extension_instance_name,
-                                          publisher=publisher,
-                                          type_properties_type=extension_name,
-                                          protected_settings=protected_settings,
-                                          type_handler_version=version,
-                                          settings=settings,
-                                          auto_upgrade_minor_version=(not no_auto_upgrade),
-                                          provision_after_extensions=provision_after_extensions,
-                                          enable_automatic_upgrade=enable_auto_upgrade)
+    if cmd.supported_api_version(min_api='2019-07-01', operation_group='virtual_machine_scale_sets'):
+        ext = VirtualMachineScaleSetExtension(name=extension_instance_name,
+                                              publisher=publisher,
+                                              type_properties_type=extension_name,
+                                              protected_settings=protected_settings,
+                                              type_handler_version=version,
+                                              settings=settings,
+                                              auto_upgrade_minor_version=(not no_auto_upgrade),
+                                              provision_after_extensions=provision_after_extensions,
+                                              enable_automatic_upgrade=enable_auto_upgrade)
+    else:
+        ext = VirtualMachineScaleSetExtension(name=extension_instance_name,
+                                              publisher=publisher,
+                                              type=extension_name,
+                                              protected_settings=protected_settings,
+                                              type_handler_version=version,
+                                              settings=settings,
+                                              auto_upgrade_minor_version=(not no_auto_upgrade),
+                                              provision_after_extensions=provision_after_extensions,
+                                              enable_automatic_upgrade=enable_auto_upgrade)
+
     if force_update:
         ext.force_update_tag = str(_gen_guid())