[AppService] Add Pv4 and Pmv4 ASP support (Azure#27326)

Author: krayc

src/Websites/Websites/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added AppServicePlan management support for Pv4 and Pmv4 tiers.
 
 ## Version 3.4.0
 * Add support for pull based deployments from a URL with MSI authentication in `Publish-AzWebApp`

src/Websites/Websites/Cmdlets/AppServicePlans/NewAzureAppServicePlan.cs

@@ -35,15 +35,15 @@ public class NewAzureAppServicePlanCmdlet : AppServicePlanBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string Location { get; set; }
 
-        [Parameter(Position = 3, Mandatory = false, HelpMessage = "The App Service plan tier. Allowed values are [Free|Shared|Basic|Standard|Premium|PremiumV2|PremiumV3]. For ASE: [Isolated|IsolatedV2].")]
-        [PSArgumentCompleter("Free", "Shared", "Basic", "Standard", "Premium", "PremiumV2", "Premium0V3", "PremiumV3", "PremiumMV3", "Isolated", "IsolatedV2", "PremiumContainer")]
+        [Parameter(Position = 3, Mandatory = false, HelpMessage = "The App Service plan tier. Allowed values are [Free|Shared|Basic|Standard|Premium|PremiumV2|Premium0V3|PremiumV3|PremiumMV3|PremiumV4|PremiumMV4]. For ASE: [Isolated|IsolatedV2].")]
+        [PSArgumentCompleter("Free", "Shared", "Basic", "Standard", "Premium", "PremiumV2", "Premium0V3", "PremiumV3", "PremiumMV3", "PremiumV4", "PremiumMV4", "Isolated", "IsolatedV2", "PremiumContainer")]
         public string Tier { get; set; }
 
         [Parameter(Position = 4, Mandatory = false, HelpMessage = "Number of Workers to be allocated.")]
         [ValidateNotNullOrEmpty]
         public int NumberofWorkers { get; set; }
 
-        [Parameter(Position = 5, Mandatory = false, HelpMessage = "Size of workers to be allocated. Allowed values are [Small|Medium|Large|ExtraLarge]")]
+        [Parameter(Position = 5, Mandatory = false, HelpMessage = "Size of workers to be allocated. Allowed values are [Small|Medium|Large|ExtraLarge|ExtraExtraLarge]")]
         [ValidateSet("ExtraSmall", "Small", "Medium", "Large", "ExtraLarge", "ExtraExtraLarge", IgnoreCase = true)]
         public string WorkerSize { get; set; }
 

src/Websites/Websites/Cmdlets/AppServicePlans/SetAzureAppServicePlan.cs

@@ -34,14 +34,14 @@ public class SetAzureAppServicePlanCmdlet : AppServicePlanBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string AdminSiteName { get; set; }
 
-        [Parameter(ParameterSetName = ParameterSet1Name, Position = 3, Mandatory = false, HelpMessage = "The App Service plan tier. Allowed values are [Free|Shared|Basic|Standard|Premium|PremiumV2|PremiumV3] or [Isolated|IsolatedV2]")]
-        [PSArgumentCompleter("Free", "Shared", "Basic", "Standard", "Premium", "PremiumV2", "Premium0V3", "PremiumV3", "PremiumMV3", "Isolated", "IsolatedV2")]
+        [Parameter(ParameterSetName = ParameterSet1Name, Position = 3, Mandatory = false, HelpMessage = "The App Service plan tier. Allowed values are [Free|Shared|Basic|Standard|Premium|PremiumV2|Premium0V3|PremiumV3|PremiumMV3|PremiumV4|PremiumMV4] or [Isolated|IsolatedV2]")]
+        [PSArgumentCompleter("Free", "Shared", "Basic", "Standard", "Premium", "PremiumV2", "Premium0V3", "PremiumV3", "PremiumMV3", "PremiumV4", "PremiumMV4", "Isolated", "IsolatedV2")]
         public string Tier { get; set; }
 
         [Parameter(ParameterSetName = ParameterSet1Name, Position = 4, Mandatory = false, HelpMessage = "Number of Workers to be allocated.")]
         public int NumberofWorkers { get; set; }
 
-        [Parameter(ParameterSetName = ParameterSet1Name, Position = 5, Mandatory = false, HelpMessage = "Size of workers to be allocated. Allowed values are [Small|Medium|Large|ExtraLarge]")]
+        [Parameter(ParameterSetName = ParameterSet1Name, Position = 5, Mandatory = false, HelpMessage = "Size of workers to be allocated. Allowed values are [Small|Medium|Large|ExtraLarge|ExtraExtraLarge]")]
         [PSArgumentCompleter("ExtraSmall", "Small", "Medium", "Large", "ExtraLarge", "ExtraExtraLarge")]
         public string WorkerSize { get; set; }
 

src/Websites/Websites/Utilities/CmdletHelpers.cs

@@ -318,6 +318,16 @@ internal static string GetSkuName(string tier, int workerSize)
                 sku = "P" + workerSize + "MV3";
                 return sku;
             }
+            else if (string.Equals("PremiumV4", tier, StringComparison.OrdinalIgnoreCase))
+            {
+                sku = "P" + workerSize + "V4";
+                return sku;
+            }
+            else if (string.Equals("PremiumMV4", tier, StringComparison.OrdinalIgnoreCase))
+            {
+                sku = "P" + workerSize + "MV4";
+                return sku;
+            }
             else if (string.Equals("PremiumContainer", tier, StringComparison.OrdinalIgnoreCase))
             {
                 sku = "PC" + workerSize + 1;