fix test

Author: b564518128

src/Network/Network/Common/NetworkResourceManagerProfile.cs

@@ -1109,18 +1109,12 @@ private static void Initialize()
                 // CNM to MNM
                 cfg.CreateMap<CNM.PSAzureFirewall, MNM.AzureFirewall>().AfterMap((src, dest) =>
                 {
-                    if (src.ThreatIntelWhitelist == null)
-                    {
-                        dest.AdditionalProperties = null;
-                        return;
-                    }
-
                     dest.AdditionalProperties = new Dictionary<string, string>()
                     {
-                        { "ThreatIntel.Whitelist.FQDNs", src.ThreatIntelWhitelist.FQDNs.Aggregate((result, item) => result + "," + item) },
-                        { "ThreatIntel.Whitelist.IpAddresses", src.ThreatIntelWhitelist.IpAddresses.Aggregate((result, item) => result + "," + item) },
-                    };
-                }); ;
+                        { "ThreatIntel.Whitelist.FQDNs", src.ThreatIntelWhitelist?.FQDNs?.Aggregate((result, item) => result + "," + item) },
+                        { "ThreatIntel.Whitelist.IpAddresses", src.ThreatIntelWhitelist?.IpAddresses?.Aggregate((result, item) => result + "," + item) },
+                    }.Where(kvp => kvp.Value != null).ToDictionary(key => key.Key, val => val.Value);   // TODO: remove after backend code is refactored
+                });
                 cfg.CreateMap<CNM.PSAzureFirewallSku, MNM.AzureFirewallSku>();
                 cfg.CreateMap<CNM.PSAzureFirewallIpConfiguration, MNM.AzureFirewallIPConfiguration>();
                 cfg.CreateMap<CNM.PSAzureFirewallApplicationRuleCollection, MNM.AzureFirewallApplicationRuleCollection>();
@@ -1138,8 +1132,8 @@ private static void Initialize()
                 {
                     dest.ThreatIntelWhitelist = new CNM.PSAzureFirewallThreatIntelWhitelist
                     {
-                        FQDNs = src.AdditionalProperties.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.FQDNs")).Value?.Split(',').Select(str => str.Trim()).ToArray(),
-                        IpAddresses = src.AdditionalProperties.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.IpAddresses")).Value?.Split(',').Select(str => str.Trim()).ToArray()
+                        FQDNs = src.AdditionalProperties?.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.FQDNs")).Value?.Split(',').Select(str => str.Trim()).ToArray(),
+                        IpAddresses = src.AdditionalProperties?.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.IpAddresses")).Value?.Split(',').Select(str => str.Trim()).ToArray()
                     };
                 }); ;
                 cfg.CreateMap<MNM.AzureFirewallSku, CNM.PSAzureFirewallSku>();

src/Network/Network/Models/AzureFirewall/PSAzureFirewallThreatIntelWhitelist.cs

@@ -26,12 +26,13 @@ public class PSAzureFirewallThreatIntelWhitelist
 
         private string[] ipAddresses;
 
-        public string[] FQDNs { 
+        public string[] FQDNs
+        {
             get { return this.fqdns; }
             set
             {
+                ValidateFqdns(value);
                 fqdns = value;
-                ValidateFqdns();
             }
         }
 
@@ -40,14 +41,14 @@ public string[] IpAddresses
             get { return this.ipAddresses; }
             set
             {
+                ValidateIpAddresses(value);
                 ipAddresses = value;
-                ValidateIpAddresses();
             }
         }
 
         private const string SecureGatewayThreatIntelFqdnRegex = "^\\*?([a-zA-Z0-9\\-\\.]?[a-zA-Z0-9])*$";
 
-        private void ValidateFqdns()
+        private void ValidateFqdns(string[] fqdns)
         {
             if (fqdns == null)
                 return;
@@ -61,7 +62,7 @@ private void ValidateFqdns()
             }
         }
 
-        private void ValidateIpAddresses()
+        private void ValidateIpAddresses(string[] ipAddresses)
         {
             if (IpAddresses == null)
                 return;