diff --git a/azure-cli.pyproj b/azure-cli.pyproj index cb96c5442b6..8b9f3e0685e 100644 --- a/azure-cli.pyproj +++ b/azure-cli.pyproj @@ -758,6 +758,7 @@ + @@ -846,6 +847,8 @@ + + diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py index a64c65c5427..0e5c1f25a1f 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py @@ -65,7 +65,7 @@ az vmss create -n myName -g myResourceGroup --dns-name-for-public-ip myGloballyUnieqDnsName --load-balancer-type existing --load-balancer-name myLoadBalancer --virtual-network-type existing --virtual-network-name myVNET --subnet-name mySubnet --image canonical:Ubuntu_Snappy_Core:15.04:2016.0318.1949 - --authentication-type ssh --ssh-key-value "" """.format(image_long_summary) helps['vm availability-set create'] = """ 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 4ec0cd0758b..430b523fed1 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 @@ -139,7 +139,8 @@ def get_vm_size_completion_list(prefix, action, parsed_args, **kwargs):#pylint: validator=_handle_vm_nics) register_cli_argument('vm create', 'name', name_arg_type, validator=_resource_not_exists('Microsoft.Compute/virtualMachines')) -register_cli_argument('vmss create', 'name', name_arg_type, validator=_resource_not_exists('Microsoft.Compute/virtualMachineScaleSets')) +register_cli_argument('vmss create', 'name', name_arg_type) +register_cli_argument('vmss create', 'nat_backend_port', default=None, help='Backend port to open with NAT rules. Defaults to 22 on Linux and 3389 on Windows.') register_cli_argument('vmss', 'vm_scale_set_name', name_arg_type, help='scale set name') register_cli_argument('vmss', 'instance_ids', help='Space separated ids such as "0 2 3", or use "*" for all instances') diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/azuredeploy.json b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/azuredeploy.json index 972b4fe2673..c5984d5bf67 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/azuredeploy.json +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/azuredeploy.json @@ -70,24 +70,24 @@ } }, "instanceCount": { - "type": "string", + "type": "int", "defaultValue": 2, "metadata": { "description": "Number of VMs in scale set." } }, - "loadBalancerBackendPoolName": { + "loadBalancer": { "type": "string", - "defaultValue": "[concat(parameters('name'), 'bepool')]", + "defaultValue": "[concat(parameters('name'), 'lb')]", "metadata": { - "description": "Name of load balancer backend pool." + "description": "Name or ID of load balancer." } }, - "loadBalancer": { + "loadBalancerBackendPoolName": { "type": "string", - "defaultValue": "[concat(parameters('name'), 'lb')]", + "defaultValue": "[concat(parameters('name'), 'bepool')]", "metadata": { - "description": "Name or ID of load balancer." + "description": "Name of load balancer backend pool." } }, "loadBalancerType": { @@ -117,6 +117,13 @@ "description": "The VM name." } }, + "natBackendPort": { + "type": "int", + "defaultValue": 22, + "metadata": { + "description": "Backend port to open with NAT rules." + } + }, "osDiskName": { "type": "string", "defaultValue": "osdiskimage", @@ -183,6 +190,13 @@ "description": "Overprovision option (see https://azure.microsoft.com/en-us/documentation/articles/virtual-machine-scale-sets-overview/ for details)." } }, + "publicIpAddress": { + "type": "string", + "defaultValue": "[concat(parameters('name'), 'PublicIP')]", + "metadata": { + "description": "Name or ID of public IP address to use." + } + }, "publicIpAddressAllocation": { "type": "string", "defaultValue": "dynamic", @@ -194,13 +208,6 @@ "description": "Public IP address allocation method." } }, - "publicIpAddress": { - "type": "string", - "defaultValue": "[concat(parameters('name'), 'PublicIP')]", - "metadata": { - "description": "Name or ID of public IP address to use." - } - }, "publicIpAddressType": { "type": "string", "defaultValue": "new", @@ -285,18 +292,18 @@ "description": "Manual or Automatic upgrade mode." } }, - "virtualNetworkIpAddressPrefix": { + "virtualNetwork": { "type": "string", - "defaultValue": "10.0.0.0/16", + "defaultValue": "[concat(parameters('name'), 'VNET')]", "metadata": { - "description": "The virtual network IP address prefix in CIDR format." + "description": "Name or ID of virtual network." } }, - "virtualNetwork": { + "virtualNetworkIpAddressPrefix": { "type": "string", - "defaultValue": "[concat(parameters('name'), 'VNET')]", + "defaultValue": "10.0.0.0/16", "metadata": { - "description": "Name or ID of virtual network." + "description": "The virtual network IP address prefix in CIDR format." } }, "virtualNetworkType": { @@ -426,6 +433,7 @@ "vmSize": "[parameters('vmSku')]", "vmDeploymentName": "[concat(parameters('name'), 'VM')]", "nicDeploymentName": "[concat(parameters('name'), 'NicIp')]", + "natRuleDeploymentName": "[concat(parameters('name'), 'NatRules')]", "subnetRef": "[concat(variables('virtualNetworkId'), '/subnets/', variables('subnetName'))]", "ipConfigurations": { "new": [ @@ -511,6 +519,14 @@ "new": "[variables('lbTemplateUri')]", "none": "[variables('lbTemplateUriEmpty')]" }, + "natTemplateUri": "[concat(parameters('_artifactsLocation'), '/', 'nested_templates/nat_rules_new', '.json')]", + "natTemplateUriEmpty": "[concat(parameters('_artifactsLocation'), '/', 'nested_templates/nat_rules_none', '.json')]", + "natTemplateFilePaths": { + "new": "[variables('natTemplateUri')]", + "existingId": "[variables('natTemplateUriEmpty')]", + "existingName": "[variables('natTemplateUriEmpty')]", + "none": "[variables('natTemplateUriEmpty')]" + }, "vhdContainers": [ "[concat('https://', variables('uniqueStringArray')[0], variables('newStorageAccountSuffix'), '.blob.core.windows.net/', variables('vhdContainerName'))]", "[concat('https://', variables('uniqueStringArray')[1], variables('newStorageAccountSuffix'), '.blob.core.windows.net/', variables('vhdContainerName'))]", @@ -614,7 +630,30 @@ "publicIpAddress": { "value": "[variables('publicIpAddressId')]" }, "publicIpAddressType": { "value": "[variables('lbPublicIpAddressType')[parameters('publicIpAddressType')]]" }, "backendPoolName": { "value": "[variables('bePoolName')]" }, - "subnet": { "value": "[variables('subnetRef')]" } + "subnet": { "value": "[variables('subnetRef')]" }, + "frontendIpName": { "value": "LoadBalancerFrontEnd" } + } + } + }, + { + "name": "[variables('natRuleDeploymentName')]", + "type": "Microsoft.Resources/deployments", + "apiVersion": "2015-01-01", + "dependsOn": [ + "[concat('Microsoft.Resources/deployments/', variables('lbDeploymentName'))]" + ], + "properties": { + "mode": "Incremental", + "templateLink": { + "uri": "[variables('natTemplateFilePaths')[parameters('loadBalancerType')]]", + "contentVersion": "1.0.0.0" + }, + "parameters": { + "loadBalancerName": { "value": "[parameters('loadBalancer')]" }, + "location": { "value": "[variables('resourceLocation')]" }, + "backendPort": { "value": "[parameters('natBackendPort')]" }, + "numberOfInstances": { "value": "[parameters('instanceCount')]" }, + "frontendIpName": { "value": "LoadBalancerFrontEnd" } } } }, diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/models/deployment_vmss.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/models/deployment_vmss.py index 73d32b58d71..faad86bf295 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/models/deployment_vmss.py +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/models/deployment_vmss.py @@ -22,7 +22,7 @@ class DeploymentVmss(Model): sending a request. :ivar uri: URI referencing the template. Default value: - "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-04/azuredeploy.json" + "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-24/azuredeploy.json" . :vartype uri: str :param content_version: If included it must match the ContentVersion in @@ -30,7 +30,7 @@ class DeploymentVmss(Model): :type content_version: str :ivar _artifacts_location: Container URI of of the template. Default value: - "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-04" + "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-24" . :vartype _artifacts_location: str :param admin_password: Password for the Virtual Machine. Required if SSH @@ -56,8 +56,8 @@ class DeploymentVmss(Model): name. Possible values include: 'none', 'new'. Default value: "none" . :type dns_name_type: str or :class:`dnsNameType ` - :param instance_count: Number of VMs in scale set. Default value: "2" . - :type instance_count: str + :param instance_count: Number of VMs in scale set. Default value: 2 . + :type instance_count: int :param load_balancer: Name or ID of load balancer. :type load_balancer: str :param load_balancer_backend_pool_name: Name of load balancer backend @@ -72,6 +72,9 @@ class DeploymentVmss(Model): :type location: str :param name: The VM name. :type name: str + :param nat_backend_port: Backend port to open with NAT rules. Default + value: 22 . + :type nat_backend_port: int :param os_disk_name: Name of new VM OS disk. Default value: "osdiskimage" . :type os_disk_name: str @@ -174,12 +177,13 @@ class DeploymentVmss(Model): 'custom_os_disk_uri': {'key': 'properties.parameters.customOsDiskUri.value', 'type': 'str'}, 'dns_name_for_public_ip': {'key': 'properties.parameters.dnsNameForPublicIP.value', 'type': 'str'}, 'dns_name_type': {'key': 'properties.parameters.dnsNameType.value', 'type': 'dnsNameType'}, - 'instance_count': {'key': 'properties.parameters.instanceCount.value', 'type': 'str'}, + 'instance_count': {'key': 'properties.parameters.instanceCount.value', 'type': 'int'}, 'load_balancer': {'key': 'properties.parameters.loadBalancer.value', 'type': 'str'}, 'load_balancer_backend_pool_name': {'key': 'properties.parameters.loadBalancerBackendPoolName.value', 'type': 'str'}, 'load_balancer_type': {'key': 'properties.parameters.loadBalancerType.value', 'type': 'loadBalancerType'}, 'location': {'key': 'properties.parameters.location.value', 'type': 'str'}, 'name': {'key': 'properties.parameters.name.value', 'type': 'str'}, + 'nat_backend_port': {'key': 'properties.parameters.natBackendPort.value', 'type': 'int'}, 'os_disk_name': {'key': 'properties.parameters.osDiskName.value', 'type': 'str'}, 'os_disk_type': {'key': 'properties.parameters.osDiskType.value', 'type': 'osDiskType'}, 'os_offer': {'key': 'properties.parameters.osOffer.value', 'type': 'str'}, @@ -207,13 +211,13 @@ class DeploymentVmss(Model): 'mode': {'key': 'properties.mode', 'type': 'str'}, } - uri = "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-04/azuredeploy.json" + uri = "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-24/azuredeploy.json" - _artifacts_location = "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-04" + _artifacts_location = "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-24" mode = "Incremental" - def __init__(self, admin_username, name, content_version=None, admin_password=None, authentication_type="password", custom_os_disk_type="windows", custom_os_disk_uri=None, dns_name_for_public_ip=None, dns_name_type="none", instance_count="2", load_balancer=None, load_balancer_backend_pool_name=None, load_balancer_type="new", location=None, os_disk_name="osdiskimage", os_disk_type="provided", os_offer="WindowsServer", os_publisher="MicrosoftWindowsServer", os_sku="2012-R2-Datacenter", os_type="Win2012R2Datacenter", os_version="latest", overprovision=False, public_ip_address=None, public_ip_address_allocation="dynamic", public_ip_address_type="new", ssh_dest_key_path=None, ssh_key_value=None, storage_caching="ReadOnly", storage_container_name="vhds", storage_type="Standard_LRS", subnet_ip_address_prefix="10.0.0.0/24", subnet_name=None, tags=None, upgrade_policy_mode="manual", virtual_network=None, virtual_network_ip_address_prefix="10.0.0.0/16", virtual_network_type="new", vm_sku="Standard_D1_v2"): + def __init__(self, admin_username, name, content_version=None, admin_password=None, authentication_type="password", custom_os_disk_type="windows", custom_os_disk_uri=None, dns_name_for_public_ip=None, dns_name_type="none", instance_count=2, load_balancer=None, load_balancer_backend_pool_name=None, load_balancer_type="new", location=None, nat_backend_port=22, os_disk_name="osdiskimage", os_disk_type="provided", os_offer="WindowsServer", os_publisher="MicrosoftWindowsServer", os_sku="2012-R2-Datacenter", os_type="Win2012R2Datacenter", os_version="latest", overprovision=False, public_ip_address=None, public_ip_address_allocation="dynamic", public_ip_address_type="new", ssh_dest_key_path=None, ssh_key_value=None, storage_caching="ReadOnly", storage_container_name="vhds", storage_type="Standard_LRS", subnet_ip_address_prefix="10.0.0.0/24", subnet_name=None, tags=None, upgrade_policy_mode="manual", virtual_network=None, virtual_network_ip_address_prefix="10.0.0.0/16", virtual_network_type="new", vm_sku="Standard_D1_v2"): self.content_version = content_version self.admin_password = admin_password self.admin_username = admin_username @@ -228,6 +232,7 @@ def __init__(self, admin_username, name, content_version=None, admin_password=No self.load_balancer_type = load_balancer_type self.location = location self.name = name + self.nat_backend_port = nat_backend_port self.os_disk_name = os_disk_name self.os_disk_type = os_disk_type self.os_offer = os_offer diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/models/template_link.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/models/template_link.py index 0ab98a2b532..d7177372cfd 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/models/template_link.py +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/models/template_link.py @@ -22,7 +22,7 @@ class TemplateLink(Model): sending a request. :ivar uri: URI referencing the template. Default value: - "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-04/azuredeploy.json" + "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-24/azuredeploy.json" . :vartype uri: str :param content_version: If included it must match the ContentVersion in @@ -39,7 +39,7 @@ class TemplateLink(Model): 'content_version': {'key': 'contentVersion', 'type': 'str'}, } - uri = "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-04/azuredeploy.json" + uri = "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-24/azuredeploy.json" def __init__(self, content_version=None): self.content_version = content_version diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/operations/vmss_operations.py b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/operations/vmss_operations.py index 1764406bce4..d46f18ef8cc 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/operations/vmss_operations.py +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/lib/operations/vmss_operations.py @@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def create_or_update( - self, resource_group_name, deployment_name, admin_username, name, content_version=None, admin_password=None, authentication_type="password", custom_os_disk_type="windows", custom_os_disk_uri=None, dns_name_for_public_ip=None, dns_name_type="none", instance_count="2", load_balancer=None, load_balancer_backend_pool_name=None, load_balancer_type="new", location=None, os_disk_name="osdiskimage", os_disk_type="provided", os_offer="WindowsServer", os_publisher="MicrosoftWindowsServer", os_sku="2012-R2-Datacenter", os_type="Win2012R2Datacenter", os_version="latest", overprovision=False, public_ip_address=None, public_ip_address_allocation="dynamic", public_ip_address_type="new", ssh_dest_key_path=None, ssh_key_value=None, storage_caching="ReadOnly", storage_container_name="vhds", storage_type="Standard_LRS", subnet_ip_address_prefix="10.0.0.0/24", subnet_name=None, tags=None, upgrade_policy_mode="manual", virtual_network=None, virtual_network_ip_address_prefix="10.0.0.0/16", virtual_network_type="new", vm_sku="Standard_D1_v2", custom_headers=None, raw=False, **operation_config): + self, resource_group_name, deployment_name, admin_username, name, content_version=None, admin_password=None, authentication_type="password", custom_os_disk_type="windows", custom_os_disk_uri=None, dns_name_for_public_ip=None, dns_name_type="none", instance_count=2, load_balancer=None, load_balancer_backend_pool_name=None, load_balancer_type="new", location=None, nat_backend_port=22, os_disk_name="osdiskimage", os_disk_type="provided", os_offer="WindowsServer", os_publisher="MicrosoftWindowsServer", os_sku="2012-R2-Datacenter", os_type="Win2012R2Datacenter", os_version="latest", overprovision=False, public_ip_address=None, public_ip_address_allocation="dynamic", public_ip_address_type="new", ssh_dest_key_path=None, ssh_key_value=None, storage_caching="ReadOnly", storage_container_name="vhds", storage_type="Standard_LRS", subnet_ip_address_prefix="10.0.0.0/24", subnet_name=None, tags=None, upgrade_policy_mode="manual", virtual_network=None, virtual_network_ip_address_prefix="10.0.0.0/16", virtual_network_type="new", vm_sku="Standard_D1_v2", custom_headers=None, raw=False, **operation_config): """ Create or update a virtual machine. @@ -75,7 +75,7 @@ def create_or_update( :type dns_name_type: str or :class:`dnsNameType ` :param instance_count: Number of VMs in scale set. - :type instance_count: str + :type instance_count: int :param load_balancer: Name or ID of load balancer. :type load_balancer: str :param load_balancer_backend_pool_name: Name of load balancer backend @@ -88,6 +88,8 @@ def create_or_update( ` :param location: Location for VM resources. :type location: str + :param nat_backend_port: Backend port to open with NAT rules. + :type nat_backend_port: int :param os_disk_name: Name of new VM OS disk. :type os_disk_name: str :param os_disk_type: Use a custom image URI from the OS Disk URI @@ -174,7 +176,7 @@ def create_or_update( :rtype: :class:`ClientRawResponse` if raw=true """ - parameters = models.DeploymentVmss(content_version=content_version, admin_password=admin_password, admin_username=admin_username, authentication_type=authentication_type, custom_os_disk_type=custom_os_disk_type, custom_os_disk_uri=custom_os_disk_uri, dns_name_for_public_ip=dns_name_for_public_ip, dns_name_type=dns_name_type, instance_count=instance_count, load_balancer=load_balancer, load_balancer_backend_pool_name=load_balancer_backend_pool_name, load_balancer_type=load_balancer_type, location=location, name=name, os_disk_name=os_disk_name, os_disk_type=os_disk_type, os_offer=os_offer, os_publisher=os_publisher, os_sku=os_sku, os_type=os_type, os_version=os_version, overprovision=overprovision, public_ip_address=public_ip_address, public_ip_address_allocation=public_ip_address_allocation, public_ip_address_type=public_ip_address_type, ssh_dest_key_path=ssh_dest_key_path, ssh_key_value=ssh_key_value, storage_caching=storage_caching, storage_container_name=storage_container_name, storage_type=storage_type, subnet_ip_address_prefix=subnet_ip_address_prefix, subnet_name=subnet_name, tags=tags, upgrade_policy_mode=upgrade_policy_mode, virtual_network=virtual_network, virtual_network_ip_address_prefix=virtual_network_ip_address_prefix, virtual_network_type=virtual_network_type, vm_sku=vm_sku) + parameters = models.DeploymentVmss(content_version=content_version, admin_password=admin_password, admin_username=admin_username, authentication_type=authentication_type, custom_os_disk_type=custom_os_disk_type, custom_os_disk_uri=custom_os_disk_uri, dns_name_for_public_ip=dns_name_for_public_ip, dns_name_type=dns_name_type, instance_count=instance_count, load_balancer=load_balancer, load_balancer_backend_pool_name=load_balancer_backend_pool_name, load_balancer_type=load_balancer_type, location=location, name=name, nat_backend_port=nat_backend_port, os_disk_name=os_disk_name, os_disk_type=os_disk_type, os_offer=os_offer, os_publisher=os_publisher, os_sku=os_sku, os_type=os_type, os_version=os_version, overprovision=overprovision, public_ip_address=public_ip_address, public_ip_address_allocation=public_ip_address_allocation, public_ip_address_type=public_ip_address_type, ssh_dest_key_path=ssh_dest_key_path, ssh_key_value=ssh_key_value, storage_caching=storage_caching, storage_container_name=storage_container_name, storage_type=storage_type, subnet_ip_address_prefix=subnet_ip_address_prefix, subnet_name=subnet_name, tags=tags, upgrade_policy_mode=upgrade_policy_mode, virtual_network=virtual_network, virtual_network_ip_address_prefix=virtual_network_ip_address_prefix, virtual_network_type=virtual_network_type, vm_sku=vm_sku) # Construct URL url = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Resources/deployments/{deploymentName}' diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/nested_templates/nat_rules_new.json b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/nested_templates/nat_rules_new.json new file mode 100644 index 00000000000..8388eebf295 --- /dev/null +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/nested_templates/nat_rules_new.json @@ -0,0 +1,49 @@ +{ + "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json", + "contentVersion": "1.0.0.0", + "parameters": { + "backendPort": { + "type": "int" + }, + "frontendIpName": { + "type": "string" + }, + "loadBalancerName": { + "type": "string" + }, + "location": { + "type": "string" + }, + "numberOfInstances": { + "type": "int" + } + }, + + "variables": { + "lbID": "[resourceId('Microsoft.Network/loadBalancers',parameters('loadBalancerName'))]", + "frontEndIPConfigID": "[concat(variables('lbID'),'/frontendIPConfigurations/',parameters('frontendIpName'))]" + }, + "resources": [ + { + "apiVersion": "2015-06-15", + "type": "Microsoft.Network/loadBalancers/inboundNatRules", + "name": "[concat(parameters('loadBalancerName'), '/', 'NAT-RULE', copyIndex())]", + "location": "[parameters('location')]", + "copy": { + "name": "lbNatLoop", + "count": "[parameters('numberOfInstances')]" + }, + "dependsOn": [ + ], + "properties": { + "frontendIPConfiguration": { + "id": "[variables('frontEndIPConfigID')]" + }, + "protocol": "tcp", + "frontendPort": "[copyIndex(50000)]", + "backendPort": "[parameters('backendPort')]", + "enableFloatingIP": false + } + } + ] +} \ No newline at end of file diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/nested_templates/nat_rules_none.json b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/nested_templates/nat_rules_none.json new file mode 100644 index 00000000000..4cd66ab2c5b --- /dev/null +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/nested_templates/nat_rules_none.json @@ -0,0 +1,28 @@ +{ + "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json", + "contentVersion": "1.0.0.0", + "parameters": { + "backendPort": { + "type": "int" + }, + "frontendIpName": { + "type": "string" + }, + "loadBalancerName": { + "type": "string" + }, + "location": { + "type": "string" + }, + "numberOfInstances": { + "type": "int" + } + }, + + "variables": { + + }, + "resources": [ + + ] +} \ No newline at end of file diff --git a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/swagger_create_vmss.json b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/swagger_create_vmss.json index 278379fd700..aab91c3bbf3 100644 --- a/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/swagger_create_vmss.json +++ b/src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt_vmss/swagger_create_vmss.json @@ -145,7 +145,7 @@ "type": "string", "description": "URI referencing the template.", "enum": [ - "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-04/azuredeploy.json" + "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-24/azuredeploy.json" ] }, "contentVersion": { @@ -230,6 +230,11 @@ "$ref": "#/definitions/DeploymentParameter_name", "x-ms-client-flatten": true }, + "natBackendPort": { + "type": "object", + "$ref": "#/definitions/DeploymentParameter_natBackendPort", + "x-ms-client-flatten": true + }, "osDiskName": { "type": "object", "$ref": "#/definitions/DeploymentParameter_osDiskName", @@ -452,7 +457,7 @@ "DeploymentParameter_instanceCount": { "properties": { "value": { - "type": "string", + "type": "integer", "description": "Number of VMs in scale set.", "x-ms-client-name": "instanceCount", "default": "2" @@ -518,6 +523,16 @@ "value" ] }, + "DeploymentParameter_natBackendPort": { + "properties": { + "value": { + "type": "integer", + "description": "Backend port to open with NAT rules.", + "x-ms-client-name": "natBackendPort", + "default": "22" + } + } + }, "DeploymentParameter_osDiskName": { "properties": { "value": { @@ -820,7 +835,7 @@ "description": "Container URI of of the template.", "x-ms-client-name": "_artifactsLocation", "enum": [ - "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-04" + "https://azuresdkci.blob.core.windows.net/templatehost/CreateVmss_2016-08-24" ] } },