fix ASP sku validation

src/appservice-kube/azext_appservice_kube/_utils.py

@@ -21,6 +21,25 @@ def _normalize_sku(sku):
     return sku
 
 
+def _validate_asp_sku(app_service_environment, custom_location, sku):
+    # Isolated SKU is supported only for ASE
+    if sku.upper() not in ['F1', 'FREE', 'D1', 'SHARED', 'B1', 'B2', 'B3', 'S1', 'S2', 'S3', 'P1V2', 'P1V3', 'P2V2',
+                            'P3V2','PC2', 'PC3', 'PC4', 'I1', 'I2', 'I3', 'K1']:
+        raise CLIError('Invalid sku entered: {}'.format(sku))
+
+    if sku.upper() in ['I1', 'I2', 'I3', 'I1V2', 'I2V2', 'I3V2']:
+        if not app_service_environment:
+            raise CLIError("The pricing tier 'Isolated' is not allowed for this app service plan. Use this link to "
+                           "learn more: https://docs.microsoft.com/en-us/azure/app-service/overview-hosting-plans")
+    elif app_service_environment:
+        raise CLIError("Only pricing tier 'Isolated' is allowed in this app service plan. Use this link to "
+                       "learn more: https://docs.microsoft.com/en-us/azure/app-service/overview-hosting-plans")
+    elif custom_location:
+        # Custom Location only supports K1
+        if sku.upper() != 'K1':
+            raise CLIError("Only pricing tier 'K1' is allowed for this type of app service plan.")
+
+
 def get_sku_name(tier):  # pylint: disable=too-many-return-statements
     tier = tier.upper()
     if tier in ['F1', 'FREE']:
@@ -35,12 +54,16 @@ def get_sku_name(tier):  # pylint: disable=too-many-return-statements
         return 'PREMIUM'
     if tier in ['P1V2', 'P2V2', 'P3V2']:
         return 'PREMIUMV2'
+    if tier in ['P1V3', 'P2V3', 'P3V3']:
+        return 'PREMIUMV3'
     if tier in ['PC2', 'PC3', 'PC4']:
         return 'PremiumContainer'
     if tier in ['EP1', 'EP2', 'EP3']:
         return 'ElasticPremium'
     if tier in ['I1', 'I2', 'I3']:
         return 'Isolated'
+    if tier in ['I1V2', 'I2V2', 'I3V2']:
+        return 'IsolatedV2'
     if tier in ['K1']:
         return 'Kubernetes'
     raise CLIError("Invalid sku(pricing tier), please refer to command help for valid values")

src/appservice-kube/azext_appservice_kube/_validators.py

@@ -6,8 +6,8 @@
 from knack.util import CLIError
 from azure.cli.core.commands.client_factory import get_mgmt_service_client
 from ._client_factory import web_client_factory
-from ._utils import _normalize_sku
-
+from ._utils import _normalize_sku, _validate_asp_sku
+from ._constants import KUBE_DEFAULT_SKU
 
 def validate_asp_sku(cmd, namespace):
     import json
@@ -35,6 +35,14 @@ def validate_asp_sku(cmd, namespace):
 def validate_asp_create(cmd, namespace):
     """Validate the SiteName that is being used to create is available
     This API requires that the RG is already created"""
+
+    # need to validate SKU before the general ASP create validation
+    sku = namespace.sku
+    if not sku:
+        sku = 'B1' if not namespace.custom_location else KUBE_DEFAULT_SKU
+    sku = _normalize_sku(sku)
+    _validate_asp_sku(namespace.app_service_environment, namespace.custom_location, sku)
+
     client = web_client_factory(cmd.cli_ctx)
     if isinstance(namespace.name, str) and isinstance(namespace.resource_group_name, str):
         resource_group_name = namespace.resource_group_name
@@ -51,7 +59,7 @@ def validate_asp_create(cmd, namespace):
             "type": "Microsoft.Web/serverfarms",
             "location": location,
             "properties": {
-                "skuName": _normalize_sku(namespace.sku) if namespace.sku else None,
+                "skuName": sku,
                 "capacity": namespace.number_of_workers or 1,
                 "needLinuxWorkers": namespace.is_linux if namespace.custom_location is None else 'false',
                 "isXenon": namespace.hyper_v

src/appservice-kube/azext_appservice_kube/custom.py

@@ -60,7 +60,7 @@
                          KUBE_CONTAINER_APP_KIND, LINUX_RUNTIMES, WINDOWS_RUNTIMES)
 
 from ._utils import (_normalize_sku, get_sku_name, _generic_site_operation,
-                     _get_location_from_resource_group)
+                     _get_location_from_resource_group, _validate_asp_sku)
 from ._create_util import (get_app_details, get_site_availability, get_current_stack_from_runtime,
                            generate_default_app_service_plan_name)
 from ._client_factory import web_client_factory, ex_handler_factory, customlocation_client_factory
@@ -431,25 +431,6 @@ def list_app_service_plans(cmd, resource_group_name=None):
     return plans
 
 
-def _validate_asp_sku(app_service_environment, custom_location, sku):
-    # Isolated SKU is supported only for ASE
-    if sku.upper() not in ['F1', 'FREE', 'D1', 'SHARED', 'B1', 'B2', 'B3', 'S1', 'S2', 'S3', 'P1V2', 'P2V2', 'P3V2',
-                           'PC2', 'PC3', 'PC4', 'I1', 'I2', 'I3', 'K1']:
-        raise CLIError('Invalid sku entered: {}'.format(sku))
-
-    if sku.upper() in ['I1', 'I2', 'I3', 'I1V2', 'I2V2', 'I3V2']:
-        if not app_service_environment:
-            raise CLIError("The pricing tier 'Isolated' is not allowed for this app service plan. Use this link to "
-                           "learn more: https://docs.microsoft.com/en-us/azure/app-service/overview-hosting-plans")
-    elif app_service_environment:
-        raise CLIError("Only pricing tier 'Isolated' is allowed in this app service plan. Use this link to "
-                       "learn more: https://docs.microsoft.com/en-us/azure/app-service/overview-hosting-plans")
-    elif custom_location:
-        # Custom Location only supports K1
-        if sku.upper() != 'K1':
-            raise CLIError("Only pricing tier 'K1' is allowed for this type of app service plan.")
-
-
 def create_app_service_plan(cmd, resource_group_name, name, is_linux, hyper_v, per_site_scaling=False,
                             custom_location=None,
                             app_service_environment=None, sku=None,