fix tests

Author: patelchandni

src/appservice-kube/azext_appservice_kube/_create_util.py

@@ -13,7 +13,7 @@
 def get_site_availability(cmd, name):
     """ This is used by az webapp up to verify if a site needs to be created or should just be deployed"""
     client = web_client_factory(cmd.cli_ctx)
-    availability = client.check_name_availability(name, 'Site')
+    availability = client.check_name_availability(request={"name": name, "type": "Site"})
 
     # check for "." in app name. it is valid for hostnames to contain it, but not allowed for webapp names
     if "." in name:

src/appservice-kube/azext_appservice_kube/custom.py

@@ -535,10 +535,10 @@ def _get_custom_location_id_from_kube_env(kube):
 def _ensure_kube_settings_in_json(appservice_plan_json, extended_location=None, kube_env=None):
     if appservice_plan_json.get("properties") and (appservice_plan_json["properties"].get("kubeEnvironmentProfile")
                                                    is None and kube_env is not None):
-        appservice_plan_json["properties"]["kubeEnvironmentProfile"] = kube_env.serialize()
+        appservice_plan_json["properties"]["kubeEnvironmentProfile"] = kube_env.as_dict()
 
     if appservice_plan_json.get("extendedLocation") is None and extended_location is not None:
-        appservice_plan_json["extendedLocation"] = extended_location.serialize()
+        appservice_plan_json["extendedLocation"] = extended_location.as_dict()
 
     appservice_plan_json['type'] = 'Microsoft.Web/serverfarms'
     if appservice_plan_json.get("extendedLocation") is not None:
@@ -611,7 +611,7 @@ def create_app_service_plan_inner(cmd, resource_group_name, name, is_linux, hype
                               reserved=(is_linux or None), hyper_v=(hyper_v or None), name=name,
                               per_site_scaling=per_site_scaling, hosting_environment_profile=ase_def,
                               kube_environment_profile=kube_def, extended_location=extended_location_envelope)
-    plan_json = plan_def.serialize()
+    plan_json = plan_def.as_dict()
     _ensure_kube_settings_in_json(appservice_plan_json=plan_json,
                                   extended_location=extended_location_envelope, kube_env=kube_def)
 
@@ -621,7 +621,7 @@ def create_app_service_plan_inner(cmd, resource_group_name, name, is_linux, hype
 
 def update_app_service_plan(cmd, resource_group_name, name, sku=None, number_of_workers=None, no_wait=False):
     client = web_client_factory(cmd.cli_ctx)
-    plan = client.app_service_plans.get(resource_group_name, name).serialize()
+    plan = client.app_service_plans.get(resource_group_name, name).as_dict()
     plan_with_kube_env = AppServiceClient.show(cmd=cmd, name=name, resource_group_name=resource_group_name)
 
     if number_of_workers is None and sku is None:
@@ -770,14 +770,23 @@ def create_webapp(cmd, resource_group_name, name, plan=None, runtime=None, custo
     client = web_client_factory(cmd.cli_ctx)
     if is_valid_resource_id(plan):
         parse_result = parse_resource_id(plan)
-        plan_info = AppServicePlan.from_dict(AppServiceClient.show(cmd=cmd, name=parse_result['name'],
-                                                                   resource_group_name=parse_result["resource_group"]))
+        plan_info = client.app_service_plans.get(parse_result["resource_group"], parse_result['name'])
     else:
-        plan_info = AppServicePlan.from_dict(AppServiceClient.show(cmd=cmd,
-                                                                   name=plan, resource_group_name=resource_group_name))
+        plan_info = client.app_service_plans.get(resource_group_name, plan)
     if not plan_info:
         raise CLIError("The plan '{}' doesn't exist in the resource group '{}".format(plan, resource_group_name))
 
+    # Get extended location from raw API if needed for kube scenarios
+    plan_raw = None
+    if custom_location or (hasattr(plan_info, 'extended_location') and plan_info.extended_location):
+        if is_valid_resource_id(plan):
+            parse_result = parse_resource_id(plan)
+            plan_raw = AppServiceClient.show(cmd=cmd, name=parse_result['name'],
+                                             resource_group_name=parse_result["resource_group"])
+        else:
+            plan_raw = AppServiceClient.show(cmd=cmd, name=plan, resource_group_name=resource_group_name)
+        raise CLIError("The plan '{}' doesn't exist in the resource group '{}".format(plan, resource_group_name))
+
     if custom_location:
         _validate_asp_sku(app_service_environment=None, custom_location=custom_location, sku=plan_info.sku.name)
 
@@ -805,8 +814,9 @@ def create_webapp(cmd, resource_group_name, name, plan=None, runtime=None, custo
                 extended_loc = {'name': custom_location_id, 'type': 'CustomLocation'}
                 webapp_def.additional_properties["extendedLocation"] = extended_loc
         else:
-            extended_loc = plan_info.additional_properties["extendedLocation"]
-            webapp_def.additional_properties["extendedLocation"] = extended_loc
+            extended_loc = plan_raw.get("extendedLocation") if plan_raw else None
+            if extended_loc:
+                webapp_def.additional_properties["extendedLocation"] = extended_loc
 
     if is_kube:
         if min_worker_count is not None:
@@ -1778,7 +1788,7 @@ def _update_host_name_ssl_state(cmd, resource_group_name, webapp_name, webapp,
                                                     thumbprint=thumbprint,
                                                     to_update=True)]
 
-    webapp_dict = webapp.serialize()
+    webapp_dict = webapp.as_dict()
 
     if webapp.extended_location is not None:
         webapp_dict["extendedLocation"]["type"] = "customLocation"