diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_actions.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_actions.py
index 78fb78969..0f91655a8 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_actions.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_actions.py
@@ -268,8 +268,8 @@ def _handle_container_ssh_file(**kwargs):
             private_key_filepath = public_key_filepath[:-4]
         else:
             private_key_filepath = public_key_filepath + '.private'
-        logger.warning('Creating SSH key files: %s,%s', private_key_filepath, public_key_filepath)
         content = _generate_ssh_keys(private_key_filepath, public_key_filepath)
+        logger.warning('Created SSH key files: %s,%s', private_key_filepath, public_key_filepath)
     args.ssh_key_value = content
 
 def _generate_ssh_keys(private_key_filepath, public_key_filepath):
diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py
index b189d5967..5f2c070f5 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py
@@ -71,8 +71,10 @@ register_cli_argument('vm access', 'password', options_list=('--password', '-p')
 
 register_cli_argument('acs', 'name', arg_type=name_arg_type)
 register_cli_argument('acs', 'orchestrator_type', **enum_choice_list(ContainerServiceOchestratorTypes))
-register_cli_argument('acs', 'admin_username', admin_username_type)
+#some admin names are prohibited in acs, such as root, admin, etc. Because we have no control on the orchestrators, so default to a safe name.
+register_cli_argument('acs', 'admin_username', options_list=('--admin-username',), default='azureuser', required=False)
 register_cli_argument('acs', 'ssh_key_value', required=False, help='SSH key file value or key file path.', default=os.path.join(os.path.expanduser('~'), '.ssh', 'id_rsa.pub'), completer=FilesCompleter())
+register_cli_argument('acs', 'dns_name_prefix', options_list=('--dns-prefix', '-d'))
 register_extra_cli_argument('acs create', 'generate_ssh_keys', action='store_true', help='Generate SSH public and private key files if missing')
 register_cli_argument('acs', 'container_service_name', options_list=('--name', '-n'), help='The name of the container service', completer=get_resource_name_completion_list('Microsoft.ContainerService/ContainerServices'))
 register_cli_argument('acs create', 'agent_vm_size', completer=get_vm_size_completion_list)

ACS create fails with no username
--admin-username defaults to 'root' which is not allowed:

$ az acs create --resource-group rgacsazcli --orchestrator-type DCOS --name rgacsazcli --dns-name-prefix rgacsazcli
Error loading command module 'iot'
At least one resource deployment operation failed. Please list deployment operations for details. Please see https://aka.ms/arm-debug for usage details. {
  "error": {
    "code": "InvalidParameter",
    "target": "windowsProfile.adminUsername",
    "message": "Linux admin user name cannot be 'root' or be longer than 64 characters."
  }
}


diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py
index 4576239d4..7877af690 100644
--- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py
+++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py
@@ -1254,7 +1254,7 @@ class AzureContainerServiceScenarioTest(ResourceGroupVCRTestBase): #pylint: disa
         dns_prefix = 'myacs123'
 
         #create
-        self.cmd('acs create -g {} -n {} --dns-name-prefix {}'.format(self.resource_group, acs_name, dns_prefix), checks=[
+        self.cmd('acs create -g {} -n {} --dns-prefix {}'.format(self.resource_group, acs_name, dns_prefix), checks=[
             JMESPathCheck('masterFQDN', '{}mgmt.{}.cloudapp.azure.com'.format(dns_prefix, self.location)),
             JMESPathCheck('agentFQDN', '{}agents.{}.cloudapp.azure.com'.format(dns_prefix, self.location))
             ])

python scripts/dev_setup.py
parse_log_pytest
requirements.txt
pytest
apt-get update apt-get install -y gcc libssl-dev libffi-dev
3.5
requirements.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
adal==0.4.1
applicationinsights==0.10.0
argcomplete==1.3.0
astroid==1.4.9
attrs==22.2.0
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli&subdirectory=src/azure-cli
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_acr&subdirectory=src/command_modules/azure-cli-acr
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_acs&subdirectory=src/command_modules/azure-cli-acs
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_cloud&subdirectory=src/command_modules/azure-cli-cloud
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_component&subdirectory=src/command_modules/azure-cli-component
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_configure&subdirectory=src/command_modules/azure-cli-configure
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_context&subdirectory=src/command_modules/azure-cli-context
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_core&subdirectory=src/azure-cli-core
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_feedback&subdirectory=src/command_modules/azure-cli-feedback
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_iot&subdirectory=src/command_modules/azure-cli-iot
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_keyvault&subdirectory=src/command_modules/azure-cli-keyvault
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_network&subdirectory=src/command_modules/azure-cli-network
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_profile&subdirectory=src/command_modules/azure-cli-profile
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_redis&subdirectory=src/command_modules/azure-cli-redis
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_resource&subdirectory=src/command_modules/azure-cli-resource
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_role&subdirectory=src/command_modules/azure-cli-role
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_storage&subdirectory=src/command_modules/azure-cli-storage
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_taskhelp&subdirectory=src/command_modules/azure-cli-taskhelp
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_vm&subdirectory=src/command_modules/azure-cli-vm
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_vsts&subdirectory=src/command_modules/azure-cli-vsts
-e git+https://github.com/Azure/azure-cli.git@98572bac3cdff9eb2d106140cdf352a6d2979162#egg=azure_cli_webapp&subdirectory=src/command_modules/azure-cli-webapp
azure-common==1.1.4
azure-graphrbac==0.30.0rc6
azure-mgmt-authorization==0.30.0rc6
azure-mgmt-compute==0.30.0rc6
azure-mgmt-dns==0.30.0rc6
azure-mgmt-iothub==0.1.0
azure-mgmt-keyvault==0.30.0
azure-mgmt-network==0.30.0rc6
azure-mgmt-nspkg==3.0.2
azure-mgmt-redis==1.0.0
azure-mgmt-resource==0.30.0rc6
azure-mgmt-storage==0.30.0rc6
azure-mgmt-trafficmanager==0.30.0rc6
azure-mgmt-web==0.30.0
azure-nspkg==3.0.2
azure-storage==0.33.0
bcrypt==4.0.1
certifi==2021.5.30
cffi==1.15.1
charset-normalizer==2.0.12
colorama==0.3.7
cryptography==40.0.2
idna==3.10
importlib-metadata==4.8.3
iniconfig==1.1.1
isodate==0.6.1
jeepney==0.7.1
jmespath==0.10.0
keyring==23.4.1
lazy-object-proxy==1.7.1
mock==1.3.0
msrest==0.4.29
msrestazure==0.4.34
oauthlib==3.2.2
packaging==21.3
paramiko==2.0.2
pbr==6.1.1
pluggy==1.0.0
py==1.11.0
pyasn1==0.5.1
pycparser==2.21
Pygments==2.1.3
PyJWT==2.4.0
pylint==1.5.4
PyNaCl==1.5.0
pyparsing==3.1.4
pytest==7.0.1
python-dateutil==2.9.0.post0
PyYAML==3.11
requests==2.9.1
requests-oauthlib==2.0.0
SecretStorage==3.3.3
six==1.10.0
sshtunnel==0.4.0
tabulate==0.7.5
tomli==1.2.3
typing_extensions==4.1.1
urllib3==1.16
vcrpy==1.7.4
wrapt==1.16.0
zipp==3.6.0

name: azure-cli
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - certifi=2021.5.30=py36h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.3=he6710b0_2
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - pip=21.2.2=py36h06a4308_0
  - python=3.6.13=h12debd9_1
  - readline=8.2=h5eee18b_0
  - setuptools=58.0.4=py36h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - wheel=0.37.1=pyhd3eb1b0_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - adal==0.4.1
      - applicationinsights==0.10.0
      - argcomplete==1.3.0
      - astroid==1.4.9
      - attrs==22.2.0
      - azure-common==1.1.4
      - azure-graphrbac==0.30.0rc6
      - azure-mgmt-authorization==0.30.0rc6
      - azure-mgmt-compute==0.30.0rc6
      - azure-mgmt-dns==0.30.0rc6
      - azure-mgmt-iothub==0.1.0
      - azure-mgmt-keyvault==0.30.0
      - azure-mgmt-network==0.30.0rc6
      - azure-mgmt-nspkg==3.0.2
      - azure-mgmt-redis==1.0.0
      - azure-mgmt-resource==0.30.0rc6
      - azure-mgmt-storage==0.30.0rc6
      - azure-mgmt-trafficmanager==0.30.0rc6
      - azure-mgmt-web==0.30.0
      - azure-nspkg==3.0.2
      - azure-storage==0.33.0
      - bcrypt==4.0.1
      - cffi==1.15.1
      - charset-normalizer==2.0.12
      - colorama==0.3.7
      - cryptography==40.0.2
      - idna==3.10
      - importlib-metadata==4.8.3
      - iniconfig==1.1.1
      - isodate==0.6.1
      - jeepney==0.7.1
      - jmespath==0.10.0
      - keyring==23.4.1
      - lazy-object-proxy==1.7.1
      - mock==1.3.0
      - msrest==0.4.29
      - msrestazure==0.4.34
      - oauthlib==3.2.2
      - packaging==21.3
      - paramiko==2.0.2
      - pbr==6.1.1
      - pluggy==1.0.0
      - py==1.11.0
      - pyasn1==0.5.1
      - pycparser==2.21
      - pygments==2.1.3
      - pyjwt==2.4.0
      - pylint==1.5.4
      - pynacl==1.5.0
      - pyparsing==3.1.4
      - pytest==7.0.1
      - python-dateutil==2.9.0.post0
      - pyyaml==3.11
      - requests==2.9.1
      - requests-oauthlib==2.0.0
      - secretstorage==3.3.3
      - six==1.10.0
      - sshtunnel==0.4.0
      - tabulate==0.7.5
      - tomli==1.2.3
      - typing-extensions==4.1.1
      - urllib3==1.16
      - vcrpy==1.7.4
      - wrapt==1.16.0
      - zipp==3.6.0
prefix: /opt/conda/envs/azure-cli

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::AzureContainerServiceScenarioTest::test_acs_create_update
src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMImageListByAliasesScenarioTest::test_vm_image_list_by_alias src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMOpenPortTest::test_vm_open_port src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMGeneralizeScenarioTest::test_vm_generalize src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMScaleSetStatesScenarioTest::test_vm_scaleset_states src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMScaleSetCreateSimple::test_vm_scaleset_create_simple src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMScaleSetCreateOptions::test_vm_scaleset_create_options src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMSSCreateNoneOptionsTest::test_vmss_create_none_options src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMScaleSetCreateExistingOptions::test_vm_scaleset_create_existing_options src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMCreateUbuntuScenarioTest::test_vm_create_ubuntu src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMCreateMultiNicTest::test_vm_create_multinic src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMCreateNoneOptionsTest::test_vm_create_none_options src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMCreateExistingOptions::test_vm_create_existing_options src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMCreateCustomIP::test_vm_create_custom_ip src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMDataDiskVCRTest::test_vm_data_disk
src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMUsageScenarioTest::test_vm_usage src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMImageListThruServiceScenarioTest::test_vm_images_list_thru_services src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMCombinedListTest::test_vm_combined_list src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMResizeTest::test_vm_resize src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMShowListSizesListIPAddressesScenarioTest::test_vm_show_list_sizes_list_ip_addresses src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMSizeListScenarioTest::test_vm_size_list src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMImageListOffersScenarioTest::test_vm_image_list_offers src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMImageListPublishersScenarioTest::test_vm_image_list_publishers src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMImageListSkusScenarioTest::test_vm_image_list_skus src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMImageShowScenarioTest::test_vm_image_show src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMCreateAndStateModificationsScenarioTest::test_vm_create_state_modifications src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMAvailSetScenarioTest::test_vm_availset src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMExtensionAutoUpgradeTest::test_vm_extension_autoupgrade src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMExtensionsScenarioTest::test_vm_extension src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMMachineExtensionImageScenarioTest::test_vm_machine_extension_image src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMExtensionImageSearchScenarioTest::test_vm_extension_image_search src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMScaleSetGetsScenarioTest::test_vm_scaleset_gets src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMScaleSetScaleUpScenarioTest::test_vm_scaleset_scaleup src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMScaleSetDeleteScenarioTest::test_vm_scaleset_delete src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMScaleSetVMsScenarioTest::test_vm_scaleset_vms src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMAccessAddRemoveLinuxUser::test_vm_add_remove_linux_user src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMBootDiagnostics::test_vm_enable_disable_boot_diagnostic src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMExtensionInstallTest::test_vm_extension_install src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::VMSSExtensionInstallTest::test_vmss_extension_install src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/tests/test_vm_commands.py::DiagnosticsExtensionInstallTest::test_diagnostics_extension_install
src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_actions.py
src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_actions.py