Fixed bugs related to auto learn IP prefixes and Snat (#21246)

* Bug fixes

* Fixed PrivateRange issue with Snat

* Displayed RouteServerId on output

* Added change log

---------

Co-authored-by: Gizachew Eshetie <[email protected]>

Author: Gizachew-Eshetie

src/Network/Network/AzureFirewall/AutoLearnedPrefix/GetAzureFirewallLearnedIpPrefixCommand.cs

@@ -48,7 +48,7 @@ public override void ExecuteCmdlet()
             base.ExecuteCmdlet();
             if (ShouldGetByName(ResourceGroupName, Name))
             {
-                var learnedIPPrefixes = this.AzureFirewallClient.ListLearnedPrefixes(this.ResourceGroupName, this.Name);
+                var learnedIPPrefixes = this.GetLearnedPrefixes(this.ResourceGroupName, this.Name);
                 var pslearnedIPPrefixes = new PSAzureFirewallIpPrefix();
                 if (learnedIPPrefixes != null)
                 {
@@ -61,5 +61,17 @@ public override void ExecuteCmdlet()
                 throw new ArgumentException($" Name and ResourceGroupName should be provided to get firewall learned IP prefixes.");
             }
         }
+
+        private IPPrefixesList GetLearnedPrefixes(string rgName, string fwName)
+        {
+            try
+            {
+                return this.AzureFirewallClient.ListLearnedPrefixes(rgName, fwName);
+            }
+            catch (Exception)
+            {
+                throw new Exception("Error occurred while fetching learned IP prefixes. Please make sure learning IP prefix is configured properly.");
+            }
+        }
     }
 }

src/Network/Network/AzureFirewallPolicy/NewAzureFirewallPolicyCommand.cs

@@ -192,10 +192,14 @@ private PSAzureFirewallPolicy CreateAzureFirewallPolicy()
                 },
                 IntrusionDetection = this.IntrusionDetection,
                 PrivateRange = this.PrivateRange,
-                ExplicitProxy = this.ExplicitProxy,
-                Snat = this.Snat
+                ExplicitProxy = this.ExplicitProxy
             };
 
+            if (this.Snat != null)
+            {
+                firewallPolicy.Snat = this.Snat;
+            }
+
             if (this.UserAssignedIdentityId != null)
             {
                 firewallPolicy.Identity = new PSManagedServiceIdentity

src/Network/Network/AzureFirewallPolicy/SetAzureFirewallPolicyCommand.cs

@@ -270,10 +270,14 @@ public override void Execute()
                     DnsSettings = this.DnsSetting,
                     SqlSetting = this.SqlSetting,
                     PrivateRange = this.PrivateRange,
-                    ExplicitProxy = this.ExplicitProxy,
-                    Snat = this.Snat
+                    ExplicitProxy = this.ExplicitProxy
                 };
 
+                if (this.Snat != null)
+                {
+                    firewallPolicy.Snat = this.Snat;
+                }
+
                 AddPremiumProperties(firewallPolicy);
 
                 var azureFirewallPolicyModel = NetworkResourceManagerProfile.Mapper.Map<MNM.FirewallPolicy>(firewallPolicy);
@@ -302,10 +306,14 @@ public override void Execute()
                     DnsSettings = this.DnsSetting,
                     SqlSetting = this.SqlSetting,
                     PrivateRange = this.PrivateRange,
-                    ExplicitProxy = this.ExplicitProxy,
-                    Snat = this.Snat
+                    ExplicitProxy = this.ExplicitProxy
                 };
 
+                if (this.Snat != null)
+                {
+                    firewallPolicy.Snat = this.Snat;
+                }
+
                 AddPremiumProperties(firewallPolicy);
 
                 // Map to the sdk object

src/Network/Network/ChangeLog.md

@@ -28,6 +28,7 @@
 * Updated `New-AzVirtualNetworkGatewayConnection`, `Set-AzVirtualNetworkGatewayConnection` and `New-AzVpnSiteLinkConnection` to support GatewayCustomBgpIpConfiguration.
 * Updated `Reset-AzVpnGateway` to support IpConfigurationId.
 * Blocked some regions when creating/updating Basic Sku firewall
+* Fixed bugs related to auto learn IP prefixes and Snat
 
 ## Version 5.5.0
 * Updated cmdlets to add new property of `Snat` in Azure Firewall Policy.

src/Network/Network/Models/AzureFirewallPolicy/PSAzureFirewallPolicy.cs

@@ -62,7 +62,7 @@ public string[] PrivateRange
         {
             get
             {
-                return Snat?.PrivateRanges.ToArray();
+                return Snat?.PrivateRanges?.ToArray();
             }
             set
             {

src/Network/Network/Network.format.ps1xml

@@ -4207,6 +4207,10 @@
                 <Label>IPv6CircuitConnectionConfig</Label>
                 <PropertyName>IPv6CircuitConnectionConfigText</PropertyName>
               </ListItem>
+			  <ListItem>
+				<Label>RouteServerId</Label>
+				<PropertyName>RouteServerId</PropertyName>
+			  </ListItem>
             </ListItems>
           </ListEntry>
         </ListEntries>