bugfix for remove cmdlet to delete config (#13655)

Co-authored-by: Abhinav Prakash <[email protected]>

Author: kilobyte97

src/Network/Network/ChangeLog.md

@@ -19,7 +19,8 @@
 --->
 
 ## Upcoming Release
-
+* Bugfix in Remove peering and connection commandlet for ExpressrouteCircuit scenario
+    - Remove-AzExpressRouteCircuitPeeringConfig and Remove-AzExpressRouteCircuitConnectionConfig
 ## Version 4.3.0
 * Updated below cmdlet 
     - `New-AzLoadBalancerFrontendIpConfigCommand`, `Set-AzLoadBalancerFrontendIpConfigCommand`, `Add-AzLoadBalancerFrontendIpConfigCommand`:

src/Network/Network/Common/Utils.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.Network.Models;
 using System;
 
 namespace Microsoft.Azure.Commands.Network
@@ -45,4 +46,18 @@ public static bool IsAll(string addressType)
             return false;
         }
     }
+
+    public class PeeringUtils
+    {
+        public static bool IsIpv4PrivatePeeringNull(PSPeering privatePeering)
+        {
+            if (privatePeering == null ||
+                 (privatePeering.PrimaryPeerAddressPrefix == null &&
+                  privatePeering.SecondaryPeerAddressPrefix == null))
+            {
+                return true;
+            }
+            return false;
+        }
+    }
 }

src/Network/Network/ExpressRouteCircuit/Peering/Connection/RemoveAzureExpressRouteCircuitConnectionConfigCommand.cs

@@ -70,18 +70,20 @@ public override void Execute()
 
             if (connection != null)
             {
-                if (AddressTypeUtils.IsIpv4(this.AddressPrefixType) || string.IsNullOrWhiteSpace(this.AddressPrefixType))
+                if ((string.IsNullOrWhiteSpace(this.AddressPrefixType) || AddressTypeUtils.IsIpv4(this.AddressPrefixType)) &&
+                    connection.IPv6CircuitConnectionConfig != null)
                 {
+                    // call is to remove ipv4 and ipv6 exists
                     connection.AddressPrefix = null;
                 }
-
-                else if (AddressTypeUtils.IsIpv6(this.AddressPrefixType))
+                else if (AddressTypeUtils.IsIpv6(this.AddressPrefixType) && connection.AddressPrefix != null)
                 {
+                    // call is to remove ipv6 and ipv4 exists
                     connection.IPv6CircuitConnectionConfig = null;
                 }
-
-                else if (AddressTypeUtils.IsAll(this.AddressPrefixType))
+                else
                 {
+                    // remove ipv4 call and ipv6 gr is already null OR remove ipv6 call and ipv4 gr is already null OR remove all
                     peering.Connections.Remove(connection);
                 }
             }

src/Network/Network/ExpressRouteCircuit/Peering/RemoveAzureExpressRouteCircuitPeeringConfigCommand.cs

@@ -75,7 +75,7 @@ public override void Execute()
                     if (peering.MicrosoftPeeringConfig != null && peering.Ipv6PeeringConfig != null)
                     {
                         // Both IPv4 and IPv6 peering configs are present. Only nullify the config corresponding to the address family specified
-                        if (AddressTypeUtils.IsIpv4(this.PeerAddressType) || string.IsNullOrWhiteSpace(this.PeerAddressType))
+                        if (string.IsNullOrWhiteSpace(this.PeerAddressType) || AddressTypeUtils.IsIpv4(this.PeerAddressType))
                         {
                             peering.PrimaryPeerAddressPrefix = null;
                             peering.SecondaryPeerAddressPrefix = null;
@@ -100,21 +100,25 @@ public override void Execute()
 
                 else if (peering.PeeringType == MNM.ExpressRoutePeeringType.AzurePrivatePeering)
                 {
-                    if (AddressTypeUtils.IsIpv4(this.PeerAddressType) || string.IsNullOrWhiteSpace(this.PeerAddressType))
+                    if ((string.IsNullOrWhiteSpace(this.PeerAddressType) || AddressTypeUtils.IsIpv4(this.PeerAddressType)) &&
+                            peering.Ipv6PeeringConfig != null)
                     {
+                        // call is to remove ipv4 and ipv6 exists
                         peering.PrimaryPeerAddressPrefix = null;
                         peering.SecondaryPeerAddressPrefix = null;
                     }
-                    else if (AddressTypeUtils.IsIpv6(this.PeerAddressType))
+                    else if (AddressTypeUtils.IsIpv6(this.PeerAddressType) &&
+                        !PeeringUtils.IsIpv4PrivatePeeringNull(peering))
                     {
+                        // call is to remove ipv6 and ipv4 exists
                         peering.Ipv6PeeringConfig = null;
                     }
-                    else if (AddressTypeUtils.IsAll(this.PeerAddressType))
+                    else
                     {
+                        // remove ipv4 and ipv6 is null OR remove ipv6 and ipv4 is null OR remove all
                         this.ExpressRouteCircuit.Peerings.Remove(peering);
                     }
                 }
-
                 else
                 {
                     // In case of Azure Public Peering