[HDInsight] Support az and private link per new api20210601

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

@@ -228,12 +228,25 @@ def load_arguments(self, _):
         c.argument('enable_private_link', arg_group='Private Link', arg_type=get_three_state_flag(),
                    help='Indicate whether enable the private link or not.')
 
+        c.argument('private_link_configurations',
+                   options_list=['--private-link-config', '--private-link-configurations'],
+                   arg_group='Private Link', type=shell_safe_json_parse,
+                   completer=FilesCompleter(),
+                   help='The private link configurations when creating cluster. '
+                        'Private Link Configurations may be supplied from a file using the `@{path}` syntax '
+                        'or a JSON string. Please see https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure'
+                        '/cli/command_modules/hdinsight/tests/latest/privatelinkconfigurations.json')
+
         # compute isolation
         c.argument('enable_compute_isolation', options_list=['--enable-compute-isolation', '--compute-isolation'],
                    arg_group="Compute Isolation", arg_type=get_three_state_flag(),
                    help='Indicate whether enable compute isolation or not.')
         c.argument('host_sku', arg_group='Compute Isolation', help="The dedicated host sku of compute isolation.")
 
+        # availability zones
+        c.argument('zones', nargs='+', arg_group='Availability Zone',
+                   help="A space-delimited list of availability zones where cluster will be created.")
+
         # resize
         with self.argument_context('hdinsight resize') as c:
             c.argument('target_instance_count', options_list=['--workernode-count', '-c'],

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

@@ -2,7 +2,6 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
-
 from knack.log import get_logger
 from knack.prompting import prompt_pass, NoTTYException
 from knack.util import CLIError
@@ -38,7 +37,8 @@ def create_cluster(cmd, client, cluster_name, resource_group_name, cluster_type,
                    timezone=None, days=None, time=None, autoscale_workernode_count=None,
                    encryption_at_host=None, esp=False, idbroker=False,
                    resource_provider_connection=None, enable_private_link=None, enable_compute_isolation=None,
-                   host_sku=None, no_validation_timeout=False):
+                   host_sku=None, zones=None, private_link_configurations=None,
+                   no_validation_timeout=False):
     from .util import build_identities_info, build_virtual_network_profile, parse_domain_name, \
         get_storage_account_endpoint, validate_esp_cluster_create_params, set_vm_size
     from azure.mgmt.hdinsight.models import ClusterCreateParametersExtended, ClusterCreateProperties, OSType, \
@@ -345,32 +345,33 @@ def create_cluster(cmd, client, cluster_name, resource_group_name, cluster_type,
         else:
             disk_encryption_properties = DiskEncryptionProperties(encryption_at_host=encryption_at_host)
 
-    kafka_rest_properties = (kafka_client_group_id and kafka_client_group_name) and KafkaRestProperties(
+    kafka_rest_properties = KafkaRestProperties(
         client_group_info=ClientGroupInfo(
             group_id=kafka_client_group_id,
             group_name=kafka_client_group_name
         )
-    )
+    ) if (kafka_client_group_id and kafka_client_group_name) else None
 
-    encryption_in_transit_properties = encryption_in_transit and EncryptionInTransitProperties(
+    encryption_in_transit_properties = EncryptionInTransitProperties(
         is_encryption_in_transit_enabled=encryption_in_transit
-    )
+    ) if encryption_in_transit is True else None
 
     # relay outbound and private link
-    network_properties = (resource_provider_connection or enable_private_link) and NetworkProperties(
+    network_properties = NetworkProperties(
         resource_provider_connection=resource_provider_connection,
         private_link=PrivateLink.enabled if enable_private_link is True else PrivateLink.disabled
-    )
+    ) if (resource_provider_connection is not None or enable_private_link is not None) else None
 
     # compute isolation
-    compute_isolation_properties = enable_compute_isolation and ComputeIsolationProperties(
+    compute_isolation_properties = ComputeIsolationProperties(
         enable_compute_isolation=enable_compute_isolation,
         host_sku=host_sku
-    )
+    ) if enable_compute_isolation is True else None
 
     create_params = ClusterCreateParametersExtended(
         location=location,
         tags=tags,
+        zones=zones,
         properties=ClusterCreateProperties(
             cluster_version=cluster_version,
             os_type=OSType.linux,
@@ -392,7 +393,8 @@ def create_cluster(cmd, client, cluster_name, resource_group_name, cluster_type,
             min_supported_tls_version=minimal_tls_version,
             encryption_in_transit_properties=encryption_in_transit_properties,
             network_properties=network_properties,
-            compute_isolation_properties=compute_isolation_properties
+            compute_isolation_properties=compute_isolation_properties,
+            private_link_configurations=private_link_configurations
         ),
         identity=cluster_identity
     )

src/azure-cli/azure/cli/command_modules/hdinsight/tests/latest/customallmetastores.json

@@ -0,0 +1,38 @@
+{
+  "core-site": {},
+  "oozie-site": {
+    "oozie.service.JPAService.jdbc.url": "jdbc:sqlserver://{yoursqlserver}.database.windows.net;database={yourooziedb};encrypt=true;trustServerCertificate=true;create=false;loginTimeout=300;sendStringParametersAsUnicode=true;prepareSQL=0",
+    "oozie.service.JPAService.jdbc.username": "{yoursqlserverusername}",
+    "oozie.service.JPAService.jdbc.password": "********",
+    "oozie.service.JPAService.jdbc.driver": "com.microsoft.sqlserver.jdbc.SQLServerDriver",
+    "oozie.db.schema.name": "oozie"
+  },
+  "oozie-env": {
+    "oozie_database": "Existing MSSQL Server database with SQL authentication",
+    "oozie_database_name": "{yourooziedb}",
+    "oozie_database_type": "mssql",
+    "oozie_existing_mssql_server_database": "{yourooziedb}",
+    "oozie_existing_mssql_server_host": "{yoursqlserver}.database.windows.net",
+    "oozie_hostname": "{yoursqlserver}.database.windows.net"
+  },
+  "hive-site": {
+    "javax.jdo.option.ConnectionURL": "jdbc:sqlserver://{yoursqlserver}.database.windows.net;database={yourhivedb};encrypt=true;trustServerCertificate=true;create=false;loginTimeout=300;sendStringParametersAsUnicode=true;prepareSQL=0",
+    "javax.jdo.option.ConnectionUserName": "{yoursqlserverusername}",
+    "javax.jdo.option.ConnectionPassword": "********",
+    "javax.jdo.option.ConnectionDriverName": "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+  },
+  "hive-env": {
+    "hive_database": "Existing MSSQL Server database with SQL authentication",
+    "hive_database_name": "{yourhivedb}",
+    "hive_database_type": "mssql",
+    "hive_existing_mssql_server_database": "{yourhivedb}",
+    "hive_existing_mssql_server_host": "{yoursqlserver}.database.windows.net",
+    "hive_hostname": "{yoursqlserver}.database.windows.net"
+  },
+  "ambari-conf": {
+    "database-server": "{yoursqlserver}.database.windows.net",
+    "database-name": "{yourambaridb}",
+    "database-user-name": "{yoursqlserverusername}",
+    "database-user-password": "********"
+  }
+}

src/azure-cli/azure/cli/command_modules/hdinsight/tests/latest/privatelinkconfigurations.json

@@ -0,0 +1,21 @@
+
+[
+  {
+   "name": "private_link_config_name",
+   "properties": {
+     "groupId": "headnode",
+     "ipConfigurations": [
+       {
+         "name": "ip_config_name",
+         "properties": {
+           "primary": true,
+           "privateIPAllocationMethod": "dynamic",
+           "subnet": {
+             "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/default"
+           }
+         }
+       }
+     ]
+   }
+  }
+ ]