From e5b26adc4d25d3915345b3d9f172fb2c3e574cea Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Sat, 18 Mar 2017 15:49:36 -0700 Subject: [PATCH 1/2] [ACR] Provide a short name alias for the orchestrator type flag This PR simply adds a short name alias to the `--orchestrator-type` flag, since it is very common to set --- .../azure-cli-acs/azure/cli/command_modules/acs/_params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_params.py b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_params.py index 0cd41409018..5f641aea3d9 100644 --- a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_params.py +++ b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_params.py @@ -58,7 +58,7 @@ def _get_default_install_location(exe_name): register_cli_argument('acs', 'name', arg_type=name_arg_type, help='ACS cluster name', completer=get_resource_name_completion_list('Microsoft.ContainerService/ContainerServices')) register_cli_argument('acs', 'resource_group', arg_type=resource_group_name_type) -register_cli_argument('acs', 'orchestrator_type', **enum_choice_list(ContainerServiceOchestratorTypes)) +register_cli_argument('acs', 'orchestrator_type', options_list=('--orchestrator_type', '-t'), **enum_choice_list(ContainerServiceOchestratorTypes)) # 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', 'dns_name_prefix', options_list=('--dns-prefix', '-d')) From c5749e35b758a59d8f497c9cafc47a3c863fc0c7 Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Sun, 19 Mar 2017 21:03:22 -0700 Subject: [PATCH 2/2] Correct typo --- .../azure-cli-acs/azure/cli/command_modules/acs/_params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_params.py b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_params.py index 5f641aea3d9..2581feba7a4 100644 --- a/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_params.py +++ b/src/command_modules/azure-cli-acs/azure/cli/command_modules/acs/_params.py @@ -58,7 +58,7 @@ def _get_default_install_location(exe_name): register_cli_argument('acs', 'name', arg_type=name_arg_type, help='ACS cluster name', completer=get_resource_name_completion_list('Microsoft.ContainerService/ContainerServices')) register_cli_argument('acs', 'resource_group', arg_type=resource_group_name_type) -register_cli_argument('acs', 'orchestrator_type', options_list=('--orchestrator_type', '-t'), **enum_choice_list(ContainerServiceOchestratorTypes)) +register_cli_argument('acs', 'orchestrator_type', options_list=('--orchestrator-type', '-t'), **enum_choice_list(ContainerServiceOchestratorTypes)) # 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', 'dns_name_prefix', options_list=('--dns-prefix', '-d'))