Skip to content
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.

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

Expose IP Configurations for Microsoft.Network\VpnGateways #12315

Merged
merged 4 commits into from
Sep 1, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 2 additions & 0 deletions src/Network/Network/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
- `Get-AzVirtualRouterPeer`
- `Remove-AzVirtualRouterPeer`
* Added RemoteBgpCommunities property to the VirtualNetwork Peering Resource
* Modified the warning message for `New-AzLoadBalancerFrontendIpConfig`, `New-AzPublicIpAddress` and `New-AzPublicIpPrefix`.
* Added VpnGatewayIpConfigurations to `Get-AzVpnGateway` output

## Version 3.3.0
* Added support for AddressPrefixType parameter to `Remove-AzExpressRouteCircuitConnectionConfig`
Expand Down
2 changes: 2 additions & 0 deletions src/Network/Network/Common/NetworkResourceManagerProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,7 @@ private static void Initialize()
cfg.CreateMap<CNM.PSVirtualHubRouteTable, MNM.VirtualHubRouteTableV2>();
cfg.CreateMap<CNM.PSVirtualHubRoute, MNM.VirtualHubRouteV2>();
cfg.CreateMap<CNM.PSVpnGateway, MNM.VpnGateway>();
cfg.CreateMap<CNM.PSVpnGatewayIpConfiguration, MNM.VpnGatewayIpConfiguration>();
cfg.CreateMap<CNM.PSVpnSiteLinkConnection, MNM.VpnSiteLinkConnection>();
cfg.CreateMap<CNM.PSVpnSiteLink, MNM.VpnSiteLink>();
cfg.CreateMap<CNM.PSVpnLinkProviderProperties, MNM.VpnLinkProviderProperties>();
Expand Down Expand Up @@ -1121,6 +1122,7 @@ private static void Initialize()
cfg.CreateMap<MNM.VirtualHubRouteTableV2, CNM.PSVirtualHubRouteTable>();
cfg.CreateMap<MNM.VirtualHubRouteV2, CNM.PSVirtualHubRoute>();
cfg.CreateMap<MNM.VpnGateway, CNM.PSVpnGateway>();
cfg.CreateMap<MNM.VpnGatewayIpConfiguration, CNM.PSVpnGatewayIpConfiguration>();
cfg.CreateMap<MNM.VpnConnection, CNM.PSVpnConnection>();
cfg.CreateMap<MNM.VpnSite, CNM.PSVpnSite>().AfterMap((src, dest) =>
{
Expand Down
3 changes: 3 additions & 0 deletions src/Network/Network/Models/Cortex/PSVpnGateway.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,8 @@ public class PSVpnGateway : PSTopLevelResource

[Ps1Xml(Label = "Provisioning State", Target = ViewControl.Table)]
public string ProvisioningState { get; set; }

[Ps1Xml(Label = "IP Configurations", Target = ViewControl.Table)]
henry416 marked this conversation as resolved.
Show resolved Hide resolved
public List<PSVpnGatewayIpConfiguration> IpConfigurations { get; set;}
}
}
25 changes: 25 additions & 0 deletions src/Network/Network/Models/Cortex/PSVpnGatewayIpConfiguration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// ----------------------------------------------------------------------------------
//
// Copyright Microsoft Corporation
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// ----------------------------------------------------------------------------------

namespace Microsoft.Azure.Commands.Network.Models
{
public class PSVpnGatewayIpConfiguration
{
public string Id { get; set; }

public string PublicIpAddress { get; set; }

public string PrivateIpAddress { get; set; }
}
}
3 changes: 3 additions & 0 deletions src/Network/Network/help/Get-AzVpnGateway.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Location : West US
VpnGatewayScaleUnit : 2
VirtualHub : /subscriptions/{subscriptionId}/resourceGroups/Ali_pS_Test/providers/Microsoft.Network/virtualHubs/westushub
BgpSettings : {}
IpConfigurations : {Instance0, Instance1}
Type : Microsoft.Network/vpnGateways
ProvisioningState : Succeeded
```
Expand All @@ -65,6 +66,7 @@ Location : West US
VpnGatewayScaleUnit : 2
VirtualHub : /subscriptions/{subscriptionId}/resourceGroups/Ali_pS_Test/providers/Microsoft.Network/virtualHubs/westushub
BgpSettings : {}
IpConfigurations : {Instance0, Instance1}
Type : Microsoft.Network/vpnGateways
ProvisioningState : Succeeded

Expand All @@ -75,6 +77,7 @@ Location : West US
VpnGatewayScaleUnit : 2
VirtualHub : /subscriptions/{subscriptionId}/resourceGroups/Ali_pS_Test/providers/Microsoft.Network/virtualHubs/westushub
BgpSettings : {}
IpConfigurations : {Instance0, Instance1}
Type : Microsoft.Network/vpnGateways
ProvisioningState : Succeeded
```
Expand Down