vmss create: support public ip per vm, custom domain name, custom dns servers (Azure#3961)

Author: yugangw-msft

src/command_modules/azure-cli-network/setup.py

@@ -30,7 +30,7 @@
 ]
 
 DEPENDENCIES = [
-    'azure-mgmt-network==1.1.0',
+    'azure-mgmt-network==1.2.0',
     'azure-mgmt-trafficmanager==0.30.0',
     'azure-mgmt-dns==1.0.1',
     'azure-mgmt-resource==1.1.0',

src/command_modules/azure-cli-vm/HISTORY.rst

@@ -12,6 +12,7 @@ unreleased
   to password without needing `--authentication-type password` explicitly.
 * `vm/vmss create`: added information statements that can be shown using --debug
 * `vm/vmss create`: added client-side validation where certain parameters were previously just ignored.
+* `vmss create`: support public ip per instance, instance custom domain name, custom dns servers
 
 
 2.0.9 (2017-06-21)

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_client_factory.py

@@ -21,6 +21,13 @@ def cf_ni(_):
     return ni
 
 
+def cf_public_ip_addresses(_):
+    from azure.cli.core.profiles import ResourceType
+    from azure.cli.core.commands.client_factory import get_mgmt_service_client
+    public_ip_ops = get_mgmt_service_client(ResourceType.MGMT_NETWORK).public_ip_addresses
+    return public_ip_ops
+
+
 def cf_avail_set(_):
     return _compute_client_factory().availability_sets
 

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_help.py

@@ -123,6 +123,9 @@
         - name: Create a Linux VM scale set from a custom image using an existing ssh public key of ~/.ssh/id_rsa.pub.
           text: >
             az vmss create -n MyVmss -g MyResourceGroup --image MyImage
+        - name: Create a Linux VM scale set, a load balancer, each VM has a public-ip address, a custom domain name, own dns servers
+          text: >
+            az vmss create -n MyVmss -g MyResourceGroup --image centos --public-ip-per-vm --vm-domain-name myvmss --dns-servers 10.0.0.6 10.0.0.5
         - name: Create a Linux VM scale set with a cloud-init script (https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init).
           text: >
             az vmss create -g MyResourceGroup -n MyVmss --image debian --custom_data MyCloudInitScript.yml
@@ -748,6 +751,11 @@
     short-summary: Get the IP address and port number used to connect to individual instances.
 """
 
+helps['vmss list-instance-public-ips'] = """
+    type: command
+    short-summary: List public IP addresses of VM instances
+"""
+
 helps['vmss extension'] = """
     type: group
     short-summary: Extend the functionality of your VM scale set with extensions.

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_params.py

@@ -10,7 +10,8 @@
                                        UpgradeMode)
 from azure.mgmt.storage.models import SkuName
 
-from azure.cli.core.commands import register_cli_argument, CliArgumentType
+from azure.cli.core.commands import register_cli_argument, CliArgumentType, VersionConstraint
+from azure.cli.core.profiles import ResourceType
 from azure.cli.core.commands.validators import \
     (get_default_location_from_resource_group, validate_file_or_dict)
 from azure.cli.core.commands.parameters import \
@@ -260,6 +261,11 @@ def get_vm_size_completion_list(prefix, action, parsed_args, **kwargs):  # pylin
 register_cli_argument('vmss create', 'upgrade_policy_mode', help=None, **enum_choice_list(UpgradeMode))
 register_cli_argument('vmss create', 'vm_sku', help='Size of VMs in the scale set.  See https://azure.microsoft.com/en-us/pricing/details/virtual-machines/ for size info.')
 
+with VersionConstraint(ResourceType.MGMT_COMPUTE, min_api='2017-03-30') as c:
+    c.register_cli_argument('vmss create', 'public_ip_per_vm', action='store_true', help="Each VM instance will have a public ip", arg_group='Network')
+    c.register_cli_argument('vmss create', 'vm_domain_name', help="domain name of VM instances, once configured, the FQDN is 'vm<vm-index>.<vm-domain-name>.<..rest..>'", arg_group='Network')
+    c.register_cli_argument('vmss create', 'dns_servers', nargs='+', help="space separated IP addresses of DNS servers, e.g. 10.0.0.5 10.0.0.6", arg_group='Network')
+
 register_cli_argument('vm encryption', 'volume_type', help='Type of volume that the encryption operation is performed on', **enum_choice_list(['DATA', 'OS', 'ALL']))
 register_cli_argument('vm encryption', 'force', action='store_true', help='continue with encryption operations regardless of the warnings')
 register_cli_argument('vm encryption', 'disk_encryption_keyvault', validator=process_disk_encryption_namespace)

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_template_builder.py

@@ -618,6 +618,7 @@ def build_vmss_storage_account_pool_resource(loop_name, location, tags, storage_
 # pylint: disable=too-many-locals
 def build_vmss_resource(name, naming_prefix, location, tags, overprovision, upgrade_policy_mode,
                         vm_sku, instance_count, ip_config_name, nic_name, subnet_id,
+                        public_ip_per_vm, vm_domain_name, dns_servers,
                         admin_username, authentication_type,
                         storage_profile, os_disk_name,
                         os_caching, data_caching, storage_sku, data_disk_sizes_gb,
@@ -635,6 +636,18 @@ def build_vmss_resource(name, naming_prefix, location, tags, overprovision, upgr
         }
     }
 
+    if public_ip_per_vm:
+        ip_configuration['properties']['publicipaddressconfiguration'] = {
+            'name': 'instancepublicip',
+            'properties': {
+                'idleTimeoutInMinutes': 10,
+            }
+        }
+        if vm_domain_name:
+            ip_configuration['properties']['publicipaddressconfiguration']['properties']['dnsSettings'] = {
+                'domainNameLabel': vm_domain_name
+            }
+
     if backend_address_pool_id:
         key = 'loadBalancerBackendAddressPools' if 'loadBalancers' in backend_address_pool_id \
             else 'ApplicationGatewayBackendAddressPools'
@@ -717,6 +730,16 @@ def build_vmss_resource(name, naming_prefix, location, tags, overprovision, upgr
     if single_placement_group is None:  # this should never happen, but just in case
         raise ValueError('single_placement_group was not set by validators')
     # Build VMSS
+    nic_config = {
+        'name': nic_name,
+        'properties': {
+            'primary': 'true',
+            'ipConfigurations': [ip_configuration]
+        }
+    }
+    if dns_servers:
+        nic_config['dnsServers'] = dns_servers
+
     vmss_properties = {
         'overprovision': overprovision,
         'upgradePolicy': {
@@ -726,13 +749,7 @@ def build_vmss_resource(name, naming_prefix, location, tags, overprovision, upgr
             'storageProfile': storage_properties,
             'osProfile': os_profile,
             'networkProfile': {
-                'networkInterfaceConfigurations': [{
-                    'name': nic_name,
-                    'properties': {
-                        'primary': 'true',
-                        'ipConfigurations': [ip_configuration]
-                    }
-                }]
+                'networkInterfaceConfigurations': [nic_config]
             }
         }
     }

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/_validators.py

@@ -830,6 +830,10 @@ def process_vmss_create_namespace(namespace):
     _validate_vmss_create_public_ip(namespace)
     _validate_vm_vmss_create_auth(namespace)
 
+    if not namespace.public_ip_per_vm and namespace.vm_domain_name:
+        raise CLIError('Usage error: --vm-domain-name can only be used when --public-ip-per-vm is enabled')
+
+
 # endregion
 
 # region disk, snapshot, image validators

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/commands.py

@@ -10,7 +10,7 @@
                                                           cf_vm_ext_image, cf_vm_image, cf_usage,
                                                           cf_vmss, cf_vmss_vm,
                                                           cf_vm_sizes, cf_disks, cf_snapshots,
-                                                          cf_images)
+                                                          cf_images, cf_public_ip_addresses)
 from azure.cli.core.commands import DeploymentOutputLongRunningOperation, cli_command
 from azure.cli.core.commands.arm import \
     (cli_generic_update_command, cli_generic_wait_command, handle_long_running_operation_exception,
@@ -242,11 +242,12 @@ def transform_vm_list(vm_list):
 cli_command(__name__, 'vmss reimage', custom_path.format('reimage_vmss'), no_wait_param='no_wait')
 cli_command(__name__, 'vmss scale', custom_path.format('scale_vmss'), no_wait_param='no_wait')
 cli_command(__name__, 'vmss list-instance-connection-info', custom_path.format('list_vmss_instance_connection_info'))
+if supported_api_version(ResourceType.MGMT_COMPUTE, min_api='2017-03-30'):
+    cli_command(__name__, 'vmss list-instance-public-ips', 'azure.mgmt.network.operations.public_ip_addresses_operations#PublicIPAddressesOperations.list_virtual_machine_scale_set_public_ip_addresses', cf_public_ip_addresses)
 
 # VM Size
 cli_command(__name__, 'vm list-sizes', mgmt_path.format('virtual_machine_sizes_operations', 'VirtualMachineSizesOperations', 'list'), cf_vm_sizes)
 
-
 if supported_api_version(ResourceType.MGMT_COMPUTE, min_api='2016-04-30-preview'):
     # VM Disk
     op_var = 'disks_operations'

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/custom.py

@@ -1700,6 +1700,7 @@ def create_vmss(vmss_name, resource_group_name, image,
                 backend_pool_name=None, nat_pool_name=None, backend_port=None,
                 public_ip_address=None, public_ip_address_allocation='dynamic',
                 public_ip_address_dns_name=None,
+                public_ip_per_vm=False, vm_domain_name=None, dns_servers=None,
                 os_caching=DefaultStr(CachingTypes.read_write.value), data_caching=None,
                 storage_container_name=DefaultStr('vhds'), storage_sku=None,
                 os_type=None, os_disk_name=None,
@@ -1882,8 +1883,9 @@ def create_vmss(vmss_name, resource_group_name, image,
     vmss_resource = build_vmss_resource(vmss_name, naming_prefix, location, tags,
                                         not disable_overprovision, upgrade_policy_mode,
                                         vm_sku, instance_count,
-                                        ip_config_name, nic_name, subnet_id, admin_username,
-                                        authentication_type, storage_profile,
+                                        ip_config_name, nic_name, subnet_id,
+                                        public_ip_per_vm, vm_domain_name, dns_servers,
+                                        admin_username, authentication_type, storage_profile,
                                         os_disk_name, os_caching, data_caching,
                                         storage_sku, data_disk_sizes_gb, image_data_disks,
                                         os_type, image, admin_password,