Aliases on command name and parameter name for easier using and consistency

src/azure/cli/commands/__init__.py

@@ -11,9 +11,12 @@
                              for dist in get_installed_distributions(local_only=True)
                              if dist.key.startswith('azure-cli-')]
 
+RESOURCE_GROUP_ARG_NAME = 'resource_group_name'
+
 COMMON_PARAMETERS = {
     'resource_group_name': {
-        'name': '--resourcegroup -g',
+        'name': '--resource-group -g',
+        'dest': RESOURCE_GROUP_ARG_NAME,
         'metavar': 'RESOURCEGROUP',
         'help': 'Name of resource group',
         'required': True

src/azure/cli/tests/test_autocommand.py

@@ -53,7 +53,7 @@ def test_autocommand_basic(self):
         self.assertEqual(command_metadata['name'], 'test autocommand sample-vm-get', 'Unexpected command name...')
         self.assertEqual(len(command_metadata['arguments']), 4, 'We expected exactly 4 arguments')
         some_expected_arguments = [
-            {'name': '--resourcegroup -g', 'dest': 'resource_group_name', 'required': True},
+            {'name': '--resource-group -g', 'dest': 'resource_group_name', 'required': True},
             {'name': '--vm-name', 'dest': 'vm_name', 'required': True},
             {'name': '--opt-param', 'required': False},
             ]
@@ -87,7 +87,7 @@ def test_autocommand_with_parameter_alias(self):
         self.assertEqual(command_metadata['name'], 'test autocommand sample-vm-get', 'Unexpected command name...')
         self.assertEqual(len(command_metadata['arguments']), 4, 'We expected exactly 4 arguments')
         some_expected_arguments = [
-            {'name': '--resourcegroup -g', 'dest': 'resource_group_name', 'required': True},
+            {'name': '--resource-group -g', 'dest': 'resource_group_name', 'required': True},
             {'name': '--wonky-name -n', 'dest': 'vm_name', 'required': False},
             ]
 
@@ -120,7 +120,7 @@ def test_autocommand_with_extra_parameters(self):
         self.assertEqual(command_metadata['name'], 'test autocommand sample-vm-get', 'Unexpected command name...')
         self.assertEqual(len(command_metadata['arguments']), 5, 'We expected exactly 5 arguments')
         some_expected_arguments = [
-            {'name': '--resourcegroup -g', 'dest': 'resource_group_name', 'required': True},
+            {'name': '--resource-group -g', 'dest': 'resource_group_name', 'required': True},
             {'name': '--vm-name', 'dest': 'vm_name', 'required': True},
             {'name': '--added-param', 'required': True},
             ]

src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/command_specs.py

@@ -5,7 +5,7 @@
 TEST_DEF = [
     {
         'test_name': 'network_usage_list',
-        'command': 'network usage list --location westus --output json'
+        'command': 'network list-usages --location westus --output json'
     },
     {
         'test_name': 'network_nic_list',

src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource_list_odata_filter.py

@@ -54,7 +54,7 @@ def test_name_location_equals(self):
             'location': 'dory'
             }
         filter = _list_resources_odata_filter_builder(args)
-        self.assertEquals(filter, "name eq 'wonky' and location eq 'dory'")
+        self.assertEqual(filter, "name eq 'wonky' and location eq 'dory'")
 
     def test_tag_and_name_fails(self):
         args = {

src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py

@@ -9,7 +9,9 @@
 from azure.mgmt.storage.models import AccountType
 from azure.mgmt.storage.operations import StorageAccountsOperations
 
-from azure.cli.commands import (CommandTable, LongRunningOperation)
+from azure.cli.commands import (CommandTable,
+                                LongRunningOperation,
+                                RESOURCE_GROUP_ARG_NAME)
 from azure.cli.commands._command_creation import get_mgmt_service_client, get_data_service_client
 from azure.cli.commands._auto_command import build_operation, AutoCommandDefinition
 from azure.cli._locale import L
@@ -87,7 +89,7 @@ def list_accounts(args):
     from azure.mgmt.storage.models import StorageAccount
     from msrestazure.azure_active_directory import UserPassCredentials
     smc = _storage_client_factory({})
-    group = args.get('resourcegroup')
+    group = args.get(RESOURCE_GROUP_ARG_NAME)
     if group:
         accounts = smc.storage_accounts.list_by_resource_group(group)
     else:
@@ -112,7 +114,7 @@ def renew_account_keys(args):
     keys_to_renew = args.get('key')
     for key in keys_to_renew if isinstance(keys_to_renew, list) else [keys_to_renew]:
         result = smc.storage_accounts.regenerate_key(
-            resource_group_name=args.get('resourcegroup'),
+            resource_group_name=args.get(RESOURCE_GROUP_ARG_NAME),
             account_name=args.get('account_name'),
             key_name=key)
     return result
@@ -134,7 +136,8 @@ def show_storage_connection_string(args):
     smc = _storage_client_factory({})
     endpoint_protocol = args.get('use_http')
     storage_account = args.get('account_name')
-    keys = smc.storage_accounts.list_keys(args.get('resourcegroup'), storage_account)
+    keys = smc.storage_accounts.list_keys(args.get(RESOURCE_GROUP_ARG_NAME),
+                                          storage_account)
 
     connection_string = 'DefaultEndpointsProtocol={};AccountName={};AccountKey={}'.format(
         endpoint_protocol,
@@ -160,7 +163,7 @@ def create_account(args):
     from azure.mgmt.storage.models import StorageAccountCreateParameters
     smc = _storage_client_factory({})
 
-    resource_group = args.get('resourcegroup')
+    resource_group = args.get(RESOURCE_GROUP_ARG_NAME)
     account_name = args.get('account_name')
     account_type = storage_account_types[args.get('type')]
     params = StorageAccountCreateParameters(args.get('location'),
@@ -184,7 +187,7 @@ def set_account(args):
     from azure.mgmt.storage.models import StorageAccountUpdateParameters, CustomDomain
     smc = _storage_client_factory({})
 
-    resource_group = args.get('resourcegroup')
+    resource_group = args.get(RESOURCE_GROUP_ARG_NAME)
     account_name = args.get('account_name')
     domain = args.get('custom_domain')
     account_type = storage_account_types[args.get('type')] if args.get('type') else None

src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/command_specs.py

@@ -37,7 +37,7 @@ def test_body(self):
         s.test('storage account check-name --name {}'.format(account),
                {'nameAvailable': False, 'reason': 'AlreadyExists'})
         s.rec('storage account list -g {}'.format(rg))
-        s.test('storage account show --resourcegroup {} --account-name {}'.format(rg, account),
+        s.test('storage account show --resource-group {} --account-name {}'.format(rg, account),
                {'name': account, 'accountType': 'Standard_LRS', 'location': 'westus', 'resourceGroup': rg})
         s.rec('storage account usage')
         s.rec('storage account connection-string -g {} --account-name {} --use-http'.format(rg, account))

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

@@ -7,7 +7,7 @@
 PARAMETER_ALIASES = GLOBAL_COMMON_PARAMETERS.copy()
 PARAMETER_ALIASES.update({
     'diskname': {
-        'name': '--diskname',
+        'name': '--name -n',
         'dest': 'name',
         'help': L('Disk name'),
         'required': True

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

@@ -22,24 +22,31 @@
 def _compute_client_factory(_):
     return get_mgmt_service_client(ComputeManagementClient, ComputeManagementClientConfiguration)
 
+def _patch_aliases(alias_items):
+    aliases = PARAMETER_ALIASES.copy()
+    aliases.update(alias_items)
+    return aliases
+
 # pylint: disable=line-too-long
-build_operation("vm availabilityset",
+build_operation("vm availset",
                 "availability_sets",
                 _compute_client_factory,
                 [
                     AutoCommandDefinition(AvailabilitySetsOperations.delete, None),
-                    AutoCommandDefinition(AvailabilitySetsOperations.get, 'AvailabilitySet'),
+                    AutoCommandDefinition(AvailabilitySetsOperations.get, 'AvailabilitySet', command_alias='show'),
                     AutoCommandDefinition(AvailabilitySetsOperations.list, '[AvailabilitySet]'),
                     AutoCommandDefinition(AvailabilitySetsOperations.list_available_sizes, '[VirtualMachineSize]', 'list-sizes')
                 ],
-                command_table, PARAMETER_ALIASES)
+                command_table,
+                _patch_aliases({
+                    'availability_set_name': {'name': '--name -n'}
+                }))
 
-
-build_operation("vm machineextensionimage",
+build_operation("vm machine-extension-image",
                 "virtual_machine_extension_images",
                 _compute_client_factory,
                 [
-                    AutoCommandDefinition(VirtualMachineExtensionImagesOperations.get, 'VirtualMachineExtensionImage'),
+                    AutoCommandDefinition(VirtualMachineExtensionImagesOperations.get, 'VirtualMachineExtensionImage', command_alias='show'),
                     AutoCommandDefinition(VirtualMachineExtensionImagesOperations.list_types, '[VirtualMachineImageResource]'),
                     AutoCommandDefinition(VirtualMachineExtensionImagesOperations.list_versions, '[VirtualMachineImageResource]'),
                 ],
@@ -50,15 +57,18 @@ def _compute_client_factory(_):
                 _compute_client_factory,
                 [
                     AutoCommandDefinition(VirtualMachineExtensionsOperations.delete, LongRunningOperation(L('Deleting VM extension'), L('VM extension deleted'))),
-                    AutoCommandDefinition(VirtualMachineExtensionsOperations.get, 'VirtualMachineExtension'),
+                    AutoCommandDefinition(VirtualMachineExtensionsOperations.get, 'VirtualMachineExtension', command_alias='show'),
                 ],
-                command_table, PARAMETER_ALIASES)
+                command_table,
+                _patch_aliases({
+                    'vm_extension_name': {'name': '--name -n'}
+                }))
 
 build_operation("vm image",
                 "virtual_machine_images",
                 _compute_client_factory,
                 [
-                    AutoCommandDefinition(VirtualMachineImagesOperations.get, 'VirtualMachineImage'),
+                    AutoCommandDefinition(VirtualMachineImagesOperations.get, 'VirtualMachineImage', command_alias='show'),
                     AutoCommandDefinition(VirtualMachineImagesOperations.list, '[VirtualMachineImageResource]'),
                     AutoCommandDefinition(VirtualMachineImagesOperations.list_offers, '[VirtualMachineImageResource]'),
                     AutoCommandDefinition(VirtualMachineImagesOperations.list_publishers, '[VirtualMachineImageResource]'),
@@ -89,21 +99,24 @@ def _compute_client_factory(_):
                     AutoCommandDefinition(VirtualMachinesOperations.delete, LongRunningOperation(L('Deleting VM'), L('VM Deleted'))),
                     AutoCommandDefinition(VirtualMachinesOperations.deallocate, LongRunningOperation(L('Deallocating VM'), L('VM Deallocated'))),
                     AutoCommandDefinition(VirtualMachinesOperations.generalize, None),
-                    AutoCommandDefinition(VirtualMachinesOperations.get, 'VirtualMachine'),
+                    AutoCommandDefinition(VirtualMachinesOperations.get, 'VirtualMachine', command_alias='show'),
                     AutoCommandDefinition(VirtualMachinesOperations.list_available_sizes, '[VirtualMachineSize]', 'list-sizes'),
                     AutoCommandDefinition(VirtualMachinesOperations.power_off, LongRunningOperation(L('Powering off VM'), L('VM powered off'))),
                     AutoCommandDefinition(VirtualMachinesOperations.restart, LongRunningOperation(L('Restarting VM'), L('VM Restarted'))),
                     AutoCommandDefinition(VirtualMachinesOperations.start, LongRunningOperation(L('Starting VM'), L('VM Started'))),
                 ],
-                command_table, PARAMETER_ALIASES)
+                command_table,
+                _patch_aliases({
+                    'vm_name': {'name': '--name -n'}
+                }))
 
 build_operation("vm scaleset",
                 "virtual_machine_scale_sets",
                 _compute_client_factory,
                 [
                     AutoCommandDefinition(VirtualMachineScaleSetsOperations.deallocate, LongRunningOperation(L('Deallocating VM scale set'), L('VM scale set deallocated'))),
                     AutoCommandDefinition(VirtualMachineScaleSetsOperations.delete, LongRunningOperation(L('Deleting VM scale set'), L('VM scale set deleted'))),
-                    AutoCommandDefinition(VirtualMachineScaleSetsOperations.get, 'VirtualMachineScaleSet'),
+                    AutoCommandDefinition(VirtualMachineScaleSetsOperations.get, 'VirtualMachineScaleSet', command_alias='show'),
                     AutoCommandDefinition(VirtualMachineScaleSetsOperations.delete_instances, LongRunningOperation(L('Deleting VM scale set instances'), L('VM scale set instances deleted'))),
                     AutoCommandDefinition(VirtualMachineScaleSetsOperations.get_instance_view, 'VirtualMachineScaleSetInstanceView'),
                     AutoCommandDefinition(VirtualMachineScaleSetsOperations.list, '[VirtualMachineScaleSet]'),
@@ -114,22 +127,28 @@ def _compute_client_factory(_):
                     AutoCommandDefinition(VirtualMachineScaleSetsOperations.start, LongRunningOperation(L('Starting VM scale set'), L('VM scale set started'))),
                     AutoCommandDefinition(VirtualMachineScaleSetsOperations.update_instances, LongRunningOperation(L('Updating VM scale set instances'), L('VM scale set instances updated'))),
                 ],
-                command_table, PARAMETER_ALIASES)
+                command_table,
+                _patch_aliases({
+                    'vm_scale_set_name': {'name': '--name -n'}
+                }))
 
-build_operation("vm scalesetvm",
+build_operation("vm scaleset-vm",
                 "virtual_machine_scale_set_vms",
                 _compute_client_factory,
                 [
                     AutoCommandDefinition(VirtualMachineScaleSetVMsOperations.deallocate, LongRunningOperation(L('Deallocating VM scale set VMs'), L('VM scale set VMs deallocated'))),
                     AutoCommandDefinition(VirtualMachineScaleSetVMsOperations.delete, LongRunningOperation(L('Deleting VM scale set VMs'), L('VM scale set VMs deleted'))),
-                    AutoCommandDefinition(VirtualMachineScaleSetVMsOperations.get, 'VirtualMachineScaleSetVM'),
+                    AutoCommandDefinition(VirtualMachineScaleSetVMsOperations.get, 'VirtualMachineScaleSetVM', command_alias='show'),
                     AutoCommandDefinition(VirtualMachineScaleSetVMsOperations.get_instance_view, 'VirtualMachineScaleSetVMInstanceView'),
                     AutoCommandDefinition(VirtualMachineScaleSetVMsOperations.list, '[VirtualMachineScaleSetVM]'),
                     AutoCommandDefinition(VirtualMachineScaleSetVMsOperations.power_off, LongRunningOperation(L('Powering off VM scale set VMs'), L('VM scale set VMs powered off'))),
                     AutoCommandDefinition(VirtualMachineScaleSetVMsOperations.restart, LongRunningOperation(L('Restarting VM scale set VMs'), L('VM scale set VMs restarted'))),
                     AutoCommandDefinition(VirtualMachineScaleSetVMsOperations.start, LongRunningOperation(L('Starting VM scale set VMs'), L('VM scale set VMs started'))),
                 ],
-                command_table, PARAMETER_ALIASES)
+                command_table,
+                _patch_aliases({
+                    'vm_scale_set_name': {'name': '--name -n'}
+                }))
 
 build_operation("vm",
                 None,