Enterprise should support up to 1000 app instancs (#6461)

* Enterprise should support up to 1000 app instancs * fix test * fix style * add version * fix * Update src/spring/azext_spring/custom.py Co-authored-by: Xing Zhou <[email protected]> --------- Co-authored-by: Xiaoyun Ding <[email protected]> Co-authored-by: Xing Zhou <[email protected]>
Azure · Jul 6, 2023 · 066fc43 · 066fc43
1 parent c320798
commit 066fc43
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/src/spring/HISTORY.md b/src/spring/HISTORY.md
@@ -1,5 +1,9 @@
 Release History
 ===============
+1.14.1
+---
+* Support up to 1000 app instances in Enterprise tier.
+
 1.14.0
 ---
 * Add new command `az spring application-configuration-service create --generation` to support creating Application Configuration Service with different generation

diff --git a/src/spring/azext_spring/_deployment_factory.py b/src/spring/azext_spring/_deployment_factory.py
@@ -208,6 +208,10 @@ def _backfill_settings(self, deployment_resource=None, env=None, jvm_options=Non
             return {}
         return {'env': deployment_resource.properties.deployment_settings.environment_variables}
 
+    def validate_instance_count(self, instance_count):
+        if instance_count < 1 or instance_count > 1000:
+            raise InvalidArgumentValueError('Invalid --instance-count, should be in range [1, 1000]')
+
 
 class BasicTierDeployment(DefaultDeployment):
     def validate_instance_count(self, instance_count):

diff --git a/src/spring/azext_spring/custom.py b/src/spring/azext_spring/custom.py
@@ -598,6 +598,10 @@ def app_append_loaded_public_certificate(cmd, client, resource_group, service, n
 def _validate_instance_count(sku, instance_count=None):
     if instance_count is not None:
         sku = sku.upper()
+        if sku == "ENTERPRISE":
+            if instance_count > 1000:
+                raise InvalidArgumentValueError(
+                    "Enterprise SKU can have at most 1000 app instances in total, but got '{}'".format(instance_count))
         if sku == "STANDARD":
             if instance_count > 500:
                 raise CLIError(

diff --git a/src/spring/azext_spring/tests/latest/test_asa_app.py b/src/spring/azext_spring/tests/latest/test_asa_app.py
@@ -666,8 +666,8 @@ def test_app_create_in_enterprise(self):
 
     def test_app_with_large_instance_count_enterprise(self):
         client = self._get_basic_mock_client(sku='Enterprise')
-        with self.assertRaisesRegexp(CLIError, 'Invalid --instance-count, should be in range \[1, 500\]'):
-            self._execute('rg', 'asc', 'app', cpu='500m', memory='2Gi', instance_count=501, client=client)
+        with self.assertRaisesRegexp(CLIError, 'Invalid --instance-count, should be in range \[1, 1000\]'):
+            self._execute('rg', 'asc', 'app', cpu='500m', memory='2Gi', instance_count=1001, client=client)
 
     def test_app_with_large_instance_count(self):
         with self.assertRaisesRegexp(CLIError, 'Invalid --instance-count, should be in range \[1, 500\]'):