Added PremiumV2 Sku option for App Service Plans

Lukasz Stempniewicz · Lukasz Stempniewicz · commit 4db6d1f9b70c · 2017-09-14T12:43:51.000-07:00
diff --git a/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlans/NewAzureAppServicePlan.cs b/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlans/NewAzureAppServicePlan.cs
@@ -32,8 +32,8 @@ 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]")]
-        [ValidateSet("Free", "Shared", "Basic", "Standard", "Premium", IgnoreCase = true)]
+        [Parameter(Position = 3, Mandatory = false, HelpMessage = "The App Service plan tier. Allowed values are [Free|Shared|Basic|Standard|Premium|PremiumV2]")]
+        [ValidateSet("Free", "Shared", "Basic", "Standard", "Premium", "PremiumV2", IgnoreCase = true)]
         public string Tier { get; set; }
 
         [Parameter(Position = 4, Mandatory = false, HelpMessage = "Number of Workers to be allocated.")]
diff --git a/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlans/SetAzureAppServicePlan.cs b/src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlans/SetAzureAppServicePlan.cs
@@ -31,8 +31,8 @@ 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]")]
-        [ValidateSet("Free", "Shared", "Basic", "Standard", "Premium", IgnoreCase = true)]
+        [Parameter(ParameterSetName = ParameterSet1Name, Position = 3, Mandatory = false, HelpMessage = "The App Service plan tier. Allowed values are [Free|Shared|Basic|Standard|Premium|PremiumV2]")]
+        [ValidateSet("Free", "Shared", "Basic", "Standard", "Premium", "PremiumV2", IgnoreCase = true)]
         public string Tier { get; set; }
 
         [Parameter(ParameterSetName = ParameterSet1Name, Position = 4, Mandatory = false, HelpMessage = "Number of Workers to be allocated.")]
diff --git a/src/ResourceManager/Websites/Commands.Websites/Utilities/CmdletHelpers.cs b/src/ResourceManager/Websites/Commands.Websites/Utilities/CmdletHelpers.cs
@@ -191,6 +191,11 @@ internal static string GetSkuName(string tier, int workerSize)
             {
                 sku = "D";
             }
+            else if (string.Equals("PremiumV2", tier, StringComparison.OrdinalIgnoreCase))
+            {
+                sku = "P" + workerSize + "V2";
+                return sku;
+            }
             else
             {
                 sku = string.Empty + tier[0];
@@ -207,6 +212,11 @@ internal static string GetSkuName(string tier, string workerSize)
             {
                 sku = "D";
             }
+            else if (string.Equals("PremiumV2", tier, StringComparison.OrdinalIgnoreCase))
+            {
+                sku = "P" + WorkerSizes[workerSize] + "V2";
+                return sku;
+            }
             else
             {
                 sku = string.Empty + tier[0];

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,11 @@ internal static string GetSkuName(string tier, int workerSize)`
`191`	`191`	`{`
`192`	`192`	`sku = "D";`
`193`	`193`	`}`
	`194`	`+ else if (string.Equals("PremiumV2", tier, StringComparison.OrdinalIgnoreCase))`
	`195`	`+ {`
	`196`	`+ sku = "P" + workerSize + "V2";`
	`197`	`+ return sku;`
	`198`	`+ }`
`194`	`199`	`else`
`195`	`200`	`{`
`196`	`201`	`sku = string.Empty + tier[0];`
`@@ -207,6 +212,11 @@ internal static string GetSkuName(string tier, string workerSize)`
`207`	`212`	`{`
`208`	`213`	`sku = "D";`
`209`	`214`	`}`
	`215`	`+ else if (string.Equals("PremiumV2", tier, StringComparison.OrdinalIgnoreCase))`
	`216`	`+ {`
	`217`	`+ sku = "P" + WorkerSizes[workerSize] + "V2";`
	`218`	`+ return sku;`
	`219`	`+ }`
`210`	`220`	`else`
`211`	`221`	`{`
`212`	`222`	`sku = string.Empty + tier[0];`