Skip to content

Commit 0295f92

Browse files
markcowlmarkcowl
authored
Merge pull request #4039 from ritwikbasu/ritwikbpreview
Ritwikbpreview - Expose new SKUs for VPN gateways
2 parents 3bd30e6 + dd5eb8e commit 0295f92

15 files changed

+35
-37
lines changed

‎src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<Private>True</Private>
7373
</Reference>
7474
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
75+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
7676
<Private>True</Private>
7777
</Reference>
7878
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/Common/Commands.Common.Authentication/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
99
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1010
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
11-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net45" />
11+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
1212
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net45" />
1313
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.9-preview" targetFramework="net45" />
1414
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
15-
</packages>
15+
</packages>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<Private>True</Private>
104104
</Reference>
105105
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
106+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
107107
<Private>True</Private>
108108
</Reference>
109109
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net45" />
1919
<package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net45" />
2020
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
21-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net45" />
21+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
2222
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net45" />
2323
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2424
<package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net45" />

‎src/ResourceManager/Network/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Added new GatewaySku options for VirtualNetworkGateways
22+
- VpnGw1, VpnGw2, VpnGw3 are the new Skus added for Vpn gateways
2123

2224
## Version 4.0.0
2325
* Added Test-AzureRmNetworkWatcherConnectivity cmdlet

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
107107
</Reference>
108108
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
109+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
110110
<Private>True</Private>
111111
</Reference>
112112
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
2121
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
2222
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
23-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net45" />
23+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
2424
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net45" />
2525
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.2" targetFramework="net45" />
2626
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
9191
</Reference>
9292
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
93+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
9494
<Private>True</Private>
9595
</Reference>
9696
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/NewAzureVirtualNetworkGatewayCommand.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,15 @@ public class NewAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
9191
[Parameter(
9292
Mandatory = false,
9393
ValueFromPipelineByPropertyName = true,
94-
HelpMessage = "The type of the Vpn:PolicyBased/RouteBased")]
94+
HelpMessage = "The Gateway Sku Tier")]
9595
[ValidateSet(
9696
MNM.VirtualNetworkGatewaySkuTier.Basic,
9797
MNM.VirtualNetworkGatewaySkuTier.Standard,
9898
MNM.VirtualNetworkGatewaySkuTier.HighPerformance,
9999
MNM.VirtualNetworkGatewaySkuTier.UltraPerformance,
100+
MNM.VirtualNetworkGatewaySkuTier.VpnGw1,
101+
MNM.VirtualNetworkGatewaySkuTier.VpnGw2,
102+
MNM.VirtualNetworkGatewaySkuTier.VpnGw3,
100103
IgnoreCase = true)]
101104
public string GatewaySku { get; set; }
102105

@@ -201,12 +204,12 @@ private PSVirtualNetworkGateway CreateVirtualNetworkGateway()
201204
}
202205
else
203206
{
204-
// If gateway sku param value is not passed, set gateway sku to Standard if VpnType is RouteBased and Basic if VpnType is PolicyBased
207+
// If gateway sku param value is not passed, set gateway sku to VpnGw1 if VpnType is RouteBased and Basic if VpnType is PolicyBased
205208
if (this.VpnType != null && this.VpnType.Equals(MNM.VpnType.RouteBased))
206209
{
207210
vnetGateway.Sku = new PSVirtualNetworkGatewaySku();
208-
vnetGateway.Sku.Tier = MNM.VirtualNetworkGatewaySkuTier.Standard;
209-
vnetGateway.Sku.Name = MNM.VirtualNetworkGatewaySkuTier.Standard;
211+
vnetGateway.Sku.Tier = MNM.VirtualNetworkGatewaySkuTier.VpnGw1;
212+
vnetGateway.Sku.Name = MNM.VirtualNetworkGatewaySkuTier.VpnGw1;
210213
}
211214
else
212215
{
@@ -216,11 +219,6 @@ private PSVirtualNetworkGateway CreateVirtualNetworkGateway()
216219
}
217220
}
218221

219-
if (this.EnableActiveActiveFeature.IsPresent && !vnetGateway.Sku.Tier.Equals(MNM.VirtualNetworkGatewaySkuTier.HighPerformance))
220-
{
221-
throw new ArgumentException("Virtual Network Gateway Sku should be " + MNM.VirtualNetworkGatewaySkuTier.HighPerformance + " when Active-Active feature flag is set to True.");
222-
}
223-
224222
if (this.EnableActiveActiveFeature.IsPresent && !this.VpnType.Equals(MNM.VpnType.RouteBased))
225223
{
226224
throw new ArgumentException("Virtual Network Gateway VpnType should be " + MNM.VpnType.RouteBased + " when Active-Active feature flag is set to True.");

‎src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/ResizeAzureVirtualNetworkGatewayCommand.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,15 @@ public class ResizeAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBase
3535
[Parameter(
3636
Mandatory = true,
3737
ValueFromPipelineByPropertyName = true,
38-
HelpMessage = "The gatway Sku:- Basic/Standard/HighPerformance")]
38+
HelpMessage = "The gatway Sku:- Basic/Standard/HighPerformance/VpnGw1/VpnGw2/VpnGw3")]
3939
[ValidateSet(
4040
MNM.VirtualNetworkGatewaySkuTier.Basic,
4141
MNM.VirtualNetworkGatewaySkuTier.Standard,
4242
MNM.VirtualNetworkGatewaySkuTier.HighPerformance,
4343
MNM.VirtualNetworkGatewaySkuTier.UltraPerformance,
44+
MNM.VirtualNetworkGatewaySkuTier.VpnGw1,
45+
MNM.VirtualNetworkGatewaySkuTier.VpnGw2,
46+
MNM.VirtualNetworkGatewaySkuTier.VpnGw3,
4447
IgnoreCase = true)]
4548
public string GatewaySku { get; set; }
4649

@@ -58,11 +61,6 @@ public override void Execute()
5861
throw new ArgumentException("Current Gateway SKU is same as Resize SKU size:"+ this.GatewaySku + " requested. No need to resize!");
5962
}
6063

61-
if (this.VirtualNetworkGateway.ActiveActive && !GatewaySku.Equals(MNM.VirtualNetworkGatewaySkuTier.HighPerformance))
62-
{
63-
throw new ArgumentException("Virtual Network Gateway Sku should be " + MNM.VirtualNetworkGatewaySkuTier.HighPerformance + " when Active-Active feature is already enabled on gateway.");
64-
}
65-
6664
this.VirtualNetworkGateway.Sku = new PSVirtualNetworkGatewaySku();
6765
this.VirtualNetworkGateway.Sku.Tier = this.GatewaySku;
6866
this.VirtualNetworkGateway.Sku.Name = this.GatewaySku;

‎src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/UpdateAzureVirtualNetworkGatewayCommand.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ public class SetAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
4141
MNM.VirtualNetworkGatewaySkuTier.Standard,
4242
MNM.VirtualNetworkGatewaySkuTier.HighPerformance,
4343
MNM.VirtualNetworkGatewaySkuTier.UltraPerformance,
44+
MNM.VirtualNetworkGatewaySkuTier.VpnGw1,
45+
MNM.VirtualNetworkGatewaySkuTier.VpnGw2,
46+
MNM.VirtualNetworkGatewaySkuTier.VpnGw3,
4447
IgnoreCase = true)]
4548
public string GatewaySku { get; set; }
4649

@@ -115,15 +118,6 @@ public override void Execute()
115118
this.VirtualNetworkGateway.ActiveActive = false;
116119
}
117120

118-
if (this.VirtualNetworkGateway.ActiveActive)
119-
{
120-
bool activeActiveSkuCriteria = !string.IsNullOrEmpty(this.GatewaySku) ? !this.GatewaySku.Equals(MNM.VirtualNetworkGatewaySkuTier.HighPerformance) : !this.VirtualNetworkGateway.Sku.Tier.Equals(MNM.VirtualNetworkGatewaySkuTier.HighPerformance);
121-
122-
if (activeActiveSkuCriteria)
123-
{
124-
throw new ArgumentException("Virtual Network Gateway Sku should be " + MNM.VirtualNetworkGatewaySkuTier.HighPerformance + " when Active-Active feature flag is set to True.");
125-
}
126-
}
127121

128122
if (!string.IsNullOrEmpty(GatewaySku))
129123
{

‎src/ResourceManager/Network/Commands.Network/help/New-AzureRmVirtualNetworkGateway.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Accept wildcard characters: False
117117
Type: String
118118
Parameter Sets: (All)
119119
Aliases:
120-
Accepted values: Basic, Standard, HighPerformance, UltraPerformance
120+
Accepted values: Basic, Standard, HighPerformance, UltraPerformance, VpnGw1, VpnGw2, VpnGw3
121121

122122
Required: False
123123
Position: Named

‎src/ResourceManager/Network/Commands.Network/help/Resize-AzureRmVirtualNetworkGateway.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Resize-AzureRmVirtualNetworkGateway -VirtualNetworkGateway <PSVirtualNetworkGate
2020
## DESCRIPTION
2121
The **Resize-AzureRmVirtualNetworkGateway** cmdlet enables you to change the stock-keeping unit (SKU) for a virtual network gateway.
2222
SKUs determine the capabilities of a gateway, including such things as throughput and the maximum number of IP tunnels that are allowed.
23-
Azure supports Basic, Standard, and High-Performance SKUs (sometimes referred to as Small, Medium, and Large SKUs).
23+
Azure supports Basic, Standard, High-Performance, VpnGw1, VpnGw2 and VpnGw3 SKUs (sometimes referred to as Small, Medium, and Large SKUs).
2424
For detailed information about the capabilities of each SKU type, see https://azure.microsoft.com/en-us/documentation/articles/vpn-gateway-about-vpngateways/.https://azure.microsoft.com/en-us/documentation/articles/vpn-gateway-about-vpngateways/.
2525

2626
Keep in mind that SKUs differ in pricing as well as capabilities.
@@ -49,12 +49,15 @@ The acceptable values for this parameter are:
4949
- Basic
5050
- Standard
5151
- High Performance
52+
- VpnGw1
53+
- VpnGw2
54+
- VpnGw3
5255

5356
```yaml
5457
Type: String
5558
Parameter Sets: (All)
5659
Aliases:
57-
Accepted values: Basic, Standard, HighPerformance, UltraPerformance
60+
Accepted values: Basic, Standard, HighPerformance, UltraPerformance, VpnGw1, VpnGw2, VpnGw3
5861

5962
Required: True
6063
Position: Named

‎src/ResourceManager/Network/Commands.Network/help/Set-AzureRmVirtualNetworkGateway.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,15 @@ The acceptable values for this parameter are:
108108
- Basic
109109
- Standard
110110
- HighPerformance
111+
- VpnGw1
112+
- VpnGw2
113+
- VpnGw3
111114
112115
```yaml
113116
Type: String
114117
Parameter Sets: (All)
115118
Aliases:
116-
Accepted values: Basic, Standard, HighPerformance, UltraPerformance
119+
Accepted values: Basic, Standard, HighPerformance, UltraPerformance, VpnGw1, VpnGw2, VpnGw3
117120

118121
Required: False
119122
Position: Named

‎src/ResourceManager/Network/Commands.Network/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
1919
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
2020
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
21-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net45" />
21+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
2222
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net45" />
2323
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2424
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />

0 commit comments

Comments
 (0)