create New-AzFirewallThreatIntelWhitelist cmdlet

Author: b564518128

src/Accounts/Accounts/AzureRmAlias/Mappings.json

@@ -1262,7 +1262,7 @@
     "Set-AzApplicationGatewayAutoscaleConfiguration": "Set-AzureRmApplicationGatewayAutoscaleConfiguration",
     "Set-AzApplicationGatewayAuthenticationCertificate": "Set-AzureRmApplicationGatewayAuthenticationCertificate",
     "Get-AzApplicationGatewayAvailableWafRuleSets": "Get-AzureRmApplicationGatewayAvailableWafRuleSets",
-   	"Get-AzApplicationGatewayAvailableServerVariableAndHeader": "Get-AzureRmApplicationGatewayAvailableServerVariableAndHeader",
+    "Get-AzApplicationGatewayAvailableServerVariableAndHeader": "Get-AzureRmApplicationGatewayAvailableServerVariableAndHeader",
     "Get-AzApplicationGatewayAvailableSslOptions": "Get-AzureRmApplicationGatewayAvailableSslOptions",
     "Add-AzApplicationGatewayBackendAddressPool": "Add-AzureRmApplicationGatewayBackendAddressPool",
     "Get-AzApplicationGatewayBackendAddressPool": "Get-AzureRmApplicationGatewayBackendAddressPool",
@@ -1632,6 +1632,7 @@
     "New-AzFirewallNatRule": "New-AzureRmFirewallNatRule",
     "New-AzFirewallNetworkRuleCollection": "New-AzureRmFirewallNetworkRuleCollection",
     "New-AzFirewallNetworkRule": "New-AzureRmFirewallNetworkRule",
+    "New-AzFirewallThreatIntelWhitelist": "New-AzureRmFirewallThreatIntelWhitelist",
     "Get-AzFirewallFqdnTag": "Get-AzureRmFirewallFqdnTag",
     "Add-AzNetworkInterfaceTapConfig": "Add-AzureRmNetworkInterfaceTapConfig",
     "Get-AzNetworkInterfaceTapConfig": "Get-AzureRmNetworkInterfaceTapConfig",
@@ -2519,4 +2520,4 @@
     "New-AzWebAppAzureStoragePath": "New-AzureRmWebAppAzureStoragePath",
     "Swap-AzWebAppSlot": "Swap-AzureRmWebAppSlot"
   }
-}
+}

src/Network/Network/Az.Network.psd1

@@ -383,7 +383,8 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate',
                'New-AzFirewallApplicationRuleCollection', 
                'New-AzFirewallApplicationRule', 'New-AzFirewallNatRuleCollection', 
                'New-AzFirewallNatRule', 'New-AzFirewallNetworkRuleCollection', 
-               'New-AzFirewallNetworkRule', 'Get-AzFirewallFqdnTag', 
+               'New-AzFirewallNetworkRule', 'New-AzFirewallThreatIntelWhitelist',
+               'Get-AzFirewallFqdnTag', 
                'Get-AzNetworkProfile', 'New-AzNetworkProfile', 
                'Remove-AzNetworkProfile', 'Set-AzNetworkProfile', 
                'New-AzContainerNicConfig', 'New-AzContainerNicConfigIpConfig', 

src/Network/Network/AzureFirewall/ThreatIntelWhitelist/NewAzureFirewallThreatIntelWhitelistCommand.cs

@@ -18,7 +18,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Network.Models;
 
-namespace Microsoft.Azure.Commands.Network.AzureFirewall.ThreatIntelWhitelist
+namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.New, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "FirewallThreatIntelWhitelist", SupportsShouldProcess = true), OutputType(typeof(PSAzureFirewallThreatIntelWhitelist))]
     class NewAzureFirewallThreatIntelWhitelistCommand : AzureFirewallBaseCmdlet

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

@@ -15,11 +15,7 @@
 
 namespace Microsoft.Azure.Commands.Network.Models
 {
-<<<<<<< Updated upstream
-    class PSAzureFirewallThreatIntelWhitelist
-=======
     public class PSAzureFirewallThreatIntelWhitelist
->>>>>>> Stashed changes
     {
         public string FQDNs { get; set; }