Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
00b9235
{Docs} Remove stale reference in README to closed issue about extensi…
dkmiller Apr 27, 2020
ab16df0
Merge remote-tracking branch 'upstream/release'
azclibot Apr 28, 2020
03436bc
Merge remote-tracking branch 'upstream/release'
azclibot Apr 30, 2020
7d98b1f
Merge remote-tracking branch 'upstream/release'
azclibot May 19, 2020
06f6ec5
Merge remote-tracking branch 'upstream/release'
azclibot Jun 2, 2020
adab2d2
Merge remote-tracking branch 'upstream/release'
azclibot Jun 23, 2020
c7b9f98
Merge remote-tracking branch 'upstream/release'
azclibot Jul 14, 2020
18e8b8d
Merge remote-tracking branch 'upstream/release'
azclibot Jul 16, 2020
1eb5074
Merge remote-tracking branch 'upstream/release'
azclibot Aug 4, 2020
cc3a159
Merge remote-tracking branch 'upstream/release' into master
azclibot Aug 6, 2020
af8f98e
Merge remote-tracking branch 'upstream/release' into master
azclibot Aug 26, 2020
0f904b9
Merge remote-tracking branch 'upstream/release' into master
azclibot Aug 28, 2020
d17a993
Merge remote-tracking branch 'upstream/release' into master
azclibot Sep 22, 2020
331b406
Merge branch 'master' of github.com:Azure/azure-cli into dev
Sep 24, 2020
c98c195
Merge branch 'dev' of github.com:Azure/azure-cli into dev
Sep 25, 2020
ee648a0
Merge branch 'dev' of github.com:Azure/azure-cli into dev
Nov 5, 2020
d2faa9f
Merge branch 'dev' of github.com:Azure/azure-cli into dev
Nov 9, 2020
64d0de4
Merge branch 'dev' of github.com:Azure/azure-cli into dev
Nov 10, 2020
7b250f5
Merge branch 'dev' of github.com:Azure/azure-cli into dev
Nov 18, 2020
03c8785
Merge branch 'dev' of github.com:Azure/azure-cli into dev
Dec 1, 2020
2f814b1
Merge branch 'dev' of github.com:Azure/azure-cli into dev
Dec 7, 2020
82ce0cc
Merge branch 'dev' of github.com:Azure/azure-cli into dev
Jan 29, 2021
c2994a2
Support compute isolation and return private ip address
Feb 1, 2021
35c8fa9
Update test case: adding the paramter --host-sku, --host-sku is not m…
Feb 2, 2021
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
5 changes: 5 additions & 0 deletions src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@
-p "HttpPassword1234!" --storage-account MyStorageAccount \\
--subnet "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/fakevnet/subnets/default" \\
--resource-provider-connection Outbound --enable-private-link
- name: Create a cluster with Compute Isolation feature.
text: |-
az hdinsight create -t spark --version 3.6 -g MyResourceGroup -n MyCluster \\
-p "HttpPassword1234!" --storage-account MyStorageAccount \\
--enable-compute-isolation --workernode-size "Standard_E8S_V3" --headnode-size "Standard_E8S_V3"
"""

helps['hdinsight list'] = """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,12 @@ 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.')

# 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.")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it an enum argument?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it an enum argument?

It is a string.


# resize
with self.argument_context('hdinsight resize') as c:
c.argument('target_instance_count', options_list=['--workernode-count', '-c'],
Expand Down
15 changes: 11 additions & 4 deletions src/azure-cli/azure/cli/command_modules/hdinsight/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ def create_cluster(cmd, client, cluster_name, resource_group_name, cluster_type,
autoscale_type=None, autoscale_min_workernode_count=None, autoscale_max_workernode_count=None,
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,
no_validation_timeout=False):
resource_provider_connection=None, enable_private_link=None, enable_compute_isolation=None,
host_sku=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
from azure.mgmt.hdinsight.models import ClusterCreateParametersExtended, ClusterCreateProperties, OSType, \
Expand All @@ -46,7 +46,7 @@ def create_cluster(cmd, client, cluster_name, resource_group_name, cluster_type,
DirectoryType, DiskEncryptionProperties, Tier, SshProfile, SshPublicKey, \
KafkaRestProperties, ClientGroupInfo, EncryptionInTransitProperties, \
Autoscale, AutoscaleCapacity, AutoscaleRecurrence, AutoscaleSchedule, AutoscaleTimeAndCapacity, \
NetworkProperties, PrivateLink
NetworkProperties, PrivateLink, ComputeIsolationProperties

validate_esp_cluster_create_params(esp, cluster_name, resource_group_name, cluster_type,
subnet, domain, cluster_admin_account, assign_identity,
Expand Down Expand Up @@ -350,6 +350,12 @@ def create_cluster(cmd, client, cluster_name, resource_group_name, cluster_type,
private_link=PrivateLink.enabled if enable_private_link is True else PrivateLink.disabled
)

# compute isolation
compute_isolation_properties = enable_compute_isolation and ComputeIsolationProperties(
enable_compute_isolation=enable_compute_isolation,
host_sku=host_sku
)

create_params = ClusterCreateParametersExtended(
location=location,
tags=tags,
Expand All @@ -373,7 +379,8 @@ def create_cluster(cmd, client, cluster_name, resource_group_name, cluster_type,
kafka_rest_properties=kafka_rest_properties,
min_supported_tls_version=minimal_tls_version,
encryption_in_transit_properties=encryption_in_transit_properties,
network_properties=network_properties
network_properties=network_properties,
compute_isolation_properties=compute_isolation_properties
),
identity=cluster_identity
)
Expand Down
Loading