From 39720c005eed382c2c026df707706b5c3a074d64 Mon Sep 17 00:00:00 2001 From: Henry Chen Date: Thu, 2 Jul 2020 18:16:12 -0700 Subject: [PATCH 1/4] new ip configurations --- .../Common/NetworkResourceManagerProfile.cs | 2 ++ .../Network/Models/Cortex/PSVpnGateway.cs | 3 +++ .../Cortex/PSVpnGatewayIpConfiguration.cs | 25 +++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 src/Network/Network/Models/Cortex/PSVpnGatewayIpConfiguration.cs diff --git a/src/Network/Network/Common/NetworkResourceManagerProfile.cs b/src/Network/Network/Common/NetworkResourceManagerProfile.cs index 937f397acf37..5d74ab93eafd 100644 --- a/src/Network/Network/Common/NetworkResourceManagerProfile.cs +++ b/src/Network/Network/Common/NetworkResourceManagerProfile.cs @@ -1088,6 +1088,7 @@ private static void Initialize() cfg.CreateMap(); cfg.CreateMap(); cfg.CreateMap(); + cfg.CreateMap(); cfg.CreateMap(); cfg.CreateMap(); cfg.CreateMap(); @@ -1121,6 +1122,7 @@ private static void Initialize() cfg.CreateMap(); cfg.CreateMap(); cfg.CreateMap(); + cfg.CreateMap(); cfg.CreateMap(); cfg.CreateMap().AfterMap((src, dest) => { diff --git a/src/Network/Network/Models/Cortex/PSVpnGateway.cs b/src/Network/Network/Models/Cortex/PSVpnGateway.cs index b681834dd812..bd61924ef6aa 100644 --- a/src/Network/Network/Models/Cortex/PSVpnGateway.cs +++ b/src/Network/Network/Models/Cortex/PSVpnGateway.cs @@ -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)] + public List IpConfigurations { get; set;} } } \ No newline at end of file diff --git a/src/Network/Network/Models/Cortex/PSVpnGatewayIpConfiguration.cs b/src/Network/Network/Models/Cortex/PSVpnGatewayIpConfiguration.cs new file mode 100644 index 000000000000..428a819427e9 --- /dev/null +++ b/src/Network/Network/Models/Cortex/PSVpnGatewayIpConfiguration.cs @@ -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; } + } +} From cab767b73660b1e5a04bfd99f4c4b46886a8dff9 Mon Sep 17 00:00:00 2001 From: Henry Chen Date: Mon, 20 Jul 2020 09:27:09 -0700 Subject: [PATCH 2/4] changelog --- src/Network/Network/ChangeLog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Network/Network/ChangeLog.md b/src/Network/Network/ChangeLog.md index 1841a8251d27..8364cbbc6822 100644 --- a/src/Network/Network/ChangeLog.md +++ b/src/Network/Network/ChangeLog.md @@ -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` From ba02e8bfd83dd8107c572a77766e67ff18c286d8 Mon Sep 17 00:00:00 2001 From: Henry Chen Date: Mon, 20 Jul 2020 09:35:52 -0700 Subject: [PATCH 3/4] help file --- src/Network/Network/help/Get-AzVpnGateway.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Network/Network/help/Get-AzVpnGateway.md b/src/Network/Network/help/Get-AzVpnGateway.md index e8bfef95da9b..77ac60951322 100644 --- a/src/Network/Network/help/Get-AzVpnGateway.md +++ b/src/Network/Network/help/Get-AzVpnGateway.md @@ -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 ``` @@ -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 @@ -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 ``` From 0574a70b8ba232f25529ab4b4ce1cae466a2af9f Mon Sep 17 00:00:00 2001 From: Henry Chen Date: Mon, 31 Aug 2020 09:27:20 -0700 Subject: [PATCH 4/4] Update src/Network/Network/Models/Cortex/PSVpnGateway.cs As per PR suggestion Co-authored-by: Yeming Liu --- src/Network/Network/Models/Cortex/PSVpnGateway.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Network/Network/Models/Cortex/PSVpnGateway.cs b/src/Network/Network/Models/Cortex/PSVpnGateway.cs index bd61924ef6aa..16fc08d04754 100644 --- a/src/Network/Network/Models/Cortex/PSVpnGateway.cs +++ b/src/Network/Network/Models/Cortex/PSVpnGateway.cs @@ -32,7 +32,6 @@ public class PSVpnGateway : PSTopLevelResource [Ps1Xml(Label = "Provisioning State", Target = ViewControl.Table)] public string ProvisioningState { get; set; } - [Ps1Xml(Label = "IP Configurations", Target = ViewControl.Table)] public List IpConfigurations { get; set;} } -} \ No newline at end of file +}