Skip to content

Commit 51985c6

Browse files
committed
rebased and PR comments
1 parent 689cc88 commit 51985c6

File tree

6 files changed

+1540
-2813
lines changed

6 files changed

+1540
-2813
lines changed

src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ function Test-VirtualNetworkGatewayRadius
688688
$vnetIpConfig = New-AzVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName -PublicIpAddress $publicip -Subnet $subnet
689689

690690
# Create & Get virtualnetworkgateway
691-
New-AzVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType Vpn -VpnType RouteBased -EnableBgp $false -GatewaySku VpnGw1 -VpnClientAddressPool 201.169.0.0/16 -VpnClientProtocol "IkeV2" -RadiusServers $radiusServers
691+
New-AzVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType Vpn -VpnType RouteBased -EnableBgp $false -GatewaySku VpnGw1 -VpnClientAddressPool 201.169.0.0/16 -VpnClientProtocol "IkeV2" -RadiusServerList $radiusServers
692692
$actual = Get-AzVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
693693
Assert-AreEqual $actual.VpnClientConfiguration.RadiusServers.Count 2
694694
Assert-AreEqual $actual.VpnClientConfiguration.RadiusServers[0].RadiusServerAddress $radiusServer1.RadiusServerAddress
@@ -698,7 +698,7 @@ function Test-VirtualNetworkGatewayRadius
698698

699699
# Update gateway radius settings
700700
$radiusServers = @($radiusServer3, $radiusServer1)
701-
Set-AzVirtualNetworkGateway -VirtualNetworkGateway $actual -VpnClientAddressPool 201.169.0.0/16 -VpnClientProtocol "IkeV2" -RadiusServers $radiusServers
701+
Set-AzVirtualNetworkGateway -VirtualNetworkGateway $actual -VpnClientAddressPool 201.169.0.0/16 -VpnClientProtocol "IkeV2" -RadiusServerList $radiusServers
702702
$actual = Get-AzVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
703703
Assert-AreEqual $actual.VpnClientConfiguration.RadiusServers.Count 2
704704
Assert-AreEqual $actual.VpnClientConfiguration.RadiusServers[0].RadiusServerAddress $radiusServer3.RadiusServerAddress

src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests/VirtualNetworkGatewayRadiusTest.json

Lines changed: 1528 additions & 2801 deletions
Large diffs are not rendered by default.

src/Network/Network/Cortex/VpnServerConfiguration/NewAzureRmVpnServerConfigurationCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public class NewAzureRmVpnServerConfigurationCommand : VpnServerConfigurationBas
105105
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByRadiusAuthentication,
106106
HelpMessage = "P2S External multiple radius servers.")]
107107
[ValidateNotNullOrEmpty]
108-
public PSRadiusServer[] RadiusServers { get; set; }
108+
public PSRadiusServer[] RadiusServerList { get; set; }
109109

110110
[Parameter(
111111
Mandatory = false,
@@ -179,7 +179,7 @@ public override void Execute()
179179
this.VpnClientRevokedCertificateFilesList,
180180
this.RadiusServerAddress,
181181
this.RadiusServerSecret,
182-
this.RadiusServers,
182+
this.RadiusServerList,
183183
this.RadiusServerRootCertificateFilesList,
184184
this.RadiusClientRootCertificateFilesList,
185185
this.AadTenant,

src/Network/Network/Cortex/VpnServerConfiguration/UpdateAzureRmVpnServerConfigurationCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public class UpdateAzureRmVpnServerConfigurationCommand : VpnServerConfiguration
200200
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationResourceId + CortexParameterSetNames.ByRadiusAuthentication,
201201
HelpMessage = "P2S External multiple radius servers.")]
202202
[ValidateNotNullOrEmpty]
203-
public PSRadiusServer[] RadiusServers { get; set; }
203+
public PSRadiusServer[] RadiusServerList { get; set; }
204204

205205
[Parameter(
206206
Mandatory = false,
@@ -389,7 +389,7 @@ public override void Execute()
389389
vpnServerConfigurationToUpdate.RadiusServerSecret = SecureStringExtensions.ConvertToString(this.RadiusServerSecret);
390390
}
391391

392-
vpnServerConfigurationToUpdate.RadiusServers = this.RadiusServers?.ToList();
392+
vpnServerConfigurationToUpdate.RadiusServers = this.RadiusServerList?.ToList();
393393

394394
// Read the RadiusServerRootCertificates if present
395395
if (this.RadiusServerRootCertificateFilesList != null)

src/Network/Network/VirtualNetworkGateway/NewAzureVirtualNetworkGatewayCommand.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public class NewAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
250250
ValueFromPipelineByPropertyName = true,
251251
ParameterSetName = VirtualNetworkGatewayParameterSets.RadiusServerConfiguration,
252252
HelpMessage = "P2S multiple external Radius server servers.")]
253-
public PSRadiusServer[] RadiusServers { get; set; }
253+
public PSRadiusServer[] RadiusServerList { get; set; }
254254

255255
[Parameter(
256256
Mandatory = true,
@@ -440,9 +440,9 @@ private PSVirtualNetworkGateway CreateVirtualNetworkGateway()
440440
vnetGateway.VpnClientConfiguration.RadiusServerSecret = SecureStringExtensions.ConvertToString(this.RadiusServerSecret);
441441
}
442442

443-
if (this.RadiusServers != null && this.RadiusServers.Any())
443+
if (this.RadiusServerList != null && this.RadiusServerList.Any())
444444
{
445-
vnetGateway.VpnClientConfiguration.RadiusServers = this.RadiusServers?.ToList();
445+
vnetGateway.VpnClientConfiguration.RadiusServers = this.RadiusServerList?.ToList();
446446
}
447447

448448
if (this.AadTenantUri != null)

src/Network/Network/VirtualNetworkGateway/UpdateAzureVirtualNetworkGatewayCommand.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public class SetAzureVirtualNetworkGatewayCommand : VirtualNetworkGatewayBaseCmd
175175
ParameterSetName = VirtualNetworkGatewayParameterSets.RadiusServerConfiguration + VirtualNetworkGatewayParameterSets.UpdateResourceWithTags,
176176
HelpMessage = "P2S multiple external Radius servers.")]
177177
[ValidateNotNullOrEmpty]
178-
public PSRadiusServer[] RadiusServers { get; set; }
178+
public PSRadiusServer[] RadiusServerList { get; set; }
179179

180180
[Parameter(
181181
Mandatory = true,
@@ -278,7 +278,7 @@ public override void Execute()
278278
this.VpnClientRevokedCertificates != null ||
279279
this.RadiusServerAddress != null ||
280280
this.RadiusServerSecret != null ||
281-
this.RadiusServers != null ||
281+
this.RadiusServerList != null ||
282282
(this.VpnClientIpsecPolicy != null && this.VpnClientIpsecPolicy.Length != 0) ||
283283
this.AadTenantUri != null) &&
284284
this.VirtualNetworkGateway.VpnClientConfiguration == null)
@@ -324,7 +324,7 @@ public override void Execute()
324324
this.VirtualNetworkGateway.VpnClientConfiguration.RadiusServerSecret = SecureStringExtensions.ConvertToString(this.RadiusServerSecret);
325325
}
326326

327-
this.VirtualNetworkGateway.VpnClientConfiguration.RadiusServers = this.RadiusServers?.ToList();
327+
this.VirtualNetworkGateway.VpnClientConfiguration.RadiusServers = this.RadiusServerList?.ToList();
328328
}
329329

330330
if (ParameterSetName.Contains(VirtualNetworkGatewayParameterSets.AadAuthenticationConfiguration))

0 commit comments

Comments
 (0)