add logic for elastic-web-app-scale-limit and other param options

Author: amberwang113

src/azure-cli/azure/cli/command_modules/appservice/_params.py

@@ -131,7 +131,7 @@ def load_arguments(self, _):
     with self.argument_context('appservice plan update') as c:
         c.argument('sku', arg_type=sku_arg_type)
         c.argument('elastic_scale', arg_type=get_three_state_flag(), is_preview=True, help='Enable or disable automatic scaling. Set to "true" to enable elastic scale for this plan, or "false" to disable elastic scale for this plan. The SKU must be a Premium V2 SKU (P1V2, P2V2, P3V2) or a Premium V3 SKU (P1V3, P2V3, P3V3)')
-        c.argument('max_elastic_worker_count', options_list=['--max-elastic-worker-count', '-m'], type=int, is_preview=True, help='Maximum number of instances that the plan can scale out to. The plan must be an elastic scale plan.')
+        c.argument('max_elastic_worker_count', options_list=['--max-elastic-worker-count', '--max-app-service-plan-instance-count', '-m'], type=int, is_preview=True, help='Maximum number of instances that the plan can scale out to. The plan must be an elastic scale plan.')
         c.argument('number_of_workers', type=int, help='Number of workers to be allocated.')
         c.ignore('allow_pending_state')
 
@@ -207,8 +207,9 @@ def load_arguments(self, _):
                    arg_type=get_three_state_flag(return_label=True), deprecate_info=c.deprecate(expiration='3.0.0'))
         c.argument('skip_dns_registration', help="If true web app hostname is not registered with DNS on creation",
                    arg_type=get_three_state_flag(return_label=True), deprecate_info=c.deprecate(expiration='3.0.0'))
-        c.argument('minimum_elastic_instance_count', options_list=["--minimum-elastic-instance-count", "-i"], type=int, is_preview=True, help="Minimum number of instances. App must be in an elastic scale App Service Plan.")
-        c.argument('prewarmed_instance_count', options_list=["--prewarmed-instance-count", "-w"], type=int, is_preview=True, help="Number of preWarmed instances. App must be in an elastic scale App Service Plan.")
+        c.argument('minimum_elastic_instance_count', options_list=['--minimum-elastic-instance-count', '--min-web-app-instance-count', '-i'], type=int, is_preview=True, help="Minimum number of instances. App must be in an elastic scale App Service Plan.")
+        c.argument('elastic_web_app_scale_limit', options_list=['--elastic-web-app-scale-limit', '--max-web-app-instance-count', '-x'], type=int, is_preview=True, help="Maximum number of instances. App must be in an elastic scale App Service Plan.")
+        c.argument('prewarmed_instance_count', options_list=['--prewarmed-instance-count', '-w'], type=int, is_preview=True, help="Number of preWarmed instances. App must be in an elastic scale App Service Plan.")
 
     with self.argument_context('webapp browse') as c:
         c.argument('logs', options_list=['--logs', '-l'], action='store_true',

src/azure-cli/azure/cli/command_modules/appservice/custom.py

@@ -853,25 +853,33 @@ def set_webapp(cmd, resource_group_name, name, slot=None, skip_dns_registration=
 
 
 def update_webapp(cmd, instance, client_affinity_enabled=None, https_only=None, minimum_elastic_instance_count=None,
-                  prewarmed_instance_count=None):
+                  elastic_web_app_scale_limit=None, prewarmed_instance_count=None):
     if 'function' in instance.kind:
         raise ValidationError("please use 'az functionapp update' to update this function app")
-    if minimum_elastic_instance_count or prewarmed_instance_count:
-        args = ["--minimum-elastic-instance-count", "--prewarmed-instance-count"]
+    if minimum_elastic_instance_count or prewarmed_instance_count or elastic_web_app_scale_limit:
+        args = ["--minimum-elastic-instance-count", "--prewarmed-instance-count", "--elastic-web-app-scale-limit"]
         plan = get_app_service_plan_from_webapp(cmd, instance)
         sku = _normalize_sku(plan.sku.name)
         if get_sku_tier(sku) not in ["PREMIUMV2", "PREMIUMV3"]:
             raise ValidationError("{} are only supported for elastic premium V2/V3 SKUs".format(str(args)))
         if not plan.elastic_scale_enabled:
             raise ValidationError("Elastic scale is not enabled on the App Service Plan. Please update the plan ")
+        if ((elastic_web_app_scale_limit or 0) < 0) or \
+                ((minimum_elastic_instance_count or 0) < 0) or \
+                ((prewarmed_instance_count or 0) < 0):
+            raise ValidationError("Value cannot be less than 0 for {}.".format(str(args)))
         if (minimum_elastic_instance_count or 0) > plan.maximum_elastic_worker_count:
             raise ValidationError("--minimum-elastic-instance-count: Minimum elastic instance count is greater than "
                                   "the app service plan's maximum Elastic worker count. "
-                                  "Please choose a lower count or update the plan's maximum ")
+                                  "Please choose a lower count or update the plan's maximum.")
         if (prewarmed_instance_count or 0) > plan.maximum_elastic_worker_count:
             raise ValidationError("--prewarmed-instance-count: Prewarmed instance count is greater than "
                                   "the app service plan's maximum Elastic worker count. "
-                                  "Please choose a lower count or update the plan's maximum ")
+                                  "Please choose a lower count or update the plan's maximum.")
+        if (elastic_web_app_scale_limit or 0) > plan.maximum_elastic_worker_count:
+            raise ValidationError("--elastic-web-app-scale-limit: Elastic web app scale limit is greater than "
+                                  "the app service plan's maximum Elastic worker count. "
+                                  "Please choose a lower count or update the plan's maximum.")
 
     if client_affinity_enabled is not None:
         instance.client_affinity_enabled = client_affinity_enabled == 'true'
@@ -888,6 +896,14 @@ def update_webapp(cmd, instance, client_affinity_enabled=None, https_only=None,
     if prewarmed_instance_count is not None:
         instance.site_config.pre_warmed_instance_count = prewarmed_instance_count
 
+    if elastic_web_app_scale_limit is not None:
+        instance.site_config.elastic_web_app_scale_limit = elastic_web_app_scale_limit
+        minim = instance.site_config.minimum_elastic_instance_count
+        if minim and (elastic_web_app_scale_limit < minim):
+            raise ValidationError("--elastic-web-app-scale-limit: Elastic web app scale limit "
+                                  "cannot be less than minimum elastic instance count. "
+                                  "Please choose a higher count or update the minimum elastic instance count.")
+
     return instance