DDoS Per-IP SKU - Phase 1 Changes (#19562)

* original changes

* originaal stuff

* bunch of changes

* small change

* new file from test

* removing all the New cmdlet changes

* one more change

* help file from markdown

* fix help

* changelog

* adding enum accepted params

Co-authored-by: Manas Chakka <[email protected]>

Author: mchakka

src/Network/Network.Test/NrpTeamAlias.cs

@@ -70,5 +70,8 @@ class NrpTeamAlias
 
         // Virtual WAN team
         public const string virtualwan = "routeservicedev";
+
+        // Ddos team
+        public const string ddos = "ddosdev";
     }
 }

src/Network/Network.Test/ScenarioTests/PublicIpAddressTests.cs

@@ -113,6 +113,14 @@ public void TestPublicIpStandardSku()
             TestRunner.RunTestScript("Test-PublicIpAddressCRUD-StandardSku");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.ddos)]
+        public void TestPublicIpDdosProtection()
+        {
+            TestRunner.RunTestScript("Test-PublicIpAddressCRUD-DdosProtection");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, NrpTeamAlias.sdnnrp)]

src/Network/Network.Test/ScenarioTests/PublicIpAddressTests.ps1

@@ -603,6 +603,63 @@ function Test-PublicIpAddressCRUD-StandardSku
     }
 }
 
+<#
+.SYNOPSIS
+Tests creating new simple publicIpAddress with Ddos Protection
+#>
+function Test-PublicIpAddressCRUD-DdosProtection
+{
+    # Setup
+    $rgname = Get-ResourceGroupName
+    $rname = Get-ResourceName
+    $domainNameLabel = Get-ResourceName
+    $rglocation = Get-ProviderLocation ResourceManagement
+    $resourceTypeParent = "Microsoft.Network/publicIpAddresses"
+    $location = Get-ProviderLocation $resourceTypeParent
+   
+    try 
+     {
+      # Create the resource group
+      $resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" } 
+      
+      # Create publicIpAddres
+      $actual = New-AzPublicIpAddress -ResourceGroupName $rgname -name $rname -location $location -AllocationMethod Static -Sku Standard -DomainNameLabel $domainNameLabel -DdosProtectionMode "Enabled"
+      $expected = Get-AzPublicIpAddress -ResourceGroupName $rgname -name $rname
+      Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
+      Assert-AreEqual $expected.Name $actual.Name
+      Assert-AreEqual $expected.Location $actual.Location
+      Assert-AreEqualObjectProperties $expected.Sku $actual.Sku
+      Assert-AreEqual "Static" $expected.PublicIpAllocationMethod
+      Assert-NotNull $expected.IpAddress
+      Assert-AreEqual "Succeeded" $expected.ProvisioningState
+      Assert-AreEqual "Enabled" $expected.DdosSettings.ProtectionMode
+
+      # list
+      $list = Get-AzPublicIpAddress -ResourceGroupName $rgname
+      Assert-AreEqual 1 @($list).Count
+      Assert-AreEqual $list[0].ResourceGroupName $actual.ResourceGroupName
+      Assert-AreEqual $list[0].Name $actual.Name
+      Assert-AreEqual $list[0].Location $actual.Location
+      Assert-AreEqualObjectProperties $list[0].Sku $actual.Sku
+      Assert-AreEqual "Static" $list[0].PublicIpAllocationMethod
+      Assert-NotNull $list[0].IpAddress
+      Assert-AreEqual "Succeeded" $list[0].ProvisioningState
+      Assert-AreEqual "Enabled" $expected.DdosSettings.ProtectionMode
+
+      # delete
+      $delete = Remove-AzPublicIpAddress -ResourceGroupName $actual.ResourceGroupName -name $rname -PassThru -Force
+      Assert-AreEqual true $delete
+      
+      $list = Get-AzPublicIpAddress -ResourceGroupName $actual.ResourceGroupName
+      Assert-AreEqual 0 @($list).Count
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
 <#
 .SYNOPSIS
 Tests creating new simple publicIpAddress with Static allocation and global tier.

src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PublicIpAddressTests/TestPublicIpDdosProtection.json

@@ -35,6 +35,7 @@
     - `New-AzApplicationGatewayClientAuthConfiguration`
     - `Set-AzApplicationGatewayClientAuthConfiguration`
 * Added Uppercase Transform in New-AzApplicationGatewayFirewallCondition
+* Added DdosProtectionMode parameter in New-AzPublicIpAddress
 * Added ProbeThreshold parameter to Load Balancer Probe 
     - `AddAzureRmLoadBalancerProbeConfigCommmand.cs`
     - `NewAzureRmLoadBalancerProbeConfigCommand.cs`

src/Network/Network/ChangeLog.md

@@ -400,6 +400,7 @@ private static void Initialize()
                 cfg.CreateMap<CNM.PSPublicIpTag, MNM.IpTag>();
                 cfg.CreateMap<CNM.PSPublicIpAddressSku, MNM.PublicIPAddressSku>();
                 cfg.CreateMap<CNM.PSPublicIpAddressDnsSettings, MNM.PublicIPAddressDnsSettings>();
+                cfg.CreateMap<CNM.PSDdosSettings, MNM.DdosSettings>();
 
                 // MNM to CNM
                 cfg.CreateMap<MNM.PublicIPAddress, CNM.PSPublicIpAddress>()
@@ -411,6 +412,7 @@ private static void Initialize()
                 cfg.CreateMap<MNM.IpTag, CNM.PSPublicIpTag>();
                 cfg.CreateMap<MNM.PublicIPAddressSku, CNM.PSPublicIpAddressSku>();
                 cfg.CreateMap<MNM.PublicIPAddressDnsSettings, CNM.PSPublicIpAddressDnsSettings>();
+                cfg.CreateMap<MNM.DdosSettings, CNM.PSDdosSettings>();
 
                 // PublicIpPrefix
                 // CNM to MNM

src/Network/Network/Common/NetworkResourceManagerProfile.cs

@@ -26,10 +26,18 @@ public class PSDdosProtectionPlan : PSTopLevelResource
 
         public List<PSResourceId> VirtualNetworks { get; set; }
 
+        public List<PSResourceId> PublicIpAddresses { get; set; }
+
         [JsonIgnore]
         public string VirtualNetworksText
         {
             get { return JsonConvert.SerializeObject(VirtualNetworks, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
+
+        [JsonIgnore]
+        public string PublicIpAddressesText
+        {
+            get { return JsonConvert.SerializeObject(PublicIpAddresses, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+        }
     }
 }

src/Network/Network/Models/PSDdosProtectionPlan.cs

@@ -0,0 +1,21 @@
+// ----------------------------------------------------------------------------------
+//
+// 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 partial class PSDdosSettings
+    {
+        public string ProtectionMode;
+    }
+}

src/Network/Network/Models/PSDdosSettings.cs

@@ -31,6 +31,8 @@ public class PSPublicIpAddress : PSTopLevelResource
 
         public PSPublicIpAddressDnsSettings DnsSettings { get; set; }
 
+        public PSDdosSettings DdosSettings { get; set; }
+
         public List<PSPublicIpTag> IpTags {get; set;}
 
         [Ps1Xml(Target = ViewControl.Table)]

src/Network/Network/Models/PSPublicIpAddress.cs

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
 
   <PropertyGroup>
     <PsModuleName>Network</PsModuleName>
@@ -38,6 +38,7 @@
 
   <ItemGroup>
     <Folder Include="Bastion\" />
+    <Folder Include="Microsoft\Azure\Commands\Network\Models\" />
     <Folder Include="RouteServerPeer\" />
   </ItemGroup>