Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/azure-cli/azure/cli/command_modules/vm/_vm_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,7 @@ def __init__(self):


def raise_unsupported_error_for_flex_vmss(vmss, error_message):
if hasattr(vmss, 'orchestration_mode') and vmss.orchestration_mode \
and vmss.orchestration_mode.lower() == 'flexible':
if vmss.get('orchestrationMode', '').lower() == 'flexible':
from azure.cli.core.azclierror import ArgumentUsageError
raise ArgumentUsageError(error_message)

Expand Down
7 changes: 4 additions & 3 deletions src/azure-cli/azure/cli/command_modules/vm/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,16 @@ def load_command_table(self, _):
g.custom_command('identity remove', 'remove_vmss_identity', validator=process_remove_identity_namespace, is_preview=True)
g.custom_show_command('identity show', 'show_vmss_identity')

g.custom_command('list-instance-connection-info', 'list_vmss_instance_connection_info')
g.custom_command('list-instance-public-ips', 'list_vmss_instance_public_ips')
g.custom_command('list-instances', 'get_instances_list')

with self.command_group('vmss', compute_vmss_sdk, operation_group='virtual_machine_scale_sets') as g:
g.custom_command('application set', 'set_vmss_applications', validator=process_set_applications_namespace, min_api='2021-07-01')
g.custom_command('application list', 'list_vmss_applications', min_api='2021-07-01')
g.custom_command('create', 'create_vmss', transform=DeploymentOutputLongRunningOperation(self.cli_ctx, 'Starting vmss create'), supports_no_wait=True, table_transformer=deployment_validate_table_format, validator=process_vmss_create_namespace, exception_handler=handle_template_based_exception)
g.custom_command('deallocate', 'deallocate_vmss', supports_no_wait=True)
g.custom_command('get-instance-view', 'get_vmss_instance_view', table_transformer='{ProvisioningState:statuses[0].displayStatus, PowerState:statuses[1].displayStatus}')
g.custom_command('list-instance-connection-info', 'list_vmss_instance_connection_info')
g.custom_command('list-instance-public-ips', 'list_vmss_instance_public_ips')
g.custom_command('list-instances', 'get_instances_list')
g.custom_command('reimage', 'reimage_vmss', supports_no_wait=True, min_api='2017-03-30')
g.custom_command('restart', 'restart_vmss', supports_no_wait=True)
g.custom_command('scale', 'scale_vmss', supports_no_wait=True)
Expand Down
31 changes: 20 additions & 11 deletions src/azure-cli/azure/cli/command_modules/vm/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -4336,31 +4336,36 @@ def get_vmss_instance_view(cmd, resource_group_name, vm_scale_set_name, instance

def list_vmss_instance_connection_info(cmd, resource_group_name, vm_scale_set_name):
from azure.mgmt.core.tools import parse_resource_id
from .aaz.latest.vmss import Show as VmssShow

LBShow = import_aaz_by_profile(cmd.cli_ctx.cloud.profile, "network.lb").Show
PublicIPAddress = import_aaz_by_profile(cmd.cli_ctx.cloud.profile, "network.public_ip").Show

client = _compute_client_factory(cmd.cli_ctx)
vmss = client.virtual_machine_scale_sets.get(resource_group_name, vm_scale_set_name)
command_args = {
'resource_group': resource_group_name,
'vm_scale_set_name': vm_scale_set_name
}
vmss = VmssShow(cli_ctx=cmd.cli_ctx)(command_args=command_args)

from ._vm_utils import raise_unsupported_error_for_flex_vmss
raise_unsupported_error_for_flex_vmss(
vmss, 'This command is not available for VMSS in Flex mode. '
'Please use the "az network public-ip list/show" to retrieve networking information.')

# find the load balancer
nic_configs = vmss.virtual_machine_profile.network_profile.network_interface_configurations
primary_nic_config = next((n for n in nic_configs if n.primary), None)
nic_configs = \
vmss.get('virtualMachineProfile', {}).get('networkProfile', {}).get('networkInterfaceConfigurations', [])
primary_nic_config = next((n for n in nic_configs if n.get('primary')), None)
if primary_nic_config is None:
raise CLIError('could not find a primary NIC which is needed to search to load balancer')

res_id = None
for ip in primary_nic_config.ip_configurations:
if ip.load_balancer_inbound_nat_pools:
res_id = ip.load_balancer_inbound_nat_pools[0].id
for ip in primary_nic_config.get('ipConfigurations'):
if len(ip.get('loadBalancerInboundNatPools', [])) > 0:
res_id = ip['loadBalancerInboundNatPools'][0].get('id')
break
if ip.load_balancer_backend_address_pools:
res_id = ip.load_balancer_backend_address_pools[0].id
if len(ip.get('loadBalancerBackendAddressPools', [])) > 0:
res_id = ip['loadBalancerBackendAddressPools'][0].get('id')
break

if not res_id:
Expand Down Expand Up @@ -4423,10 +4428,14 @@ def list_vmss_instance_connection_info(cmd, resource_group_name, vm_scale_set_na


def list_vmss_instance_public_ips(cmd, resource_group_name, vm_scale_set_name):
from .aaz.latest.vmss import Show as VmssShow
ListInstancePublicIps = import_aaz_by_profile(cmd.cli_ctx.cloud.profile, "vmss").ListInstancePublicIps

compute_client = _compute_client_factory(cmd.cli_ctx)
vmss = compute_client.virtual_machine_scale_sets.get(resource_group_name, vm_scale_set_name)
command_args = {
'resource_group': resource_group_name,
'vm_scale_set_name': vm_scale_set_name
}
vmss = VmssShow(cli_ctx=cmd.cli_ctx)(command_args=command_args)
from ._vm_utils import raise_unsupported_error_for_flex_vmss
raise_unsupported_error_for_flex_vmss(
vmss, 'This command is not available for VMSS in Flex mode. '
Expand Down