Skip to content

Commit 6538fed

Browse files
ritwikbasuritwikbasu
committed
Incorporating review comments
1 parent cd70bd1 commit 6538fed

10 files changed

+328
-146
lines changed

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

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
namespace Microsoft.Azure.Commands.Network
2929
{
30-
[Cmdlet(VerbsCommon.New,
31-
"AzureRmVirtualNetworkGateway",
32-
SupportsShouldProcess = true,
33-
DefaultParameterSetName = VirtualNetworkGatewayParameterSets.Default),
34-
OutputType(typeof(PSVirtualNetworkGateway))]
30+
[Cmdlet(VerbsCommon.New,
31+
"AzureRmVirtualNetworkGateway",
32+
SupportsShouldProcess = true,
33+
DefaultParameterSetName = VirtualNetworkGatewayParameterSets.Default),
34+
OutputType(typeof(PSVirtualNetworkGateway))]
3535
public class NewAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmdlet
3636
{
3737
[Alias("ResourceName")]
@@ -68,19 +68,19 @@ public class NewAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
6868
ValueFromPipelineByPropertyName = true,
6969
HelpMessage = "The type of this virtual network gateway: Vpn, ExoressRoute")]
7070
[ValidateSet(
71-
MNM.VirtualNetworkGatewayType.Vpn,
72-
MNM.VirtualNetworkGatewayType.ExpressRoute,
73-
IgnoreCase = true)]
71+
MNM.VirtualNetworkGatewayType.Vpn,
72+
MNM.VirtualNetworkGatewayType.ExpressRoute,
73+
IgnoreCase = true)]
7474
public string GatewayType { get; set; }
7575

7676
[Parameter(
7777
Mandatory = false,
7878
ValueFromPipelineByPropertyName = true,
7979
HelpMessage = "The type of the Vpn:PolicyBased/RouteBased")]
8080
[ValidateSet(
81-
MNM.VpnType.PolicyBased,
82-
MNM.VpnType.RouteBased,
83-
IgnoreCase = true)]
81+
MNM.VpnType.PolicyBased,
82+
MNM.VpnType.RouteBased,
83+
IgnoreCase = true)]
8484
public string VpnType { get; set; }
8585

8686
[Parameter(
@@ -99,20 +99,20 @@ public class NewAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
9999
ValueFromPipelineByPropertyName = true,
100100
HelpMessage = "The Gateway Sku Tier")]
101101
[ValidateSet(
102-
MNM.VirtualNetworkGatewaySkuTier.Basic,
103-
MNM.VirtualNetworkGatewaySkuTier.Standard,
104-
MNM.VirtualNetworkGatewaySkuTier.HighPerformance,
105-
MNM.VirtualNetworkGatewaySkuTier.UltraPerformance,
106-
MNM.VirtualNetworkGatewaySkuTier.VpnGw1,
107-
MNM.VirtualNetworkGatewaySkuTier.VpnGw2,
108-
MNM.VirtualNetworkGatewaySkuTier.VpnGw3,
109-
IgnoreCase = true)]
102+
MNM.VirtualNetworkGatewaySkuTier.Basic,
103+
MNM.VirtualNetworkGatewaySkuTier.Standard,
104+
MNM.VirtualNetworkGatewaySkuTier.HighPerformance,
105+
MNM.VirtualNetworkGatewaySkuTier.UltraPerformance,
106+
MNM.VirtualNetworkGatewaySkuTier.VpnGw1,
107+
MNM.VirtualNetworkGatewaySkuTier.VpnGw2,
108+
MNM.VirtualNetworkGatewaySkuTier.VpnGw3,
109+
IgnoreCase = true)]
110110
public string GatewaySku { get; set; }
111111

112112
[Parameter(
113-
Mandatory = false,
114-
ValueFromPipelineByPropertyName = true,
115-
ParameterSetName = "SetByResource",
113+
Mandatory = false,
114+
ValueFromPipelineByPropertyName = true,
115+
ParameterSetName = "SetByResource",
116116
HelpMessage = "GatewayDefaultSite")]
117117
public PSLocalNetworkGateway GatewayDefaultSite { get; set; }
118118

@@ -169,18 +169,13 @@ public class NewAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
169169
public SwitchParameter Force { get; set; }
170170

171171
[Parameter(
172-
Mandatory = true,
172+
Mandatory = false,
173173
ValueFromPipelineByPropertyName = true,
174174
ParameterSetName = VirtualNetworkGatewayParameterSets.RadiusServerConfiguration,
175175
HelpMessage = "P2S External Radius server address.")]
176176
[ValidateNotNullOrEmpty]
177177
public string RadiusServerAddress { get; set; }
178178

179-
[Parameter(
180-
Mandatory = false,
181-
ValueFromPipelineByPropertyName = true,
182-
ParameterSetName = VirtualNetworkGatewayParameterSets.Default,
183-
HelpMessage = "P2S External Radius server secret.")]
184179
[Parameter(
185180
Mandatory = true,
186181
ValueFromPipelineByPropertyName = true,
@@ -198,9 +193,9 @@ public override void Execute()
198193
string continueMsg = Properties.Resources.CreatingResourceMessage;
199194
bool force = true;
200195
if (!string.IsNullOrEmpty(GatewaySku)
201-
&& GatewaySku.Equals(MNM.VirtualNetworkGatewaySkuTier.UltraPerformance,StringComparison.InvariantCultureIgnoreCase))
196+
&& GatewaySku.Equals(MNM.VirtualNetworkGatewaySkuTier.UltraPerformance, StringComparison.InvariantCultureIgnoreCase))
202197
{
203-
warningMsg = string.Format(Properties.Resources.UltraPerformaceGatewayWarning,this.Name);
198+
warningMsg = string.Format(Properties.Resources.UltraPerformaceGatewayWarning, this.Name);
204199
force = false;
205200
}
206201
else
@@ -223,7 +218,7 @@ public override void Execute()
223218
WriteObject(virtualNetworkGateway);
224219
},
225220
() => present);
226-
221+
227222
}
228223

229224
private PSVirtualNetworkGateway CreateVirtualNetworkGateway()
@@ -302,8 +297,8 @@ private PSVirtualNetworkGateway CreateVirtualNetworkGateway()
302297
vnetGateway.GatewayDefaultSite = null;
303298
}
304299

305-
if (this.VpnClientAddressPool != null ||
306-
this.VpnClientRootCertificates != null ||
300+
if (this.VpnClientAddressPool != null ||
301+
this.VpnClientRootCertificates != null ||
307302
this.VpnClientRevokedCertificates != null ||
308303
this.RadiusServerAddress != null)
309304
{

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public class NewAzureVpnClientConfigurationCommand : VirtualNetworkGatewayBaseCm
7777
public override void Execute()
7878
{
7979
base.Execute();
80-
81-
if (ShouldProcess("AzureVpnClientConfiguration", VerbsCommon.New))
80+
string shouldProcessMessage = string.Format("Execute AzureRmVpnClientConfiguration for ResourceGroupName {0} VirtualNetworkGateway {1}", Name, ResourceGroupName);
81+
if (ShouldProcess(shouldProcessMessage, VerbsCommon.New))
8282
{
8383
PSVpnClientParameters vpnClientParams = new PSVpnClientParameters();
8484

@@ -161,4 +161,3 @@ public override void Execute()
161161
}
162162
}
163163
}
164-

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626

2727
namespace Microsoft.Azure.Commands.Network
2828
{
29-
[Cmdlet(VerbsCommon.Set,
30-
"AzureRmVirtualNetworkGatewayVpnClientConfig",
31-
DefaultParameterSetName = VirtualNetworkGatewayParameterSets.Default),
32-
OutputType(typeof(PSVirtualNetworkGateway))]
29+
[Cmdlet(VerbsCommon.Set,
30+
"AzureRmVirtualNetworkGatewayVpnClientConfig",
31+
DefaultParameterSetName = VirtualNetworkGatewayParameterSets.Default,
32+
SupportsShouldProcess = true),
33+
OutputType(typeof(PSVirtualNetworkGateway))]
3334
public class SetAzureVirtualNetworkGatewayVpnClientConfigCommand : VirtualNetworkGatewayBaseCmdlet
3435
{
3536
[Parameter(
@@ -47,18 +48,13 @@ public class SetAzureVirtualNetworkGatewayVpnClientConfigCommand : VirtualNetwor
4748
public List<string> VpnClientAddressPool { get; set; }
4849

4950
[Parameter(
50-
Mandatory = true,
51+
Mandatory = false,
5152
ValueFromPipelineByPropertyName = true,
5253
ParameterSetName = VirtualNetworkGatewayParameterSets.RadiusServerConfiguration,
5354
HelpMessage = "P2S External Radius server address.")]
5455
[ValidateNotNullOrEmpty]
5556
public string RadiusServerAddress { get; set; }
5657

57-
[Parameter(
58-
Mandatory = false,
59-
ValueFromPipelineByPropertyName = true,
60-
ParameterSetName = VirtualNetworkGatewayParameterSets.Default,
61-
HelpMessage = "P2S External Radius server secret.")]
6258
[Parameter(
6359
Mandatory = true,
6460
ValueFromPipelineByPropertyName = true,
@@ -99,12 +95,17 @@ public override void Execute()
9995
var virtualnetGatewayModel = Mapper.Map<MNM.VirtualNetworkGateway>(this.VirtualNetworkGateway);
10096
virtualnetGatewayModel.Tags = TagsConversionHelper.CreateTagDictionary(this.VirtualNetworkGateway.Tag, validate: true);
10197

102-
this.VirtualNetworkGatewayClient.CreateOrUpdate(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name, virtualnetGatewayModel);
98+
string shouldProcessMessage = string.Format("Execute AzureRmVirtualNetworkGatewayVpnClientConfig for ResourceGroupName {0} VirtualNetworkGateway {1}", this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name);
99+
if (ShouldProcess(shouldProcessMessage, VerbsCommon.Set))
100+
{
101+
this.VirtualNetworkGatewayClient.CreateOrUpdate(this.VirtualNetworkGateway.ResourceGroupName,
102+
this.VirtualNetworkGateway.Name, virtualnetGatewayModel);
103103

104-
var getvirtualnetGateway = this.GetVirtualNetworkGateway(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name);
104+
var getvirtualnetGateway = this.GetVirtualNetworkGateway(this.VirtualNetworkGateway.ResourceGroupName,
105+
this.VirtualNetworkGateway.Name);
105106

106-
WriteObject(getvirtualnetGateway);
107+
WriteObject(getvirtualnetGateway);
108+
}
107109
}
108110
}
109-
}
110-
111+
}

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

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
namespace Microsoft.Azure.Commands.Network
2828
{
29-
[Cmdlet(VerbsCommon.Set,
30-
"AzureRmVirtualNetworkGateway",
31-
DefaultParameterSetName = VirtualNetworkGatewayParameterSets.Default),
32-
OutputType(typeof(PSVirtualNetworkGateway))]
29+
[Cmdlet(VerbsCommon.Set,
30+
"AzureRmVirtualNetworkGateway",
31+
DefaultParameterSetName = VirtualNetworkGatewayParameterSets.Default, SupportsShouldProcess = true),
32+
OutputType(typeof(PSVirtualNetworkGateway))]
3333
public class SetAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmdlet
3434
{
3535
[Parameter(
@@ -43,19 +43,19 @@ public class SetAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
4343
ValueFromPipelineByPropertyName = true,
4444
HelpMessage = "The virtual network gateway's SKU")]
4545
[ValidateSet(
46-
MNM.VirtualNetworkGatewaySkuTier.Basic,
47-
MNM.VirtualNetworkGatewaySkuTier.Standard,
48-
MNM.VirtualNetworkGatewaySkuTier.HighPerformance,
49-
MNM.VirtualNetworkGatewaySkuTier.UltraPerformance,
50-
MNM.VirtualNetworkGatewaySkuTier.VpnGw1,
51-
MNM.VirtualNetworkGatewaySkuTier.VpnGw2,
52-
MNM.VirtualNetworkGatewaySkuTier.VpnGw3,
53-
IgnoreCase = true)]
46+
MNM.VirtualNetworkGatewaySkuTier.Basic,
47+
MNM.VirtualNetworkGatewaySkuTier.Standard,
48+
MNM.VirtualNetworkGatewaySkuTier.HighPerformance,
49+
MNM.VirtualNetworkGatewaySkuTier.UltraPerformance,
50+
MNM.VirtualNetworkGatewaySkuTier.VpnGw1,
51+
MNM.VirtualNetworkGatewaySkuTier.VpnGw2,
52+
MNM.VirtualNetworkGatewaySkuTier.VpnGw3,
53+
IgnoreCase = true)]
5454
public string GatewaySku { get; set; }
5555

5656
[Parameter(
57-
Mandatory = false,
58-
ValueFromPipelineByPropertyName = true,
57+
Mandatory = false,
58+
ValueFromPipelineByPropertyName = true,
5959
HelpMessage = "The default site to use for force tunneling. If a default site is specified, all internet traffic from the gateway's vnet is routed to that site.")]
6060
public PSLocalNetworkGateway GatewayDefaultSite { get; set; }
6161

@@ -111,18 +111,13 @@ public class SetAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
111111
public SwitchParameter DisableActiveActiveFeature { get; set; }
112112

113113
[Parameter(
114-
Mandatory = true,
114+
Mandatory = false,
115115
ValueFromPipelineByPropertyName = true,
116116
ParameterSetName = VirtualNetworkGatewayParameterSets.RadiusServerConfiguration,
117117
HelpMessage = "P2S External Radius server address.")]
118118
[ValidateNotNullOrEmpty]
119119
public string RadiusServerAddress { get; set; }
120120

121-
[Parameter(
122-
Mandatory = false,
123-
ValueFromPipelineByPropertyName = true,
124-
ParameterSetName = VirtualNetworkGatewayParameterSets.Default,
125-
HelpMessage = "P2S External Radius server secret.")]
126121
[Parameter(
127122
Mandatory = true,
128123
ValueFromPipelineByPropertyName = true,
@@ -184,11 +179,11 @@ public override void Execute()
184179
this.VirtualNetworkGateway.GatewayDefaultSite.Id = this.GatewayDefaultSite.Id;
185180
}
186181

187-
if ((this.VpnClientAddressPool != null ||
188-
this.VpnClientRootCertificates != null ||
189-
this.VpnClientRevokedCertificates != null ||
190-
this.RadiusServerAddress != null ||
191-
this.RadiusServerSecret != null) &&
182+
if ((this.VpnClientAddressPool != null ||
183+
this.VpnClientRootCertificates != null ||
184+
this.VpnClientRevokedCertificates != null ||
185+
this.RadiusServerAddress != null ||
186+
this.RadiusServerSecret != null) &&
192187
this.VirtualNetworkGateway.VpnClientConfiguration == null)
193188
{
194189
this.VirtualNetworkGateway.VpnClientConfiguration = new PSVpnClientConfiguration();
@@ -251,11 +246,18 @@ public override void Execute()
251246
MNM.VirtualNetworkGateway sdkVirtualNetworkGateway = Mapper.Map<MNM.VirtualNetworkGateway>(this.VirtualNetworkGateway);
252247
sdkVirtualNetworkGateway.Tags = TagsConversionHelper.CreateTagDictionary(this.VirtualNetworkGateway.Tag, validate: true);
253248

254-
this.VirtualNetworkGatewayClient.CreateOrUpdate(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name, sdkVirtualNetworkGateway);
249+
string shouldProcessMessage = string.Format("Execute AzureRmVirtualNetworkGateway for ResourceGroupName {0} VirtualNetworkGateway {1}", this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name);
250+
if (ShouldProcess(shouldProcessMessage, VerbsCommon.Set))
251+
{
252+
this.VirtualNetworkGatewayClient.CreateOrUpdate(this.VirtualNetworkGateway.ResourceGroupName,
253+
this.VirtualNetworkGateway.Name, sdkVirtualNetworkGateway);
255254

256-
var getVirtualNetworkGateway = this.GetVirtualNetworkGateway(this.VirtualNetworkGateway.ResourceGroupName, this.VirtualNetworkGateway.Name);
255+
var getVirtualNetworkGateway =
256+
this.GetVirtualNetworkGateway(this.VirtualNetworkGateway.ResourceGroupName,
257+
this.VirtualNetworkGateway.Name);
257258

258-
WriteObject(getVirtualNetworkGateway);
259+
WriteObject(getVirtualNetworkGateway);
260+
}
259261
}
260262
}
261263
}

‎src/ResourceManager/Network/Commands.Network/help/AzureRM.Network.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,12 +302,12 @@ Gets a subnet in a virtual network.
302302
### [Get-AzureRmVirtualNetworkUsageList](Get-AzureRmVirtualNetworkUsageList.md)
303303
Gets virtual network current usage.
304304

305+
### [Get-AzureRmVpnClientConfiguration](Get-AzureRmVpnClientConfiguration.md)
306+
Allows users to easily download the Vpn Profile package that was generated using the New-AzureRmVpnClientConfiguration commandlet.
307+
305308
### [Get-AzureRmVpnClientPackage](Get-AzureRmVpnClientPackage.md)
306309
Gets information about a VPN client package.
307310

308-
### [Get-AzureRmVpnClientConfiguration](Get-AzureRmVpnClientConfiguration.md)
309-
Gets URL to download a previously generated VpnClient package generated using the New-AzureRmVpnClientConfiguration command.
310-
311311
### [Get-AzureRmVpnClientRevokedCertificate](Get-AzureRmVpnClientRevokedCertificate.md)
312312
Gets information about VPN client-revocation certificates.
313313

@@ -317,9 +317,6 @@ Gets information about VPN root certificates.
317317
### [Move-AzureRmExpressRouteCircuit](Move-AzureRmExpressRouteCircuit.md)
318318
Moves an ExpressRoute circuit from the classic deployment model to the Resource Manager deployment model.
319319

320-
### [Move-AzureRmExpressRouteCircuit](Move-AzureRmExpressRouteCircuit.md)
321-
Moves an ExpressRoute circuit from the classic deployment model to the Resource Manager deployment model.
322-
323320
### [New-AzureRmApplicationGateway](New-AzureRmApplicationGateway.md)
324321
Creates an application gateway.
325322

0 commit comments

Comments
 (0)