Skip to content

[VM/VMSS] Fix broken name or ids logic in VM/VMSS Create #2091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tjprescott merged 2 commits into from
Feb 15, 2017
Merged

[VM/VMSS] Fix broken name or ids logic in VM/VMSS Create #2091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d567ac
Fix broken name or ids logic.
tjprescott Feb 15, 2017
b8d9375
Code review feedback.
tjprescott Feb 15, 2017
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
1 change: 0 additions & 1 deletion azure-cli.pyproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
<Compile Include="azure-cli-core\azure\cli\core\tests\test_command_registration.py" />
<Compile Include="azure-cli-core\azure\cli\core\tests\test_config.py" />
<Compile Include="azure-cli-core\azure\cli\core\tests\test_connection_verify.py" />
<Compile Include="azure-cli-core\azure\cli\core\tests\test_context.py" />
<Compile Include="azure-cli-core\azure\cli\core\tests\test_extensions_query.py" />
<Compile Include="azure-cli-core\azure\cli\core\tests\test_generic_update.py" />
<Compile Include="azure-cli-core\azure\cli\core\tests\test_help.py" />
Expand Down
49 changes: 36 additions & 13 deletions src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
VirtualMachineScaleSetExtension,
VirtualMachineScaleSetExtensionProfile)
from azure.cli.core.commands import LongRunningOperation
from azure.cli.core.commands.arm import parse_resource_id, resource_id
from azure.cli.core.commands.arm import parse_resource_id, resource_id, is_valid_resource_id
from azure.cli.core.commands.client_factory import get_mgmt_service_client, get_data_service_client
from azure.cli.core._util import CLIError
import azure.cli.core.azlogging as azlogging
Expand Down Expand Up @@ -1519,12 +1519,19 @@ def create_vm(vm_name, resource_group_name, image=None,
public_ip_address_allocation,
public_ip_address_dns_name))

subnet_id = '{}/virtualNetworks/{}/subnets/{}'.format(
network_id_template, vnet_name, subnet)
nsg_id = '{}/networkSecurityGroups/{}'.format(network_id_template, nsg) if nsg else None
public_ip_address_id = \
'{}/publicIPAddresses/{}'.format(network_id_template, public_ip_address) \
if public_ip_address else None
subnet_id = subnet if is_valid_resource_id(subnet) else \
'{}/virtualNetworks/{}/subnets/{}'.format(network_id_template, vnet_name, subnet)

nsg_id = None
if nsg:
nsg_id = nsg if is_valid_resource_id(nsg) else \
'{}/networkSecurityGroups/{}'.format(network_id_template, nsg)

public_ip_address_id = None
if public_ip_address:
public_ip_address_id = public_ip_address if is_valid_resource_id(public_ip_address) \
else '{}/publicIPAddresses/{}'.format(network_id_template, public_ip_address)

nics = [
{'id': '{}/networkInterfaces/{}'.format(network_id_template, nic_name)}
]
Expand Down Expand Up @@ -1629,7 +1636,9 @@ def create_vmss(vmss_name, resource_group_name, image,
vmss_dependencies.append('Microsoft.Network/virtualNetworks/{}'.format(vnet_name))
master_template.add_resource(build_vnet_resource(
vnet_name, location, tags, vnet_address_prefix, subnet, subnet_address_prefix))
subnet_id = '{}/virtualNetworks/{}/subnets/{}'.format(network_id_template, vnet_name, subnet)

subnet_id = subnet if is_valid_resource_id(subnet) else \
'{}/virtualNetworks/{}/subnets/{}'.format(network_id_template, vnet_name, subnet)

if load_balancer_type == 'new':
load_balancer = load_balancer or '{}LB'.format(vmss_name)
Expand All @@ -1643,7 +1652,10 @@ def create_vmss(vmss_name, resource_group_name, image,
tags,
public_ip_address_allocation,
public_ip_address_dns_name))
public_ip_address_id = '{}/publicIPAddresses/{}'.format(network_id_template, public_ip_address) if public_ip_address else None # pylint: disable=line-too-long
public_ip_address_id = None
if public_ip_address:
public_ip_address_id = public_ip_address if is_valid_resource_id(public_ip_address) \
else '{}/publicIPAddresses/{}'.format(network_id_template, public_ip_address)

# calculate default names if not provided
backend_pool_name = backend_pool_name or '{}BEPool'.format(load_balancer)
Expand All @@ -1665,10 +1677,21 @@ def create_vmss(vmss_name, resource_group_name, image,
scrubbed_name = vmss_name.replace('-', '').lower()[:5]
naming_prefix = '{}{}'.format(scrubbed_name,
random_string(9 - len(scrubbed_name), force_lower=True))
backend_address_pool_id = '{}/loadBalancers/{}/backendAddressPools/{}'.format(
network_id_template, load_balancer, backend_pool_name) if load_balancer_type else None
inbound_nat_pool_id = '{}/loadBalancers/{}/inboundNatPools/{}'.format(
network_id_template, load_balancer, nat_pool_name) if load_balancer_type == 'new' else None
backend_address_pool_id = None
inbound_nat_pool_id = None
if is_valid_resource_id(load_balancer):
backend_address_pool_id = \
'{}/backendAddressPools/{}'.format(load_balancer, backend_pool_name) \
if load_balancer_type else None
inbound_nat_pool_id = '{}/inboundNatPools/{}'.format(load_balancer, nat_pool_name) \
if load_balancer_type == 'new' else None
else:
backend_address_pool_id = '{}/loadBalancers/{}/backendAddressPools/{}'.format(
network_id_template, load_balancer, backend_pool_name) if load_balancer_type else None
inbound_nat_pool_id = '{}/loadBalancers/{}/inboundNatPools/{}'.format(
network_id_template, load_balancer, nat_pool_name) if load_balancer_type == 'new' \
else None

ip_config_name = '{}IPConfig'.format(naming_prefix)
nic_name = '{}Nic'.format(naming_prefix)

Expand Down
Loading