Skip to content

Commit 7258a45

Browse files
praries880praries880
authored
Merge pull request #6539 from ritwikbasu/Network-2018-06-01
Expose new SKUs for zone-redundant VirtualNetworkGateways
2 parents f97a904 + abc5f08 commit 7258a45

31 files changed

+11155
-41
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
3030
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="20.0.0" />
3131
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1-alpha" />
32-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
32+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
3333
<PackageReference Include="Moq" Version="4.7.145" />
3434
</ItemGroup>
3535

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
44
<Import Project="..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
@@ -67,7 +67,7 @@
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.20.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="20.0.0" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.KeyVault" version="2.3.0-preview" targetFramework="net452" />
11-
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.Management.Network" version="19.1.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net40" />
1414
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<ItemGroup>
2929
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="2.2.0-preview" />
30-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
30+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
3131
<PackageReference Include="Moq" Version="4.2.1510.2205" />
3232
</ItemGroup>
3333

‎src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Dns/Commands.Dns.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Dns" version="2.2.0-preview" targetFramework="net452" />
9-
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
9+
<package id="Microsoft.Azure.Management.Network" version="19.1.0-preview" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.ResourceManager" version="1.1.1-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<ItemGroup>
2929
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
30-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
30+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
3131
<PackageReference Include="Microsoft.Azure.Insights" Version="0.15.0-preview" />
3232
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="20.0.0" />
3333
<PackageReference Include="Microsoft.Azure.Management.Redis" Version="3.1.1-preview" />

‎src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.OperationalInsights, Version=0.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<HintPath>..\..\..\packages\Microsoft.Azure.Management.OperationalInsights.0.18.0-preview\lib\net45\Microsoft.Azure.Management.OperationalInsights.dll</HintPath>
@@ -570,7 +570,7 @@
570570
</None>
571571
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\TestVirtualNetworkGatewayP2SAndSKU.json">
572572
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
573-
</None>
573+
</None>
574574
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests\TestVirtualNetworkGatewayVpnDeviceConfigurationScripts.json">
575575
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
576576
</None>
@@ -628,12 +628,15 @@
628628
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayIkeV2Test.json">
629629
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
630630
</None>
631+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayOpenVPNTest.json">
632+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
633+
</None>
631634
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayRouteApiTest.json">
632635
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
633636
</None>
634637
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayVpnCustomIpsecPolicySetTest.json">
635638
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
636-
</None>
639+
</None>
637640
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestResourceNavigationLinksOnSubnetCRUD.json">
638641
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
639642
</None>

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@ public void VirtualNetworkGatewayIkeV2Test()
9292
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayIkeV2");
9393
}
9494

95+
[Fact]
96+
[Trait(Category.AcceptanceType, Category.CheckIn)]
97+
[Trait(Category.Owner, Category.brooklynft)]
98+
public void VirtualNetworkGatewayOpenVPNTest()
99+
{
100+
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayOpenVPN");
101+
}
102+
95103
[Fact]
96104
[Trait(Category.AcceptanceType, Category.CheckIn)]
97105
[Trait(Category.Owner, Category.brooklynft)]

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.ps1

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ function Test-VirtualNetworkGatewayBgpRouteApi
559559

560560
<#
561561
.SYNOPSIS
562-
Virtual network gateway BGP route API test
562+
Virtual network gateway P2S API test
563563
#>
564564
function Test-VirtualNetworkGatewayIkeV2
565565
{
@@ -619,6 +619,60 @@ function Test-VirtualNetworkGatewayIkeV2
619619
}
620620
}
621621

622+
<#
623+
.SYNOPSIS
624+
Virtual network gateway P2S OpenVPN API test
625+
#>
626+
function Test-VirtualNetworkGatewayOpenVPN
627+
{
628+
# Setup
629+
$rgname = Get-ResourceGroupName
630+
$rname = Get-ResourceName
631+
$domainNameLabel = Get-ResourceName
632+
$vnetName = Get-ResourceName
633+
$publicIpName = Get-ResourceName
634+
$vnetGatewayConfigName = Get-ResourceName
635+
$rglocation = Get-ProviderLocation ResourceManagement
636+
$resourceTypeParent = "Microsoft.Network/virtualNetworkGateways"
637+
$location = Get-ProviderLocation $resourceTypeParent
638+
639+
try
640+
{
641+
# Create the resource group
642+
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }
643+
644+
# create the client root cert
645+
$clientRootCertName = "BrkLiteTestMSFTRootCA.cer"
646+
#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
647+
$samplePublicCertData = "MIIDUzCCAj+gAwIBAgIQRggGmrpGj4pCblTanQRNUjAJBgUrDgMCHQUAMDQxEjAQBgNVBAoTCU1pY3Jvc29mdDEeMBwGA1UEAxMVQnJrIExpdGUgVGVzdCBSb290IENBMB4XDTEzMDExOTAwMjQxOFoXDTIxMDExOTAwMjQxN1owNDESMBAGA1UEChMJTWljcm9zb2Z0MR4wHAYDVQQDExVCcmsgTGl0ZSBUZXN0IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7SmE+iPULK0Rs7mQBO/6a6B6/G9BaMxHgDGzAmSG0Qsyt5e08aqgFnPdkMl3zRJw3lPKGha/JCvHRNrO8UpeAfc4IXWaqxx2iBipHjwmHPHh7+VB8lU0EJcUe7WBAI2n/sgfCwc+xKtuyRVlOhT6qw/nAi8e5don/iHPU6q7GCcnqoqtceQ/pJ8m66cvAnxwJlBFOTninhb2VjtvOfMQ07zPP+ZuYDPxvX5v3nd6yDa98yW4dZPuiGO2s6zJAfOPT2BrtyvLekItnSgAw3U5C0bOb+8XVKaDZQXbGEtOw6NZvD4L2yLd47nGkN2QXloiPLGyetrj3Z2pZYcrZBo8hAgMBAAGjaTBnMGUGA1UdAQReMFyAEOncRAPNcvJDoe4WP/gH2U+hNjA0MRIwEAYDVQQKEwlNaWNyb3NvZnQxHjAcBgNVBAMTFUJyayBMaXRlIFRlc3QgUm9vdCBDQYIQRggGmrpGj4pCblTanQRNUjAJBgUrDgMCHQUAA4IBAQCGyHhMdygS0g2tEUtRT4KFM+qqUY5HBpbIXNAav1a1dmXpHQCziuuxxzu3iq4XwnWUF1OabdDE2cpxNDOWxSsIxfEBf9ifaoz/O1ToJ0K757q2Rm2NWqQ7bNN8ArhvkNWa95S9gk9ZHZLUcjqanf0F8taJCYgzcbUSp+VBe9DcN89sJpYvfiBiAsMVqGPc/fHJgTScK+8QYrTRMubtFmXHbzBSO/KTAP5rBTxse88EGjK5F8wcedvge2Ksk6XjL3sZ19+Oj8KTQ72wihN900p1WQldHrrnbixSpmHBXbHr9U0NQigrJp5NphfuU5j81C8ixvfUdwyLmTv7rNA7GTAD";
648+
$rootCert = New-AzureRmVpnClientRootCertificate -Name $clientRootCertName -PublicCertData $samplePublicCertData
649+
650+
# Create the Virtual Network
651+
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.0.0.0/24
652+
$vnet = New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
653+
$vnet = Get-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname
654+
$subnet = Get-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet
655+
656+
# Create the IP config
657+
$publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
658+
$vnetIpConfig = New-AzureRmVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName -PublicIpAddress $publicip -Subnet $subnet
659+
660+
# Create & Get OpenVPN virtualnetworkgateway
661+
New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType Vpn -VpnType RouteBased -EnableBgp $false -GatewaySku VpnGw1 -VpnClientAddressPool 201.169.0.0/16 -VpnClientRootCertificates $rootCert -VpnClientProtocol OpenVPN
662+
$actual = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
663+
Assert-AreEqual "VpnGw1" $actual.Sku.Tier
664+
$protocols = $actual.VpnClientConfiguration.VpnClientProtocols
665+
Assert-AreEqual 1 @($protocols).Count
666+
Assert-AreEqual "OpenVPN" $protocols[0]
667+
Assert-AreEqual "201.169.0.0/16" $actual.VpnClientConfiguration.VpnClientAddressPool.AddressPrefixes
668+
}
669+
finally
670+
{
671+
# Cleanup
672+
Clean-ResourceGroup $rgname
673+
}
674+
}
675+
622676
<#
623677
.SYNOPSIS
624678
Virtual network gateway tests

0 commit comments

Comments
 (0)