Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions eng/mgmt/mgmtmetadata/hdinsight_resource-manager.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ Commencing code generation
Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/hdinsight/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=D:\source\azure-sdk-for-net\sdk
2020-08-13 08:20:32 UTC
2020-10-16 05:31:30 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: afbd723252e704e2763de2ec324a8263d67e8867
Commit: 85a3955a1e1f4576a501db17e0d7b7998fe9cfdb
AutoRest information
Requested version: v2
Bootstrapper version: autorest@2.0.4413

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
<PackageId>Microsoft.Azure.Management.HDInsight</PackageId>
<Description>Azure HDInsight Management SDK Library</Description>
<AssemblyName>Microsoft.Azure.Management.HDInsight</AssemblyName>
<Version>5.6.0</Version>
<Version>6.0.0</Version>
<PackageTags>Microsoft Azure HDInsight Management;HDInsight;HDInsight Management</PackageTags>
<PackageReleaseNotes>
<![CDATA[
This release supports one feature:
- Support to create cluster with encryption at host.
This release contains the bellow change:
- Remove previous NetworkSettings property
- Support customer to create cluster with relay outbound and private link feature
- Support customer to get the cluster id
]]>
</PackageReleaseNotes>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

[assembly: AssemblyTitle("Microsoft Azure HDInsight Management Library")]
[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure HDInsight.")]
[assembly: AssemblyVersion("5.0.0.0")]
[assembly: AssemblyFileVersion("5.6.0.0")]
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")]

[assembly: InternalsVisibleTo("Microsoft.Azure.Management.HDInsight.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

Original file line number Diff line number Diff line change
Expand Up @@ -656,24 +656,23 @@ public void TestCreateClusterWithTLS12()
}

[Fact]
public void TestCreateClusterWithPrivateLink()
public void TestCreateClusterWithOutboundAndPrivateLink()
{
TestInitialize();

string clusterName = TestUtilities.GenerateName("hdisdk-privatelink");
string clusterName = TestUtilities.GenerateName("hdisdk-outboundpl");
var createParams = CommonData.PrepareClusterCreateParamsForWasb();
createParams.Location = "South Central US";

var networkSetting = new NetworkSettings(PublicNetworkAccess.OutboundOnly, OutboundOnlyPublicNetworkAccessType.PublicLoadBalancer);
createParams.Properties.NetworkSettings = networkSetting;
var networkProperties = new NetworkProperties(ResourceProviderConnection.Outbound, PrivateLink.Enabled);
createParams.Properties.NetworkProperties = networkProperties;

//Create Virturl Network
string virtualNetworkName= TestUtilities.GenerateName("hdisdkvnet");
var vnet = CreateVnetForPrivateLink(createParams.Location, virtualNetworkName);
string vnetId = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/fakevnet";
string subnetId = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/fakevnet/subnets/default";

foreach (var role in createParams.Properties.ComputeProfile.Roles)
{
role.VirtualNetworkProfile = new VirtualNetworkProfile(vnet.Id, vnet.Subnets.First().Id);
role.VirtualNetworkProfile = new VirtualNetworkProfile(vnetId, subnetId);
}

var cluster = HDInsightClient.Clusters.Create(CommonData.ResourceGroupName, clusterName, createParams);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,19 @@ internal Identity CreateMsi(string msiName)
return HDInsightManagementHelper.CreateManagedIdentity(CommonData.ResourceGroupName, msiName, CommonData.Location);
}

internal VirtualNetwork CreateVnetForPrivateLink(string location, string virtualNetworkName, string subnetName = "default")
internal VirtualNetwork CreateVnetForPrivateLink(string location, string virtualNetworkName, NetworkSecurityGroup networkSecurityGroup=null, string subnetName = "default")
{
return HDInsightManagementHelper.CreateVirtualNetworkWithSubnet(CommonData.ResourceGroupName, location, virtualNetworkName, subnetName, false, false);
return HDInsightManagementHelper.CreateVirtualNetworkWithSubnet(CommonData.ResourceGroupName, location, virtualNetworkName, subnetName, networkSecurityGroup, false, false);
}

internal NetworkSecurityGroup CreateNetworkSecurityGroup(string location, string networkSecurityGroupName)
{
NetworkSecurityGroup networkSecurityGroup = new NetworkSecurityGroup()
{
Location = location
};

return HDInsightManagementHelper.CreateNetworkSecurityGroup(CommonData.ResourceGroupName, networkSecurityGroupName, networkSecurityGroup);
}

#region Dispose
Expand Down
Loading