Skip to content

Fix parameter name and structure for radius server setting for VpnGat… #3524

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

Closed
ritwikbasu wants to merge 1 commit into from
Closed

Fix parameter name and structure for radius server setting for VpnGat… #3524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 1 addition & 22 deletions src/SDKs/Network/Management.Network/Generated/Models/VirtualNetworkGateway.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,14 @@ public VirtualNetworkGateway()
/// configurations.</param>
/// <param name="bgpSettings">Virtual network gateway's BGP speaker
/// settings.</param>
/// <param name="radiusServer">The radius server address property of
/// the VirtualNetworkGateway resource for vpn client
/// connection.</param>
/// <param name="radiusSecret">The radius secret property of the
/// VirtualNetworkGateway resource for vpn client connection.</param>
/// <param name="resourceGuid">The resource GUID property of the
/// VirtualNetworkGateway resource.</param>
/// <param name="provisioningState">The provisioning state of the
/// VirtualNetworkGateway resource. Possible values are: 'Updating',
/// 'Deleting', and 'Failed'.</param>
/// <param name="etag">Gets a unique read-only string that changes
/// whenever the resource is updated.</param>
public VirtualNetworkGateway(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), IList<VirtualNetworkGatewayIPConfiguration> ipConfigurations = default(IList<VirtualNetworkGatewayIPConfiguration>), string gatewayType = default(string), string vpnType = default(string), bool? enableBgp = default(bool?), bool? activeActive = default(bool?), SubResource gatewayDefaultSite = default(SubResource), VirtualNetworkGatewaySku sku = default(VirtualNetworkGatewaySku), VpnClientConfiguration vpnClientConfiguration = default(VpnClientConfiguration), BgpSettings bgpSettings = default(BgpSettings), string radiusServer = default(string), string radiusSecret = default(string), string resourceGuid = default(string), string provisioningState = default(string), string etag = default(string))
Copy link
Copy Markdown
Contributor

@shahabhijeet shahabhijeet Jul 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ritwikbasu so anyone who use to provide radiusServer info will be broken during constructing VirtualNetworkGateway?

Copy link
Copy Markdown
Contributor Author

@ritwikbasu ritwikbasu Jul 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feature is not exposed to customers. It has been deployed in NRP but is protected by a feature flag. This change ensures that the contract matches NRP and the documentation that will go out to the customer once the feature is released publicly.

The correct behavior is that radius settings should go as part of VpnClientConfiguration object when the feature is released. That is also the behavior in ARM/NRP now. This is a bugfix on the previous iteration which exposed radius address.

Copy link
Copy Markdown
Contributor Author

@ritwikbasu ritwikbasu Jul 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a breaking change - this is a bugfix.

The tests are compiled as part of the powershell release. This specific change requires pre-setup that is already available in powershell.

public VirtualNetworkGateway(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), IList<VirtualNetworkGatewayIPConfiguration> ipConfigurations = default(IList<VirtualNetworkGatewayIPConfiguration>), string gatewayType = default(string), string vpnType = default(string), bool? enableBgp = default(bool?), bool? activeActive = default(bool?), SubResource gatewayDefaultSite = default(SubResource), VirtualNetworkGatewaySku sku = default(VirtualNetworkGatewaySku), VpnClientConfiguration vpnClientConfiguration = default(VpnClientConfiguration), BgpSettings bgpSettings = default(BgpSettings), string resourceGuid = default(string), string provisioningState = default(string), string etag = default(string))
: base(id, name, type, location, tags)
{
IpConfigurations = ipConfigurations;
Expand All @@ -87,8 +82,6 @@ public VirtualNetworkGateway()
Sku = sku;
VpnClientConfiguration = vpnClientConfiguration;
BgpSettings = bgpSettings;
RadiusServer = radiusServer;
RadiusSecret = radiusSecret;
ResourceGuid = resourceGuid;
ProvisioningState = provisioningState;
Etag = etag;
Expand Down Expand Up @@ -163,20 +156,6 @@ public VirtualNetworkGateway()
[JsonProperty(PropertyName = "properties.bgpSettings")]
public BgpSettings BgpSettings { get; set; }

/// <summary>
/// Gets or sets the radius server address property of the
/// VirtualNetworkGateway resource for vpn client connection.
/// </summary>
[JsonProperty(PropertyName = "properties.radiusServer")]
public string RadiusServer { get; set; }

/// <summary>
/// Gets or sets the radius secret property of the
/// VirtualNetworkGateway resource for vpn client connection.
/// </summary>
[JsonProperty(PropertyName = "properties.radiusSecret")]
public string RadiusSecret { get; set; }

/// <summary>
/// Gets or sets the resource GUID property of the
/// VirtualNetworkGateway resource.
Expand Down
23 changes: 22 additions & 1 deletion src/SDKs/Network/Management.Network/Generated/Models/VpnClientConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,19 @@ public VpnClientConfiguration()
/// Virtual network gateway.</param>
/// <param name="vpnClientProtocols">VpnClientProtocols for Virtual
/// network gateway.</param>
public VpnClientConfiguration(AddressSpace vpnClientAddressPool = default(AddressSpace), IList<VpnClientRootCertificate> vpnClientRootCertificates = default(IList<VpnClientRootCertificate>), IList<VpnClientRevokedCertificate> vpnClientRevokedCertificates = default(IList<VpnClientRevokedCertificate>), IList<string> vpnClientProtocols = default(IList<string>))
/// <param name="radiusServerAddress">The radius server address
/// property of the VirtualNetworkGateway resource for vpn client
/// connection.</param>
/// <param name="radiusServerSecret">The radius secret property of the
/// VirtualNetworkGateway resource for vpn client connection.</param>
public VpnClientConfiguration(AddressSpace vpnClientAddressPool = default(AddressSpace), IList<VpnClientRootCertificate> vpnClientRootCertificates = default(IList<VpnClientRootCertificate>), IList<VpnClientRevokedCertificate> vpnClientRevokedCertificates = default(IList<VpnClientRevokedCertificate>), IList<string> vpnClientProtocols = default(IList<string>), string radiusServerAddress = default(string), string radiusServerSecret = default(string))
{
VpnClientAddressPool = vpnClientAddressPool;
VpnClientRootCertificates = vpnClientRootCertificates;
VpnClientRevokedCertificates = vpnClientRevokedCertificates;
VpnClientProtocols = vpnClientProtocols;
RadiusServerAddress = radiusServerAddress;
RadiusServerSecret = radiusServerSecret;
CustomInit();
}

Expand Down Expand Up @@ -82,5 +89,19 @@ public VpnClientConfiguration()
[JsonProperty(PropertyName = "vpnClientProtocols")]
public IList<string> VpnClientProtocols { get; set; }

/// <summary>
/// Gets or sets the radius server address property of the
/// VirtualNetworkGateway resource for vpn client connection.
/// </summary>
[JsonProperty(PropertyName = "radiusServerAddress")]
public string RadiusServerAddress { get; set; }

/// <summary>
/// Gets or sets the radius secret property of the
/// VirtualNetworkGateway resource for vpn client connection.
/// </summary>
[JsonProperty(PropertyName = "radiusServerSecret")]
public string RadiusServerSecret { get; set; }

}
}