diff --git a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/generated.py b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/generated.py index fe4d6d64510..1a296ebbea9 100644 --- a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/generated.py +++ b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/generated.py @@ -12,7 +12,8 @@ # HELPER METHODS -cli_command('component list', list_components) +cli_command('component list', list_components, + simple_output_query="[*].{Name:name, Version:version} | sort_by(@, &Name)") cli_command('component install', install) cli_command('component update', update) cli_command('component update-all', update_all) 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 12e669a072c..5874d7f4bb6 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 @@ -45,22 +45,23 @@ # VM factory = lambda _: get_mgmt_service_client(VMClient).vm -cli_command('vm create', VmOperations.create_or_update, factory, transform=DeploymentOutputLongRunningOperation('Starting vm create')) +cli_command('vm create', VmOperations.create_or_update, factory, transform=DeploymentOutputLongRunningOperation('Starting vm create'), + simple_output_query="{ResourceGroup:resourceGroup, PublicIpAddress:publicIpAddress, PrivateIpAddress:privateIpAddress, MacAddress:macAddress, FQDN:fqdn}") factory = lambda _: _compute_client_factory().virtual_machines cli_command('vm delete', VirtualMachinesOperations.delete, factory) cli_command('vm deallocate', VirtualMachinesOperations.deallocate, factory) cli_command('vm generalize', VirtualMachinesOperations.generalize, factory) -cli_command('vm show', VirtualMachinesOperations.get, factory, simple_output_query="{Name:name, ResourceGroup:resourceGroup, Location:location, VmSize:hardwareProfile.vmSize, OsType: storageProfile.osDisk.osType, Urn: join(':', [storageProfile.imageReference.publisher, storageProfile.imageReference.offer, storageProfile.imageReference.sku, storageProfile.imageReference.version])}") -cli_command('vm list-vm-resize-options', VirtualMachinesOperations.list_available_sizes, factory) +cli_command('vm show', VirtualMachinesOperations.get, factory, simple_output_query="{Name:name, ResourceGroup:resourceGroup, Location:location, VmSize:hardwareProfile.vmSize, OsType: storageProfile.osDisk.osType}") +cli_command('vm list-vm-resize-options', VirtualMachinesOperations.list_available_sizes, factory, simple_output_query="[*].{Name: name, NumberOfCores: numberOfCores, MemoryInMb: memoryInMb, MaxDataDiskCount: maxDataDiskCount, ResourceDiskSizeInMb: resourceDiskSizeInMb, OsDiskSizeInMb: osDiskSizeInMb} | sort_by(@, &Name)") cli_command('vm stop', VirtualMachinesOperations.power_off, factory) cli_command('vm restart', VirtualMachinesOperations.restart, factory) cli_command('vm start', VirtualMachinesOperations.start, factory) cli_command('vm redeploy', VirtualMachinesOperations.redeploy, factory) -cli_command('vm list-ip-addresses', list_ip_addresses) -cli_command('vm list', list_vm, simple_output_query="[*].{Name: name, ResourceGroup: resourceGroup, Location: location, VmSize: hardwareProfile.vmSize, Urn: join(':', [storageProfile.imageReference.publisher, storageProfile.imageReference.offer, storageProfile.imageReference.sku, storageProfile.imageReference.version])} | sort_by(@, &Name)") -cli_command('vm resize', resize_vm) +cli_command('vm list-ip-addresses', list_ip_addresses, simple_output_query="[*].{VmName: virtualMachine.name, VmResourceGroup: virtualMachine.resourceGroup, PublicIpAddressName: join(', ', virtualMachine.network.publicIpAddresses[].name), PublicIpAddress: join(', ', virtualMachine.network.publicIpAddresses[].ipAddress), PublicIpAllocationMethod: join(', ', virtualMachine.network.publicIpAddresses[].ipAllocationMethod)} | sort_by(@, &VmName)") +cli_command('vm list', list_vm, simple_output_query="[*].{Name: name, ResourceGroup: resourceGroup, ProvisioningState: provisioningState, Location: location, Size: hardwareProfile.vmSize} | sort_by(@, &Name)") +cli_command('vm resize', resize_vm, simple_output_query="{Name:name, ResourceGroup:resourceGroup, Location:location, VmSize:hardwareProfile.vmSize, OsType: storageProfile.osDisk.osType}") cli_command('vm capture', capture_vm) cli_command('vm nic add', vm_add_nics) cli_command('vm nic delete', vm_delete_nics) @@ -79,9 +80,9 @@ factory = lambda _: _compute_client_factory().availability_sets cli_command('vm availability-set delete', AvailabilitySetsOperations.delete, factory) -cli_command('vm availability-set show', AvailabilitySetsOperations.get, factory) -cli_command('vm availability-set list', AvailabilitySetsOperations.list, factory) -cli_command('vm availability-set list-sizes', AvailabilitySetsOperations.list_available_sizes, factory) +cli_command('vm availability-set show', AvailabilitySetsOperations.get, factory, simple_output_query="{Name:name, ResourceGroup:resourceGroup, Location:location, PlatformUpdateDomainCount:platformUpdateDomainCount, PlatformFaultDomainCount:platformFaultDomainCount}") +cli_command('vm availability-set list', AvailabilitySetsOperations.list, factory, simple_output_query="[*].{Name:name, ResourceGroup:resourceGroup, Location:location, PlatformUpdateDomainCount:platformUpdateDomainCount, PlatformFaultDomainCount:platformFaultDomainCount} | sort_by(@, &Name)") +cli_command('vm availability-set list-sizes', AvailabilitySetsOperations.list_available_sizes, factory, simple_output_query="[*].{Name: name, NumberOfCores: numberOfCores, MemoryInMb: memoryInMb, MaxDataDiskCount: maxDataDiskCount, ResourceDiskSizeInMb: resourceDiskSizeInMb, OsDiskSizeInMb: osDiskSizeInMb} | sort_by(@, &Name)") # VM Boot Diagnostics cli_command('vm boot-diagnostics disable', disable_boot_diagnostics) @@ -99,8 +100,8 @@ ContainerService._attribute_map[a]['type'] = 'str'#pylint: disable=protected-access ContainerService._attribute_map['tags']['type'] = '{str}'#pylint: disable=protected-access ###### -cli_command('vm container show', ContainerServiceOperations.get, factory) -cli_command('vm container list', ContainerServiceOperations.list, factory) +cli_command('vm container show', ContainerServiceOperations.get, factory, simple_output_query="{Name:name, ResourceGroup:resourceGroup, ProvisioningState: provisioningState, Location:location, OrchestratorType:orchestratorProfile.orchestratorType, MasterCount:masterProfile.count, MasterFQDN:masterProfile.fqdn}") +cli_command('vm container list', ContainerServiceOperations.list, factory, simple_output_query="[*].{Name:name, ResourceGroup:resourceGroup, ProvisioningState: provisioningState, Location:location, OrchestratorType:orchestratorProfile.orchestratorType, MasterCount:masterProfile.count, MasterFQDN:masterProfile.fqdn} | sort_by(@, &Name)") cli_command('vm container delete', ContainerServiceOperations.delete, factory) register_generic_update('vm container update', ContainerServiceOperations.get, ContainerServiceOperations.create_or_update, factory) @@ -112,33 +113,33 @@ cli_command('vm disk attach-new', attach_new_disk) cli_command('vm disk attach-existing', attach_existing_disk) cli_command('vm disk detach', detach_disk) -cli_command('vm disk list', list_disks) +cli_command('vm disk list', list_disks, simple_output_query="[*].{Name:name, Lun:lun, DiskSizeGb:diskSizeGb, Caching:caching, Uri:vhd.uri} | sort_by(@, &Name)") # VM Extension factory = lambda _: _compute_client_factory().virtual_machine_extensions cli_command('vm extension delete', VirtualMachineExtensionsOperations.delete, factory) cli_command('vm extension show', VirtualMachineExtensionsOperations.get, factory) cli_command('vm extension set', set_extension) -cli_command('vm extension list', list_extensions) +cli_command('vm extension list', list_extensions, simple_output_query="[*].{Name:name, ResourceGroup:resourceGroup, ProvisioningState:provisioningState, Publisher:publisher, Version:typeHandlerVersion} | sort_by(@, &Name)") # VM Extension Image factory = lambda _: _compute_client_factory().virtual_machine_extension_images -cli_command('vm extension image show', VirtualMachineExtensionImagesOperations.get, factory) -cli_command('vm extension image list-names', VirtualMachineExtensionImagesOperations.list_types, factory) -cli_command('vm extension image list-versions', VirtualMachineExtensionImagesOperations.list_versions, factory) -cli_command('vm extension image list', list_vm_extension_images) +cli_command('vm extension image show', VirtualMachineExtensionImagesOperations.get, factory, simple_output_query="{Name:name, Location:location, OperatingSystem:operatingSystem, SupportsMultipleExtensions:supportsMultipleExtensions, VmScaleSetEnabled:vmScaleSetEnabled, ComputeRole:computeRole}") +cli_command('vm extension image list-names', VirtualMachineExtensionImagesOperations.list_types, factory, simple_output_query="[*].{Name:name, Location:location} | sort_by(@, &Name)") +cli_command('vm extension image list-versions', VirtualMachineExtensionImagesOperations.list_versions, factory, simple_output_query="[*].{Name:name, Location:location} | sort_by(@, &Name)") +cli_command('vm extension image list', list_vm_extension_images, simple_output_query="[*].{Publisher:publisher, Name:name, Version:version} | sort_by(@, &Publisher)") # VM Image factory = lambda _: _compute_client_factory().virtual_machine_images -cli_command('vm image show', VirtualMachineImagesOperations.get, factory) -cli_command('vm image list-offers', VirtualMachineImagesOperations.list_offers, factory) -cli_command('vm image list-publishers', VirtualMachineImagesOperations.list_publishers, factory) -cli_command('vm image list-skus', VirtualMachineImagesOperations.list_skus, factory) -cli_command('vm image list', list_vm_images) +cli_command('vm image show', VirtualMachineImagesOperations.get, factory, simple_output_query="{Publisher:plan.publisher, Offer:plan.product, Sku:plan.name, OS:osDiskImage.operatingSystem, Version:name, Location:location, Urn:join(':', [plan.publisher,plan.product,plan.name,name])}") +cli_command('vm image list-offers', VirtualMachineImagesOperations.list_offers, factory, simple_output_query="[*].{Name:name, Location:location} | sort_by(@, &Name)") +cli_command('vm image list-publishers', VirtualMachineImagesOperations.list_publishers, factory, simple_output_query="[*].{Name:name, Location:location} | sort_by(@, &Name)") +cli_command('vm image list-skus', VirtualMachineImagesOperations.list_skus, factory, simple_output_query="[*].{Name:name, Location:location} | sort_by(@, &Name)") +cli_command('vm image list', list_vm_images, simple_output_query="[*].{Publisher:publisher, Offer:offer, Sku:sku, Version:version, UrnAlias:\"urn alias\", Urn:urn}") # VM Usage factory = lambda _: _compute_client_factory().usage -cli_command('vm usage list', UsageOperations.list, factory) +cli_command('vm usage list', UsageOperations.list, factory, simple_output_query="[*].{Name:name.localizedValue, CurrentValue:currentValue, Limit:limit} | sort_by(@, &Name)") # VM ScaleSet factory = lambda _: get_mgmt_service_client(VMSSClient).vmss @@ -146,16 +147,16 @@ factory = lambda _: _compute_client_factory().virtual_machine_scale_sets cli_command('vmss delete', VirtualMachineScaleSetsOperations.delete, factory) -cli_command('vmss list-skus', VirtualMachineScaleSetsOperations.list_skus, factory) +cli_command('vmss list-skus', VirtualMachineScaleSetsOperations.list_skus, factory, simple_output_query="[*].{SkuName:sku.name, SkuTier:sku.tier, CapacityMin:capacity.minimum, CapacityMax:capacity.maximum, CapacityDefault:capacity.defaultCapacity, CapacityScaleType:capacity.scaleType} | sort_by(@, &SkuName)") factory = lambda _: _compute_client_factory().virtual_machine_scale_set_vms -cli_command('vmss list-instances', VirtualMachineScaleSetVMsOperations.list, factory) +cli_command('vmss list-instances', VirtualMachineScaleSetVMsOperations.list, factory, simple_output_query="[*].{Name:name, ResourceGroup:resourceGroup, ProvisioningState:provisioningState, Location:location, SkuName:sku.name, SkuTier:sku.tier, InstanceId:instanceId} | sort_by(@, &Name)") cli_command('vmss deallocate', vmss_deallocate) cli_command('vmss delete-instances', vmss_delete_instances) cli_command('vmss get-instance-view', vmss_get_instance_view) -cli_command('vmss show', vmss_show) -cli_command('vmss list ', vmss_list) +cli_command('vmss show', vmss_show, simple_output_query="{Name:name, ResourceGroup:resourceGroup, ProvisioningState:provisioningState, Location:location, SkuCapacity:sku.capacity, SkuName:sku.name, SkuTier:skuTier}") +cli_command('vmss list ', vmss_list, simple_output_query="[*].{Name:name, ResourceGroup:resourceGroup, ProvisioningState:provisioningState, Location:location} | sort_by(@, &Name)") cli_command('vmss stop', vmss_stop) cli_command('vmss restart', vmss_restart) cli_command('vmss start', vmss_start) @@ -165,4 +166,4 @@ # VM Size factory = lambda _: _compute_client_factory().virtual_machine_sizes -cli_command('vm list-sizes', VirtualMachineSizesOperations.list, factory) +cli_command('vm list-sizes', VirtualMachineSizesOperations.list, factory, simple_output_query="[*].{Name: name, NumberOfCores: numberOfCores, MemoryInMb: memoryInMb, MaxDataDiskCount: maxDataDiskCount, ResourceDiskSizeInMb: resourceDiskSizeInMb, OsDiskSizeInMb: osDiskSizeInMb} | sort_by(@, &Name)")