[Compute] BREAKING CHANGE: vmss create: rename orchestration mode values (#16726)

* [Compute] vmss create: rename orchestration mode values

* update

Author: qwordy

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

@@ -549,8 +549,8 @@ def load_arguments(self, _):
                    help="The eviction policy for virtual machines in a Spot priority scale set. Default eviction policy is Deallocate for a Spot priority scale set")
         c.argument('application_security_groups', resource_type=ResourceType.MGMT_COMPUTE, min_api='2018-06-01', nargs='+', options_list=['--asgs'], help='Space-separated list of existing application security groups to associate with the VM.', arg_group='Network', validator=validate_asg_names_or_ids)
         c.argument('computer_name_prefix', help='Computer name prefix for all of the virtual machines in the scale set. Computer name prefixes must be 1 to 15 characters long')
-        c.argument('orchestration_mode', help='Choose how virtual machines are managed by the scale set. In VM mode, you manually create and add a virtual machine of any configuration to the scale set. In ScaleSetVM mode, you define a virtual machine model and Azure will generate identical instances based on that model.',
-                   arg_type=get_enum_type(['VM', 'ScaleSetVM']), is_preview=True)
+        c.argument('orchestration_mode', help='Choose how virtual machines are managed by the scale set. In Uniform mode, you define a virtual machine model and Azure will generate identical instances based on that model. In Flexible mode, you manually create and add a virtual machine of any configuration to the scale set or generate identical instances based on virtual machine model defined for the scale set.',
+                   arg_type=get_enum_type(['Uniform', 'Flexible']), is_preview=True)
         c.argument('scale_in_policy', scale_in_policy_type)
         c.argument('automatic_repairs_grace_period', min_api='2018-10-01',
                    help='The amount of time (in minutes, between 30 and 90) for which automatic repairs are suspended due to a state change on VM.')

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

@@ -2342,7 +2342,7 @@ def create_vmss(cmd, vmss_name, resource_group_name, image=None,
                 identity_role_id=None, zones=None, priority=None, eviction_policy=None,
                 application_security_groups=None, ultra_ssd_enabled=None, ephemeral_os_disk=None,
                 proximity_placement_group=None, aux_subscriptions=None, terminate_notification_time=None,
-                max_price=None, computer_name_prefix=None, orchestration_mode='ScaleSetVM', scale_in_policy=None,
+                max_price=None, computer_name_prefix=None, orchestration_mode='Uniform', scale_in_policy=None,
                 os_disk_encryption_set=None, data_disk_encryption_sets=None, data_disk_iops=None, data_disk_mbps=None,
                 automatic_repairs_grace_period=None, specialized=None, os_disk_size_gb=None, encryption_at_host=None,
                 host_group=None):
@@ -2358,9 +2358,9 @@ def create_vmss(cmd, vmss_name, resource_group_name, image=None,
     # Build up the ARM template
     master_template = ArmTemplateBuilder()
 
-    scale_set_vm_str = 'ScaleSetVM'
-    vm_str = 'VM'
-    if orchestration_mode.lower() == scale_set_vm_str.lower():
+    uniform_str = 'Uniform'
+    flexible_str = 'Flexible'
+    if orchestration_mode.lower() == uniform_str.lower():
         from msrestazure.tools import resource_id, is_valid_resource_id
 
         storage_sku = disk_info['os'].get('storageAccountType')
@@ -2601,9 +2601,9 @@ def _get_public_ip_address_allocation(value, sku):
                 master_template.add_resource(build_msi_role_assignment(vmss_name, vmss_id, identity_role_id,
                                                                        role_assignment_guid, identity_scope, False))
 
-    elif orchestration_mode.lower() == vm_str.lower():
+    elif orchestration_mode.lower() == flexible_str.lower():
         if platform_fault_domain_count is None:
-            raise CLIError("usage error: --platform-fault-domain-count is required in VM mode")
+            raise CLIError("usage error: --platform-fault-domain-count is required in Flexible mode")
         vmss_resource = {
             'type': 'Microsoft.Compute/virtualMachineScaleSets',
             'name': vmss_name,
@@ -2623,13 +2623,13 @@ def _get_public_ip_address_allocation(value, sku):
                 'id': proximity_placement_group
             }
     else:
-        raise CLIError('usage error: --orchestration-mode (ScaleSet | VM)')
+        raise CLIError('usage error: --orchestration-mode (Uniform | Flexible)')
 
     master_template.add_resource(vmss_resource)
     master_template.add_output('VMSS', vmss_name, 'Microsoft.Compute', 'virtualMachineScaleSets',
                                output_type='object')
 
-    if orchestration_mode.lower() == scale_set_vm_str.lower() and admin_password:
+    if orchestration_mode.lower() == uniform_str.lower() and admin_password:
         master_template.add_secure_parameter('adminPassword', admin_password)
 
     template = master_template.build()
@@ -2667,7 +2667,7 @@ def _get_public_ip_address_allocation(value, sku):
         deployment_result = DeploymentOutputLongRunningOperation(cmd.cli_ctx)(
             sdk_no_wait(no_wait, client.create_or_update, resource_group_name, deployment_name, properties))
 
-    if orchestration_mode.lower() == scale_set_vm_str.lower() and assign_identity is not None:
+    if orchestration_mode.lower() == uniform_str.lower() and assign_identity is not None:
         vmss_info = get_vmss(cmd, resource_group_name, vmss_name)
         if enable_local_identity and not identity_scope:
             _show_missing_access_warning(resource_group_name, vmss_name, 'vmss')

src/azure-cli/azure/cli/command_modules/vm/tests/latest/test_vm_commands.py

@@ -4939,7 +4939,7 @@ def test_vmss_orchestration_mode(self, resource_group):
         })
 
         self.cmd('ppg create -g {rg} -n {ppg}')
-        self.cmd('vmss create -g {rg} -n {vmss} --orchestration-mode VM --single-placement-group false --ppg {ppg} '
+        self.cmd('vmss create -g {rg} -n {vmss} --orchestration-mode Flexible --single-placement-group false --ppg {ppg} '
                  '--platform-fault-domain-count 3 --generate-ssh-keys')