Skip to content

Commit 145599a

Browse files
Revert "Enable support for multi auth for p2sVpnGateway (#13749)" (#13764)
This reverts commit 42b6219.
1 parent 42b6219 commit 145599a

File tree

4 files changed

+86
-62
lines changed

4 files changed

+86
-62
lines changed

src/Network/Network/ChangeLog.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
## Upcoming Release
2222
* Bugfix in Remove peering and connection commandlet for ExpressrouteCircuit scenario
2323
- Remove-AzExpressRouteCircuitPeeringConfig and Remove-AzExpressRouteCircuitConnectionConfig
24-
* Added multiple Authentication support for p2sVpnGateway
25-
- Updated `New-AzVpnServerConfiguration` and `Update-AzVpnServerConfiguration` to allow multiple authentication parameters to be set.
2624
## Version 4.3.0
2725
* Updated below cmdlet
2826
- `New-AzLoadBalancerFrontendIpConfigCommand`, `Set-AzLoadBalancerFrontendIpConfigCommand`, `Add-AzLoadBalancerFrontendIpConfigCommand`:

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ namespace Microsoft.Azure.Commands.Network
3131

3232
[Cmdlet(VerbsCommon.New,
3333
ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VpnServerConfiguration",
34+
DefaultParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByCertificateAuthentication,
3435
SupportsShouldProcess = true),
3536
OutputType(typeof(PSVpnServerConfiguration))]
3637
public class NewAzureRmVpnServerConfigurationCommand : VpnServerConfigurationBaseCmdlet
@@ -75,54 +76,64 @@ public class NewAzureRmVpnServerConfigurationCommand : VpnServerConfigurationBas
7576

7677
[Parameter(
7778
Mandatory = false,
79+
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByCertificateAuthentication,
7880
HelpMessage = "A list of VpnClientRootCertificates to be added files' paths")]
7981
public string[] VpnClientRootCertificateFilesList { get; set; }
8082

8183
[Parameter(
8284
Mandatory = false,
85+
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByCertificateAuthentication,
8386
HelpMessage = "A list of VpnClientCertificates to be revoked files' paths")]
8487
public string[] VpnClientRevokedCertificateFilesList { get; set; }
8588

8689
[Parameter(
8790
Mandatory = false,
91+
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByRadiusAuthentication,
8892
HelpMessage = "P2S External Radius server address.")]
8993
public string RadiusServerAddress { get; set; }
9094

9195
[Parameter(
9296
Mandatory = false,
97+
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByRadiusAuthentication,
9398
HelpMessage = "P2S External Radius server secret.")]
9499
public SecureString RadiusServerSecret { get; set; }
95100

96101
[Parameter(
97102
Mandatory = false,
103+
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByRadiusAuthentication,
98104
HelpMessage = "P2S External multiple radius servers.")]
99105
public PSRadiusServer[] RadiusServerList { get; set; }
100106

101107
[Parameter(
102108
Mandatory = false,
109+
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByRadiusAuthentication,
103110
HelpMessage = "A list of RadiusClientRootCertificate files' paths")]
104111
public string[] RadiusServerRootCertificateFilesList { get; set; }
105112

106113
[Parameter(
107114
Mandatory = false,
115+
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByRadiusAuthentication,
108116
HelpMessage = "A list of RadiusClientRootCertificate files' paths")]
109117
public string[] RadiusClientRootCertificateFilesList { get; set; }
110118

111119
[Parameter(
112120
Mandatory = false,
121+
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByAadAuthentication,
113122
HelpMessage = "AAD tenant for P2S AAD authentication.")]
114123
[ValidateNotNullOrEmpty]
115124
public string AadTenant { get; set; }
116125

117126
[Parameter(
118127
Mandatory = false,
128+
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByAadAuthentication,
119129
HelpMessage = "AAD audience for P2S AAD authentication.")]
120130
[ValidateNotNullOrEmpty]
121131
public string AadAudience { get; set; }
122132

123133

124134
[Parameter(
125135
Mandatory = false,
136+
ParameterSetName = CortexParameterSetNames.ByVpnServerConfigurationName + CortexParameterSetNames.ByAadAuthentication,
126137
HelpMessage = "AAD issuer for P2S AAD authentication.")]
127138
[ValidateNotNullOrEmpty]
128139
public string AadIssuer { get; set; }

0 commit comments

Comments
 (0)