DDoS Per-IP SKU Bundle Mode Support (#20456)

* another change

* everything

* current changes

* merge

* adding mapping to support older PIPs with no ddosSettings
Also removed /ddosprotstatus from test

* removing all /ddosprotstatus stuff

* added change log

* adding help

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

Author: mchakka

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

@@ -613,17 +613,18 @@ function Test-PublicIpAddressCRUD-DdosProtection
     $rgname = Get-ResourceGroupName
     $rname = Get-ResourceName
     $domainNameLabel = Get-ResourceName
+    $ddosProtectionPlanName = 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"
+      # Create publicIpAddress
+      $actual = New-AzPublicIpAddress -ResourceGroupName $rgname -name $rname -location $location -AllocationMethod Static -Sku Standard -DdosProtectionMode "Enabled"
       $expected = Get-AzPublicIpAddress -ResourceGroupName $rgname -name $rname
       Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
       Assert-AreEqual $expected.Name $actual.Name
@@ -646,6 +647,17 @@ function Test-PublicIpAddressCRUD-DdosProtection
       Assert-AreEqual "Succeeded" $list[0].ProvisioningState
       Assert-AreEqual "Enabled" $expected.DdosSettings.ProtectionMode
 
+      #create ddos protection plan
+      $ddpp = New-AzDdosProtectionPlan -Name $ddosProtectionPlanName -ResourceGroupName $rgname -Location $location
+
+      # attach plan to pip
+      $actual.DdosSettings.DdosProtectionPlan = New-Object Microsoft.Azure.Commands.Network.Models.PSResourceId
+      $actual.DdosSettings.DdosProtectionPlan.Id = $ddpp.Id 
+      $pip = Set-AzPublicIpAddress -PublicIpAddress $actual
+
+      $pip = Get-AzPublicIpAddress -ResourceGroupName $rgname -name $rname
+      Assert-AreEqual $ddpp.Id $pip.DdosSettings.DdosProtectionPlan.Id
+
       # delete
       $delete = Remove-AzPublicIpAddress -ResourceGroupName $actual.ResourceGroupName -name $rname -PassThru -Force
       Assert-AreEqual true $delete

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

@@ -19,6 +19,8 @@
 --->
 
 ## Upcoming Release
+* Added `DdosProtectionPlan` property in `AzPublicIpAddress`
+* Updated mapping in `AzPublicIpAddress` to always show/create DdosSettings
 * Fixed a bug that added Ddos related properties when viewing PublicIpAddress and DdosProtectionPlan objects
 * Fixed a Bug for Set-AzIpGroup cmdlet to support the -whatif parameter
 * Fixed a Bug for `Add-AzLoadBalancerFrontendIpConfig`, `Add-AzLoadBalancerProbeConfig`, `Add-AzLoadBalancerBackendAddressPoolConfig`, `Set-AzLoadBalancer`, `New-AzLoadBalancerRuleConfig`, `Remove-AzLoadBalancerInboundNatRuleConfig` cmdlets to support the `-whatif` parameter. Fix [#20416]

src/Network/Network/ChangeLog.md

@@ -407,7 +407,11 @@ private static void Initialize()
                     .ForMember(
                         dest => dest.ExtendedLocation,
                         opt => opt.MapFrom(src =>
-                            (src.ExtendedLocation == null ? null : new PSExtendedLocation(src.ExtendedLocation.Name)))
+                            src.ExtendedLocation == null ? null : new PSExtendedLocation(src.ExtendedLocation.Name)))
+                    .ForMember(
+                        dest => dest.DdosSettings,
+                        opt => opt.MapFrom(src =>
+                            (src.DdosSettings ?? new MNM.DdosSettings()))
                     );
                 cfg.CreateMap<MNM.IpTag, CNM.PSPublicIpTag>();
                 cfg.CreateMap<MNM.PublicIPAddressSku, CNM.PSPublicIpAddressSku>();

src/Network/Network/Common/NetworkResourceManagerProfile.cs

@@ -20,5 +20,8 @@ public partial class PSDdosSettings
     {
         [Ps1Xml(Target = ViewControl.Table)]
         public string ProtectionMode { get; set; }
+
+        public PSResourceId DdosProtectionPlan { get; set; }
+
     }
 }

src/Network/Network/Models/PSDdosSettings.cs

@@ -138,6 +138,13 @@ public class NewAzurePublicIpAddressCommand : PublicIpAddressBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string DdosProtectionMode { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The DdosProtectionPlan id to attach to the Public IP address")]
+        [ValidateNotNullOrEmpty]
+        public string DdosProtectionPlanId { get; set; }
+
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
@@ -219,6 +226,11 @@ private PSPublicIpAddress CreatePublicIpAddress()
             {
                 publicIp.DdosSettings = new PSDdosSettings();
                 publicIp.DdosSettings.ProtectionMode = this.DdosProtectionMode;
+
+                if (!string.IsNullOrEmpty(DdosProtectionPlanId))
+                {
+                    publicIp.DdosSettings.DdosProtectionPlan = new PSResourceId { Id = DdosProtectionPlanId };
+                }
             }
 
                 if (!string.IsNullOrEmpty(this.Tier))

src/Network/Network/PublicIpAddress/NewAzurePublicIpAddressCommand.cs

@@ -17,9 +17,9 @@ Creates a public IP address.
 New-AzPublicIpAddress [-Name <String>] -ResourceGroupName <String> [-Location <String>] [-EdgeZone <String>]
  [-Sku <String>] [-Tier <String>] -AllocationMethod <String> [-IpAddressVersion <String>]
  [-DomainNameLabel <String>] [-IpTag <PSPublicIpTag[]>] [-PublicIpPrefix <PSPublicIpPrefix>]
- [-DdosProtectionMode <String>] [-ReverseFqdn <String>] [-IdleTimeoutInMinutes <Int32>] [-Zone <String[]>]
- [-IpAddress <String>] [-Tag <Hashtable>] [-Force] [-AsJob] [-DefaultProfile <IAzureContextContainer>]
- [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-DdosProtectionMode <String>] [-DdosProtectionPlanId <String>] [-ReverseFqdn <String>]
+ [-IdleTimeoutInMinutes <Int32>] [-Zone <String[]>] [-IpAddress <String>] [-Tag <Hashtable>] [-Force] [-AsJob]
+ [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -144,6 +144,21 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -DdosProtectionPlanId
+The DdosProtectionPlan id to attach to the Public IP address
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -DefaultProfile
 The credentials, account, tenant, and subscription used for communication with azure.