diff --git a/src/azure/cli/commands/__init__.py b/src/azure/cli/commands/__init__.py index 307430a96b1..c7525f2321a 100644 --- a/src/azure/cli/commands/__init__.py +++ b/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 diff --git a/src/azure/cli/tests/test_autocommand.py b/src/azure/cli/tests/test_autocommand.py index d662ed46a08..eded04161a3 100644 --- a/src/azure/cli/tests/test_autocommand.py +++ b/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}, ] diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py index b59348510b3..ed1b28c73bd 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py @@ -26,7 +26,10 @@ from azure.cli.commands._command_creation import get_mgmt_service_client from azure.cli.commands._auto_command import build_operation, AutoCommandDefinition -from azure.cli.commands import CommandTable, LongRunningOperation, COMMON_PARAMETERS +from azure.cli.commands import (CommandTable, + LongRunningOperation, + COMMON_PARAMETERS, + RESOURCE_GROUP_ARG_NAME) from azure.cli._locale import L command_table = CommandTable() @@ -34,60 +37,75 @@ def _network_client_factory(_): return get_mgmt_service_client(NetworkManagementClient, NetworkManagementClientConfiguration) +_VNET_PARAM_NAME = '--vnet-name' + # pylint: disable=line-too-long # Application gateways -build_operation("network appgateway", +build_operation("network application-gateway", "application_gateways", _network_client_factory, [ AutoCommandDefinition(ApplicationGatewaysOperations.delete, LongRunningOperation(L('Deleting application gateway'), L('Application gateway deleted'))), - AutoCommandDefinition(ApplicationGatewaysOperations.get, 'ApplicationGateway'), + AutoCommandDefinition(ApplicationGatewaysOperations.get, 'ApplicationGateway', command_alias='show'), AutoCommandDefinition(ApplicationGatewaysOperations.list, '[ApplicationGateway]'), AutoCommandDefinition(ApplicationGatewaysOperations.list_all, '[ApplicationGateway]'), AutoCommandDefinition(ApplicationGatewaysOperations.start, LongRunningOperation(L('Starting application gateway'), L('Application gateway started'))), AutoCommandDefinition(ApplicationGatewaysOperations.stop, LongRunningOperation(L('Stopping application gateway'), L('Application gateway stopped'))), ], - command_table) + command_table, + { + 'application_gateway_name': {'name': '--name -n'} + }) # ExpressRouteCircuitAuthorizationsOperations -build_operation("network expressroutecircuitauth", +build_operation("network express-route circuit-auth", "express_route_circuit_authorizations", _network_client_factory, [ AutoCommandDefinition(ExpressRouteCircuitAuthorizationsOperations.delete, LongRunningOperation(L('Deleting express route authorization'), L('Express route authorization deleted'))), - AutoCommandDefinition(ExpressRouteCircuitAuthorizationsOperations.get, 'ExpressRouteCircuitAuthorization'), + AutoCommandDefinition(ExpressRouteCircuitAuthorizationsOperations.get, 'ExpressRouteCircuitAuthorization', command_alias='show'), AutoCommandDefinition(ExpressRouteCircuitAuthorizationsOperations.list, '[ExpressRouteCircuitAuthorization]'), ], - command_table) + command_table, + { + 'authorization_name': {'name': '--name -n'} + }) + # ExpressRouteCircuitPeeringsOperations -build_operation("network expressroutecircuitpeering", +build_operation("network express-route circuit-peering", "express_route_circuit_peerings", _network_client_factory, [ AutoCommandDefinition(ExpressRouteCircuitPeeringsOperations.delete, LongRunningOperation(L('Deleting express route circuit peering'), L('Express route circuit peering deleted'))), - AutoCommandDefinition(ExpressRouteCircuitPeeringsOperations.get, 'ExpressRouteCircuitPeering'), + AutoCommandDefinition(ExpressRouteCircuitPeeringsOperations.get, 'ExpressRouteCircuitPeering', command_alias='show'), AutoCommandDefinition(ExpressRouteCircuitPeeringsOperations.list, '[ExpressRouteCircuitPeering]'), ], - command_table) + command_table, + { + 'peering_name': {'name': '--name -n'} + }) # ExpressRouteCircuitsOperations -build_operation("network expressroutecircuit", +build_operation("network express-route circuit", "express_route_circuits", _network_client_factory, [ AutoCommandDefinition(ExpressRouteCircuitsOperations.delete, LongRunningOperation(L('Deleting express route circuit'), L('Express route circuit deleted'))), - AutoCommandDefinition(ExpressRouteCircuitsOperations.get, 'ExpressRouteCircuit'), + AutoCommandDefinition(ExpressRouteCircuitsOperations.get, 'ExpressRouteCircuit', command_alias='show'), AutoCommandDefinition(ExpressRouteCircuitsOperations.list_arp_table, '[ExpressRouteCircuitArpTable]', 'list-arp'), AutoCommandDefinition(ExpressRouteCircuitsOperations.list_routes_table, '[ExpressRouteCircuitRoutesTable]', 'list-routes'), AutoCommandDefinition(ExpressRouteCircuitsOperations.list_stats, '[ExpressRouteCircuitStats]'), AutoCommandDefinition(ExpressRouteCircuitsOperations.list, '[ExpressRouteCircuit]'), AutoCommandDefinition(ExpressRouteCircuitsOperations.list_all, '[ExpressRouteCircuit]'), ], - command_table) + command_table, + { + 'circuit_name': {'name': '--name -n'} + }) # ExpressRouteServiceProvidersOperations -build_operation("network expressroutesp", +build_operation("network express-route service-provider", "express_route_service_providers", _network_client_factory, [ @@ -101,22 +119,28 @@ def _network_client_factory(_): _network_client_factory, [ AutoCommandDefinition(LoadBalancersOperations.delete, LongRunningOperation(L('Deleting load balancer'), L('Load balancer deleted'))), - AutoCommandDefinition(LoadBalancersOperations.get, 'LoadBalancer'), + AutoCommandDefinition(LoadBalancersOperations.get, 'LoadBalancer', command_alias='show'), AutoCommandDefinition(LoadBalancersOperations.list_all, '[LoadBalancer]'), AutoCommandDefinition(LoadBalancersOperations.list, '[LoadBalancer]'), ], - command_table) + command_table, + { + 'load_balancer_name': {'name': '--name -n'} + }) # LocalNetworkGatewaysOperations -build_operation("network localgateways", +build_operation("network local-gateway", "local_network_gateways", _network_client_factory, [ - AutoCommandDefinition(LocalNetworkGatewaysOperations.get, 'LocalNetworkGateway'), + AutoCommandDefinition(LocalNetworkGatewaysOperations.get, 'LocalNetworkGateway', command_alias='show'), AutoCommandDefinition(LocalNetworkGatewaysOperations.delete, LongRunningOperation(L('Deleting local network gateway'), L('Local network gateway deleted'))), AutoCommandDefinition(LocalNetworkGatewaysOperations.list, '[LocalNetworkGateway]'), ], - command_table) + command_table, + { + 'local_network_gateway_name': {'name': '--name -n'} + }) # NetworkInterfacesOperations @@ -125,118 +149,174 @@ def _network_client_factory(_): _network_client_factory, [ AutoCommandDefinition(NetworkInterfacesOperations.delete, LongRunningOperation(L('Deleting network interface'), L('Network interface deleted'))), - AutoCommandDefinition(NetworkInterfacesOperations.get, 'NetworkInterface'), - AutoCommandDefinition(NetworkInterfacesOperations.list_virtual_machine_scale_set_vm_network_interfaces, '[NetworkInterface]', 'list-scaleset-vm-network-interfaces'), - AutoCommandDefinition(NetworkInterfacesOperations.list_virtual_machine_scale_set_network_interfaces, '[NetworkInterface]', 'list-scaleset-network-interfaces'), - AutoCommandDefinition(NetworkInterfacesOperations.get_virtual_machine_scale_set_network_interface, 'NetworkInterface', 'get-scaleset-network-interface'), + AutoCommandDefinition(NetworkInterfacesOperations.get, 'NetworkInterface', command_alias='show'), AutoCommandDefinition(NetworkInterfacesOperations.list_all, '[NetworkInterface]'), AutoCommandDefinition(NetworkInterfacesOperations.list, '[NetworkInterface]'), ], - command_table) + command_table, + { + 'network_interface_name': {'name': '--name -n'} + }) + +# NetworkInterfacesOperations: scaleset +build_operation("network nic scale-set", + "network_interfaces", + _network_client_factory, + [ + AutoCommandDefinition(NetworkInterfacesOperations.list_virtual_machine_scale_set_vm_network_interfaces, '[NetworkInterface]', command_alias='list-vm-nics'), + AutoCommandDefinition(NetworkInterfacesOperations.list_virtual_machine_scale_set_network_interfaces, '[NetworkInterface]', command_alias='list'), + AutoCommandDefinition(NetworkInterfacesOperations.get_virtual_machine_scale_set_network_interface, 'NetworkInterface', command_alias='show'), + ], + command_table, + { + 'virtual_machine_scale_set_name': {'name': '--vm-scale-set'}, + 'network_interface_name': {'name': '--name -n'}, + 'virtualmachine_index': {'name': '--vm-index'} + }) # NetworkSecurityGroupsOperations -build_operation("network securitygroup", +build_operation("network nsg", "network_security_groups", _network_client_factory, [ AutoCommandDefinition(NetworkSecurityGroupsOperations.delete, LongRunningOperation(L('Deleting network security group'), L('Network security group deleted'))), - AutoCommandDefinition(NetworkSecurityGroupsOperations.get, 'NetworkSecurityGroup'), + AutoCommandDefinition(NetworkSecurityGroupsOperations.get, 'NetworkSecurityGroup', command_alias='show'), AutoCommandDefinition(NetworkSecurityGroupsOperations.list_all, '[NetworkSecurityGroup]'), AutoCommandDefinition(NetworkSecurityGroupsOperations.list, '[NetworkSecurityGroup]'), ], - command_table) + command_table, + { + 'network_security_group_name': {'name': '--name -n'} + }) # PublicIPAddressesOperations -build_operation("network publicipaddress", +build_operation("network public-ip", "public_ip_addresses", _network_client_factory, [ AutoCommandDefinition(PublicIPAddressesOperations.delete, LongRunningOperation(L('Deleting public IP address'), L('Public IP address deleted'))), - AutoCommandDefinition(PublicIPAddressesOperations.get, 'PublicIPAddress'), + AutoCommandDefinition(PublicIPAddressesOperations.get, 'PublicIPAddress', command_alias='show'), AutoCommandDefinition(PublicIPAddressesOperations.list_all, '[PublicIPAddress]'), AutoCommandDefinition(PublicIPAddressesOperations.list, '[PublicIPAddress]'), ], - command_table) + command_table, + { + 'public_ip_address_name': {'name': '--name -n'} + }) # RouteTablesOperations -build_operation("network routetable", +build_operation("network route-table", "route_tables", _network_client_factory, [ AutoCommandDefinition(RouteTablesOperations.delete, LongRunningOperation(L('Deleting route table'), L('Route table deleted'))), - AutoCommandDefinition(RouteTablesOperations.get, 'RouteTable'), + AutoCommandDefinition(RouteTablesOperations.get, 'RouteTable', command_alias='show'), AutoCommandDefinition(RouteTablesOperations.list, '[RouteTable]'), AutoCommandDefinition(RouteTablesOperations.list_all, '[RouteTable]'), ], - command_table) + command_table, + { + 'route_table_name': {'name': '--name -n'} + }) + # RoutesOperations -build_operation("network routeoperation", +build_operation("network route-operation", "routes", _network_client_factory, [ AutoCommandDefinition(RoutesOperations.delete, LongRunningOperation(L('Deleting route'), L('Route deleted'))), - AutoCommandDefinition(RoutesOperations.get, 'Route'), + AutoCommandDefinition(RoutesOperations.get, 'Route', command_alias='show'), AutoCommandDefinition(RoutesOperations.list, '[Route]'), ], - command_table) + command_table, + { + 'route_name': {'name': '--name -n'} + }) # SecurityRulesOperations -build_operation("network securityrules", +build_operation("network nsg-rule", "security_rules", _network_client_factory, [ AutoCommandDefinition(SecurityRulesOperations.delete, LongRunningOperation(L('Deleting security rule'), L('Security rule deleted'))), - AutoCommandDefinition(SecurityRulesOperations.get, 'SecurityRule'), + AutoCommandDefinition(SecurityRulesOperations.get, 'SecurityRule', command_alias='show'), AutoCommandDefinition(SecurityRulesOperations.list, '[SecurityRule]'), ], - command_table) + command_table, + { + 'security_rule_name': {'name': '--name'}, + 'network_security_group_name': {'name': '--nsg-name'} + }) # SubnetsOperations -build_operation("network subnet", +build_operation("network vnet subnet", "subnets", _network_client_factory, [ AutoCommandDefinition(SubnetsOperations.delete, LongRunningOperation(L('Deleting subnet'), L('Subnet deleted'))), - AutoCommandDefinition(SubnetsOperations.get, 'Subnet'), + AutoCommandDefinition(SubnetsOperations.get, 'Subnet', command_alias='show'), AutoCommandDefinition(SubnetsOperations.list, '[Subnet]'), ], - command_table) + command_table, + { + 'subnet_name': {'name': '--name -n'}, + 'virtual_network_name': {'name': _VNET_PARAM_NAME} + }) # UsagesOperations -build_operation("network usage", +build_operation("network", "usages", _network_client_factory, [ - AutoCommandDefinition(UsagesOperations.list, '[Usage]'), + AutoCommandDefinition(UsagesOperations.list, '[Usage]', command_alias='list-usages'), ], command_table) # VirtualNetworkGatewayConnectionsOperations -build_operation("network vnetgatewayconnection", +build_operation("network vpn-connection", "virtual_network_gateway_connections", _network_client_factory, [ AutoCommandDefinition(VirtualNetworkGatewayConnectionsOperations.delete, LongRunningOperation(L('Deleting virtual network gateway connection'), L('Virtual network gateway connection deleted'))), - AutoCommandDefinition(VirtualNetworkGatewayConnectionsOperations.get, 'VirtualNetworkGatewayConnection'), - AutoCommandDefinition(VirtualNetworkGatewayConnectionsOperations.get_shared_key, 'ConnectionSharedKeyResult'), + AutoCommandDefinition(VirtualNetworkGatewayConnectionsOperations.get, 'VirtualNetworkGatewayConnection', command_alias='show'), AutoCommandDefinition(VirtualNetworkGatewayConnectionsOperations.list, '[VirtualNetworkGatewayConnection]'), - AutoCommandDefinition(VirtualNetworkGatewayConnectionsOperations.reset_shared_key, 'ConnectionResetSharedKey'), - AutoCommandDefinition(VirtualNetworkGatewayConnectionsOperations.set_shared_key, 'ConnectionSharedKey'), ], - command_table) + command_table, + { + 'virtual_network_gateway_connection_name': {'name': '--name -n'} + }) + +# VirtualNetworkGatewayConnectionsOperations: shared-key +build_operation("network vpn-connection shared-key", + "virtual_network_gateway_connections", + _network_client_factory, + [ + AutoCommandDefinition(VirtualNetworkGatewayConnectionsOperations.get_shared_key, 'ConnectionSharedKeyResult', command_alias='show'), + AutoCommandDefinition(VirtualNetworkGatewayConnectionsOperations.reset_shared_key, 'ConnectionResetSharedKey', command_alias='reset'), + AutoCommandDefinition(VirtualNetworkGatewayConnectionsOperations.set_shared_key, 'ConnectionSharedKey', command_alias='set'), + ], + command_table, + { + 'virtual_network_gateway_connection_name': {'name': '--connection-name'}, + 'connection_shared_key_name': {'name': '--name -n'} + + }) # VirtualNetworkGatewaysOperations -build_operation("network vnetgateway", +build_operation("network vpn-gateway", "virtual_network_gateways", _network_client_factory, [ AutoCommandDefinition(VirtualNetworkGatewaysOperations.delete, LongRunningOperation(L('Deleting virtual network gateway'), L('Virtual network gateway deleted'))), - AutoCommandDefinition(VirtualNetworkGatewaysOperations.get, 'VirtualNetworkGateway'), + AutoCommandDefinition(VirtualNetworkGatewaysOperations.get, 'VirtualNetworkGateway', command_alias='show'), AutoCommandDefinition(VirtualNetworkGatewaysOperations.list, '[VirtualNetworkGateway]'), AutoCommandDefinition(VirtualNetworkGatewaysOperations.reset, 'VirtualNetworkGateway'), ], - command_table) + command_table, + { + 'virtual_network_gateway_name': {'name': '--name -n'} + }) # VirtualNetworksOperations build_operation("network vnet", @@ -244,16 +324,19 @@ def _network_client_factory(_): _network_client_factory, [ AutoCommandDefinition(VirtualNetworksOperations.delete, LongRunningOperation(L('Deleting virtual network'), L('Virtual network deleted'))), - AutoCommandDefinition(VirtualNetworksOperations.get, 'VirtualNetwork'), + AutoCommandDefinition(VirtualNetworksOperations.get, 'VirtualNetwork', command_alias='show'), AutoCommandDefinition(VirtualNetworksOperations.list, '[VirtualNetwork]'), AutoCommandDefinition(VirtualNetworksOperations.list_all, '[VirtualNetwork]'), ], - command_table) + command_table, + { + 'virtual_network_name': {'name': '--name -n'} + }) # BUG: we are waiting on autorest to support this rename (https://github.com/Azure/autorest/issues/941) VNET_SPECIFIC_PARAMS = { 'deployment_parameter_virtual_network_name_value': { - 'name': '--vnet-name', + 'name': '--name -n', 'metavar': 'VNETNAME', }, 'deployment_parameter_virtual_network_prefix_value': { @@ -287,13 +370,13 @@ def _network_client_factory(_): @command_table.command('network subnet create') @command_table.description(L('Create or update a virtual network (VNet) subnet')) @command_table.option(**COMMON_PARAMETERS['resource_group_name']) -@command_table.option('--name -n', help=L('the the subnet name'), required=True) -@command_table.option('--vnet -v', help=L('the name of the subnet vnet'), required=True) +@command_table.option('--name -n', help=L('the subnet name'), required=True) +@command_table.option(_VNET_PARAM_NAME, help=L('the name of the vnet'), required=True) @command_table.option('--address-prefix -a', help=L('the the address prefix in CIDR format'), required=True) def create_update_subnet(args): from azure.mgmt.network.models import Subnet - resource_group = args.get('resource_group') + resource_group = args.get(RESOURCE_GROUP_ARG_NAME) vnet = args.get('vnet') name = args.get('name') address_prefix = args.get('address_prefix') @@ -302,6 +385,6 @@ def create_update_subnet(args): address_prefix=address_prefix) op = LongRunningOperation('Creating subnet', 'Subnet created') - smc = _network_client_factory({}) + smc = _network_client_factory(args) poller = smc.subnets.create_or_update(resource_group, vnet, name, subnet_settings) return op(poller) diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/command_specs.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/command_specs.py index a6b5a11d257..c289ad651c0 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/tests/command_specs.py +++ b/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', diff --git a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource_list_odata_filter.py b/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource_list_odata_filter.py index c412b1c96ed..5b5a1b0f2c1 100644 --- a/src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/tests/test_resource_list_odata_filter.py +++ b/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 = { diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py index 26ed450458e..2f9e27aea3c 100644 --- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py +++ b/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 diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/command_specs.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/command_specs.py index eff3c6faac5..79b40f4cce3 100644 --- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/tests/command_specs.py +++ b/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)) 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 1f94a2222c0..4c040826850 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 @@ -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 diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/generated.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/generated.py index dc19182ef6a..1ee44d9cdf6 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/generated.py +++ b/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,13 +99,16 @@ 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", @@ -103,7 +116,7 @@ def _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,