Skip to content

Expose new SKUs for zone-redundant VirtualNetworkGateways #6539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
praries880 merged 19 commits into from
Jun 27, 2018
Merged

Expose new SKUs for zone-redundant VirtualNetworkGateways #6539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6ce018e
New VPN Protocol from 2018-06-01 REST specs
henry416 Jun 7, 2018
8e2755a
session test
henry416 Jun 18, 2018
6da8104
Generated Localfeed nuget
henry416 Jun 20, 2018
22067f0
netcore fix and test record update
henry416 Jun 21, 2018
edde919
actual netcore build fix
henry416 Jun 21, 2018
b03badf
test project netcore
henry416 Jun 21, 2018
bf8ce38
build fix as per CR
henry416 Jun 22, 2018
d83bff6
test case pickup fix
henry416 Jun 22, 2018
13ba600
cred fix
henry416 Jun 22, 2018
ced0573
proper suppression
henry416 Jun 23, 2018
421de37
Merge pull request #6481 from henry416/Network
praries880 Jun 25, 2018
bac64ff
Updated SDK version
MikhailTryakhov Jun 25, 2018
cc9a5ac
fixed dll version
MikhailTryakhov Jun 26, 2018
0e9c8d2
fixed package version in related projects
MikhailTryakhov Jun 26, 2018
6c17bfa
Updated Network SDK references
anton-evseev Jun 26, 2018
6d17e6d
Fixed Network SDK version
anton-evseev Jun 26, 2018
2b9a513
Merge pull request #6532 from MikhailTryakhov/Network-2018-06-01
vladimir-shcherbakov Jun 26, 2018
673421c
Expose new SKUs for zone-redundant VirtualNetworkGateways
ritwikbasu Jun 26, 2018
abc5f08
Merge branch 'release-2018-06-29' of https://github.com/Azure/azure-p…
ritwikbasu Jun 27, 2018
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
2 changes: 1 addition & 1 deletion src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="20.0.0" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1-alpha" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
<PackageReference Include="Moq" Version="4.7.145" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<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')" />
<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')" />
Expand Down Expand Up @@ -67,7 +67,7 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.20.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Compute/Commands.Compute.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
Expand All @@ -8,7 +8,7 @@
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Compute" version="20.0.0" targetFramework="net452" />
<package id="Microsoft.Azure.Management.KeyVault" version="2.3.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Network" version="19.1.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net40" />
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="2.2.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
<PackageReference Include="Moq" Version="4.2.1510.2205" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Dns/Commands.Dns.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Dns" version="2.2.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Network" version="19.1.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.ResourceManager" version="1.1.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
<PackageReference Include="Microsoft.Azure.Insights" Version="0.15.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="20.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Redis" Version="3.1.1-preview" />
Expand Down
9 changes: 6 additions & 3 deletions src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.OperationalInsights, Version=0.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.OperationalInsights.0.18.0-preview\lib\net45\Microsoft.Azure.Management.OperationalInsights.dll</HintPath>
Expand Down Expand Up @@ -570,7 +570,7 @@
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\TestVirtualNetworkGatewayP2SAndSKU.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests\TestVirtualNetworkGatewayVpnDeviceConfigurationScripts.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -628,12 +628,15 @@
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayIkeV2Test.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayOpenVPNTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayRouteApiTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayVpnCustomIpsecPolicySetTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</None>
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestResourceNavigationLinksOnSubnetCRUD.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
8 changes: 8 additions & 0 deletions ...ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ public void VirtualNetworkGatewayIkeV2Test()
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayIkeV2");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, Category.brooklynft)]
public void VirtualNetworkGatewayOpenVPNTest()
{
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayOpenVPN");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, Category.brooklynft)]
Expand Down
56 changes: 55 additions & 1 deletion ...esourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ function Test-VirtualNetworkGatewayBgpRouteApi

<#
.SYNOPSIS
Virtual network gateway BGP route API test
Virtual network gateway P2S API test
#>
function Test-VirtualNetworkGatewayIkeV2
{
Expand Down Expand Up @@ -619,6 +619,60 @@ function Test-VirtualNetworkGatewayIkeV2
}
}

<#
.SYNOPSIS
Virtual network gateway P2S OpenVPN API test
#>
function Test-VirtualNetworkGatewayOpenVPN
{
# Setup
$rgname = Get-ResourceGroupName
$rname = Get-ResourceName
$domainNameLabel = Get-ResourceName
$vnetName = Get-ResourceName
$publicIpName = Get-ResourceName
$vnetGatewayConfigName = Get-ResourceName
$rglocation = Get-ProviderLocation ResourceManagement
$resourceTypeParent = "Microsoft.Network/virtualNetworkGateways"
$location = Get-ProviderLocation $resourceTypeParent

try
{
# Create the resource group
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }

# create the client root cert
$clientRootCertName = "BrkLiteTestMSFTRootCA.cer"
#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
$samplePublicCertData = "MIIDUzCCAj+gAwIBAgIQRggGmrpGj4pCblTanQRNUjAJBgUrDgMCHQUAMDQxEjAQBgNVBAoTCU1pY3Jvc29mdDEeMBwGA1UEAxMVQnJrIExpdGUgVGVzdCBSb290IENBMB4XDTEzMDExOTAwMjQxOFoXDTIxMDExOTAwMjQxN1owNDESMBAGA1UEChMJTWljcm9zb2Z0MR4wHAYDVQQDExVCcmsgTGl0ZSBUZXN0IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7SmE+iPULK0Rs7mQBO/6a6B6/G9BaMxHgDGzAmSG0Qsyt5e08aqgFnPdkMl3zRJw3lPKGha/JCvHRNrO8UpeAfc4IXWaqxx2iBipHjwmHPHh7+VB8lU0EJcUe7WBAI2n/sgfCwc+xKtuyRVlOhT6qw/nAi8e5don/iHPU6q7GCcnqoqtceQ/pJ8m66cvAnxwJlBFOTninhb2VjtvOfMQ07zPP+ZuYDPxvX5v3nd6yDa98yW4dZPuiGO2s6zJAfOPT2BrtyvLekItnSgAw3U5C0bOb+8XVKaDZQXbGEtOw6NZvD4L2yLd47nGkN2QXloiPLGyetrj3Z2pZYcrZBo8hAgMBAAGjaTBnMGUGA1UdAQReMFyAEOncRAPNcvJDoe4WP/gH2U+hNjA0MRIwEAYDVQQKEwlNaWNyb3NvZnQxHjAcBgNVBAMTFUJyayBMaXRlIFRlc3QgUm9vdCBDQYIQRggGmrpGj4pCblTanQRNUjAJBgUrDgMCHQUAA4IBAQCGyHhMdygS0g2tEUtRT4KFM+qqUY5HBpbIXNAav1a1dmXpHQCziuuxxzu3iq4XwnWUF1OabdDE2cpxNDOWxSsIxfEBf9ifaoz/O1ToJ0K757q2Rm2NWqQ7bNN8ArhvkNWa95S9gk9ZHZLUcjqanf0F8taJCYgzcbUSp+VBe9DcN89sJpYvfiBiAsMVqGPc/fHJgTScK+8QYrTRMubtFmXHbzBSO/KTAP5rBTxse88EGjK5F8wcedvge2Ksk6XjL3sZ19+Oj8KTQ72wihN900p1WQldHrrnbixSpmHBXbHr9U0NQigrJp5NphfuU5j81C8ixvfUdwyLmTv7rNA7GTAD";
$rootCert = New-AzureRmVpnClientRootCertificate -Name $clientRootCertName -PublicCertData $samplePublicCertData

# Create the Virtual Network
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.0.0.0/24
$vnet = New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
$vnet = Get-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname
$subnet = Get-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet

# Create the IP config
$publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
$vnetIpConfig = New-AzureRmVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName -PublicIpAddress $publicip -Subnet $subnet

# Create & Get OpenVPN virtualnetworkgateway
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
$actual = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
Assert-AreEqual "VpnGw1" $actual.Sku.Tier
$protocols = $actual.VpnClientConfiguration.VpnClientProtocols
Assert-AreEqual 1 @($protocols).Count
Assert-AreEqual "OpenVPN" $protocols[0]
Assert-AreEqual "201.169.0.0/16" $actual.VpnClientConfiguration.VpnClientAddressPool.AddressPrefixes
}
finally
{
# Cleanup
Clean-ResourceGroup $rgname
}
}

<#
.SYNOPSIS
Virtual network gateway tests
Expand Down
11,016 changes: 11,016 additions & 0 deletions ...twork.Test.ScenarioTests.VirtualNetworkGatewayTests/VirtualNetworkGatewayOpenVPNTest.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<package id="Microsoft.Azure.Insights" version="0.13.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Compute" version="20.0.0" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Network" version="19.1.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.OperationalInsights" version="0.18.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Redis" version="3.1.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.ResourceManager" version="1.6.0-preview" targetFramework="net452" />
Expand Down
1 change: 1 addition & 0 deletions src/ResourceManager/Network/Commands.Network/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
--->

## Current Release
* Expose new Skus for Zone-Redundant VirtualNetworkGateways
* Fixed formatting of OutputType in help files
* Added new commands for feature: ExpressRoute Partner APIs via ARM
- Added Get-AzureRmExpressRouteCrossConnection
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<ItemGroup>
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network/Commands.Network.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
9 changes: 8 additions & 1 deletion ...er/Network/Commands.Network/VirtualNetworkGateway/NewAzureVirtualNetworkGatewayCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@ public class NewAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
MNM.VirtualNetworkGatewaySkuTier.VpnGw1,
MNM.VirtualNetworkGatewaySkuTier.VpnGw2,
MNM.VirtualNetworkGatewaySkuTier.VpnGw3,
MNM.VirtualNetworkGatewaySkuTier.VpnGw1AZ,
MNM.VirtualNetworkGatewaySkuTier.VpnGw2AZ,
MNM.VirtualNetworkGatewaySkuTier.VpnGw3AZ,
MNM.VirtualNetworkGatewaySkuTier.ErGw1AZ,
MNM.VirtualNetworkGatewaySkuTier.ErGw2AZ,
MNM.VirtualNetworkGatewaySkuTier.ErGw3AZ,
IgnoreCase = true)]
public string GatewaySku { get; set; }

Expand All @@ -149,7 +155,8 @@ public class NewAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
HelpMessage = "The list of P2S VPN client tunneling protocols")]
[ValidateSet(
MNM.VpnClientProtocol.SSTP,
MNM.VpnClientProtocol.IkeV2)]
MNM.VpnClientProtocol.IkeV2,
MNM.VpnClientProtocol.OpenVPN)]
[ValidateNotNullOrEmpty]
public List<string> VpnClientProtocol { get; set; }

Expand Down
22 changes: 14 additions & 8 deletions ...Network/Commands.Network/VirtualNetworkGateway/ResizeAzureVirtualNetworkGatewayCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,20 @@ public class ResizeAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBase
ValueFromPipelineByPropertyName = true,
HelpMessage = "The gatway Sku:- Basic/Standard/HighPerformance/VpnGw1/VpnGw2/VpnGw3")]
[ValidateSet(
MNM.VirtualNetworkGatewaySkuTier.Basic,
MNM.VirtualNetworkGatewaySkuTier.Standard,
MNM.VirtualNetworkGatewaySkuTier.HighPerformance,
MNM.VirtualNetworkGatewaySkuTier.UltraPerformance,
MNM.VirtualNetworkGatewaySkuTier.VpnGw1,
MNM.VirtualNetworkGatewaySkuTier.VpnGw2,
MNM.VirtualNetworkGatewaySkuTier.VpnGw3,
IgnoreCase = true)]
MNM.VirtualNetworkGatewaySkuTier.Basic,
MNM.VirtualNetworkGatewaySkuTier.Standard,
MNM.VirtualNetworkGatewaySkuTier.HighPerformance,
MNM.VirtualNetworkGatewaySkuTier.UltraPerformance,
MNM.VirtualNetworkGatewaySkuTier.VpnGw1,
MNM.VirtualNetworkGatewaySkuTier.VpnGw2,
MNM.VirtualNetworkGatewaySkuTier.VpnGw3,
MNM.VirtualNetworkGatewaySkuTier.VpnGw1AZ,
MNM.VirtualNetworkGatewaySkuTier.VpnGw2AZ,
MNM.VirtualNetworkGatewaySkuTier.VpnGw3AZ,
MNM.VirtualNetworkGatewaySkuTier.ErGw1AZ,
MNM.VirtualNetworkGatewaySkuTier.ErGw2AZ,
MNM.VirtualNetworkGatewaySkuTier.ErGw3AZ,
IgnoreCase = true)]
public string GatewaySku { get; set; }

public override void Execute()
Expand Down
9 changes: 8 additions & 1 deletion ...Network/Commands.Network/VirtualNetworkGateway/UpdateAzureVirtualNetworkGatewayCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ public class SetAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
MNM.VirtualNetworkGatewaySkuTier.VpnGw1,
MNM.VirtualNetworkGatewaySkuTier.VpnGw2,
MNM.VirtualNetworkGatewaySkuTier.VpnGw3,
MNM.VirtualNetworkGatewaySkuTier.VpnGw1AZ,
MNM.VirtualNetworkGatewaySkuTier.VpnGw2AZ,
MNM.VirtualNetworkGatewaySkuTier.VpnGw3AZ,
MNM.VirtualNetworkGatewaySkuTier.ErGw1AZ,
MNM.VirtualNetworkGatewaySkuTier.ErGw2AZ,
MNM.VirtualNetworkGatewaySkuTier.ErGw3AZ,
IgnoreCase = true)]
public string GatewaySku { get; set; }

Expand All @@ -78,7 +84,8 @@ public class SetAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
HelpMessage = "A list of P2S VPN client tunneling protocols")]
[ValidateSet(
MNM.VpnClientProtocol.SSTP,
MNM.VpnClientProtocol.IkeV2)]
MNM.VpnClientProtocol.IkeV2,
MNM.VpnClientProtocol.OpenVPN)]
[ValidateNotNullOrEmpty]
public List<string> VpnClientProtocol { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion ...sourceManager/Network/Commands.Network/help/New-AzureRmVirtualNetworkGateway.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ Accept wildcard characters: False
Type: String
Parameter Sets: (All)
Aliases:
Accepted values: Basic, Standard, HighPerformance, UltraPerformance, VpnGw1, VpnGw2, VpnGw3
Accepted values: Basic, Standard, HighPerformance, UltraPerformance, VpnGw1, VpnGw2, VpnGw3, VpnGw1AZ, VpnGw2AZ, VpnGw3AZ, ErGw1AZ, ErGw2AZ, ErGw3AZ

Required: False
Position: Named
Expand Down
Loading