Make consump tests run in live mode and make other tests use plan ins…

…tead
Azure · Jan 27, 2025 · 6b0a7d9 · 6b0a7d9
1 parent df80434
commit 6b0a7d9
Show file tree

Hide file tree

Showing 40 changed files with 5,239 additions and 29,364 deletions.
diff --git a/...d_modules/appservice/tests/latest/recordings/test_functionapp_access_restriction_add.yaml b/...d_modules/appservice/tests/latest/recordings/test_functionapp_access_restriction_add.yaml
diff --git a/...ests/latest/recordings/test_functionapp_access_restriction_add_ip_address_validation.yaml b/...ests/latest/recordings/test_functionapp_access_restriction_add_ip_address_validation.yaml
diff --git a/...dules/appservice/tests/latest/recordings/test_functionapp_access_restriction_add_scm.yaml b/...dules/appservice/tests/latest/recordings/test_functionapp_access_restriction_add_scm.yaml
diff --git a/...odules/appservice/tests/latest/recordings/test_functionapp_access_restriction_remove.yaml b/...odules/appservice/tests/latest/recordings/test_functionapp_access_restriction_remove.yaml
diff --git a/...es/appservice/tests/latest/recordings/test_functionapp_access_restriction_remove_scm.yaml b/...es/appservice/tests/latest/recordings/test_functionapp_access_restriction_remove_scm.yaml
diff --git a/...s/appservice/tests/latest/recordings/test_functionapp_access_restriction_set_complex.yaml b/...s/appservice/tests/latest/recordings/test_functionapp_access_restriction_set_complex.yaml
diff --git a/...es/appservice/tests/latest/recordings/test_functionapp_access_restriction_set_simple.yaml b/...es/appservice/tests/latest/recordings/test_functionapp_access_restriction_set_simple.yaml
diff --git a/..._modules/appservice/tests/latest/recordings/test_functionapp_access_restriction_show.yaml b/..._modules/appservice/tests/latest/recordings/test_functionapp_access_restriction_show.yaml
diff --git a/...pservice/tests/latest/recordings/test_functionapp_consumption_app_with_plan_creation.yaml b/...pservice/tests/latest/recordings/test_functionapp_consumption_app_with_plan_creation.yaml
diff --git a/.../command_modules/appservice/tests/latest/recordings/test_functionapp_consumption_e2e.yaml b/.../command_modules/appservice/tests/latest/recordings/test_functionapp_consumption_e2e.yaml
diff --git a/...ommand_modules/appservice/tests/latest/recordings/test_functionapp_consumption_linux.yaml b/...ommand_modules/appservice/tests/latest/recordings/test_functionapp_consumption_linux.yaml
diff --git a/...ppservice/tests/latest/recordings/test_functionapp_consumption_linux_dotnet_isolated.yaml b/...ppservice/tests/latest/recordings/test_functionapp_consumption_linux_dotnet_isolated.yaml
diff --git a/...d_modules/appservice/tests/latest/recordings/test_functionapp_consumption_linux_java.yaml b/...d_modules/appservice/tests/latest/recordings/test_functionapp_consumption_linux_java.yaml
diff --git a/...les/appservice/tests/latest/recordings/test_functionapp_consumption_linux_powershell.yaml b/...les/appservice/tests/latest/recordings/test_functionapp_consumption_linux_powershell.yaml
diff --git a/...es/appservice/tests/latest/recordings/test_functionapp_consumption_ragrs_storage_e2e.yaml b/...es/appservice/tests/latest/recordings/test_functionapp_consumption_ragrs_storage_e2e.yaml
diff --git a/...test_functionapp_create_with_appcontainer_managed_environment_consumption_plan_error.yaml b/...test_functionapp_create_with_appcontainer_managed_environment_consumption_plan_error.yaml
diff --git a/.../cli/command_modules/appservice/tests/latest/recordings/test_functionapp_keys_delete.yaml b/.../cli/command_modules/appservice/tests/latest/recordings/test_functionapp_keys_delete.yaml
diff --git a/...re/cli/command_modules/appservice/tests/latest/recordings/test_functionapp_keys_list.yaml b/...re/cli/command_modules/appservice/tests/latest/recordings/test_functionapp_keys_list.yaml
diff --git a/...ure/cli/command_modules/appservice/tests/latest/recordings/test_functionapp_keys_set.yaml b/...ure/cli/command_modules/appservice/tests/latest/recordings/test_functionapp_keys_set.yaml
diff --git a/...service/tests/latest/recordings/test_functionapp_language_runtime_version_deprecated.yaml b/...service/tests/latest/recordings/test_functionapp_language_runtime_version_deprecated.yaml
diff --git a/...s/appservice/tests/latest/recordings/test_functionapp_on_linux_consumption_python_39.yaml b/...s/appservice/tests/latest/recordings/test_functionapp_on_linux_consumption_python_39.yaml
diff --git a/...ules/appservice/tests/latest/recordings/test_functionapp_on_linux_dotnet_consumption.yaml b/...ules/appservice/tests/latest/recordings/test_functionapp_on_linux_dotnet_consumption.yaml
diff --git a/...vice/tests/latest/recordings/test_functionapp_on_linux_functions_version_consumption.yaml b/...vice/tests/latest/recordings/test_functionapp_on_linux_functions_version_consumption.yaml
diff --git a/...les/appservice/tests/latest/recordings/test_functionapp_on_linux_version_consumption.yaml b/...les/appservice/tests/latest/recordings/test_functionapp_on_linux_version_consumption.yaml
diff --git a/...mmand_modules/appservice/tests/latest/recordings/test_functionapp_powershell_version.yaml b/...mmand_modules/appservice/tests/latest/recordings/test_functionapp_powershell_version.yaml
diff --git a/...ommand_modules/appservice/tests/latest/recordings/test_functionapp_reserved_instance.yaml b/...ommand_modules/appservice/tests/latest/recordings/test_functionapp_reserved_instance.yaml
diff --git a/.../command_modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime.yaml b/.../command_modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime.yaml
diff --git a/...s/appservice/tests/latest/recordings/test_functionapp_windows_runtime_custom_handler.yaml b/...s/appservice/tests/latest/recordings/test_functionapp_windows_runtime_custom_handler.yaml
diff --git a/...ppservice/tests/latest/recordings/test_functionapp_windows_runtime_functions_version.yaml b/...ppservice/tests/latest/recordings/test_functionapp_windows_runtime_functions_version.yaml
diff --git a/...and_modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime_java.yaml b/...and_modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime_java.yaml
diff --git a/...dules/appservice/tests/latest/recordings/test_functionapp_windows_runtime_powershell.yaml b/...dules/appservice/tests/latest/recordings/test_functionapp_windows_runtime_powershell.yaml
diff --git a/..._modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime_version.yaml b/..._modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime_version.yaml
diff --git a/.../appservice/tests/latest/recordings/test_functionapp_windows_runtime_version_invalid.yaml b/.../appservice/tests/latest/recordings/test_functionapp_windows_runtime_version_invalid.yaml
diff --git a/..._modules/appservice/tests/latest/recordings/test_functionapp_windows_without_runtime.yaml b/..._modules/appservice/tests/latest/recordings/test_functionapp_windows_without_runtime.yaml
diff --git a/...nd_modules/appservice/tests/latest/recordings/test_functionapp_with_app_insights_key.yaml b/...nd_modules/appservice/tests/latest/recordings/test_functionapp_with_app_insights_key.yaml
diff --git a/...odules/appservice/tests/latest/recordings/test_functionapp_with_default_app_insights.yaml b/...odules/appservice/tests/latest/recordings/test_functionapp_with_default_app_insights.yaml
diff --git a/...les/appservice/tests/latest/recordings/test_functionapp_with_no_default_app_insights.yaml b/...les/appservice/tests/latest/recordings/test_functionapp_with_no_default_app_insights.yaml
diff --git a/...service/tests/latest/recordings/test_functionapp_without_default_distributed_tracing.yaml b/...service/tests/latest/recordings/test_functionapp_without_default_distributed_tracing.yaml
diff --git a/...i/command_modules/appservice/tests/latest/test_functionapp_access_restriction_commands.py b/...i/command_modules/appservice/tests/latest/test_functionapp_access_restriction_commands.py
@@ -29,10 +29,13 @@ class FunctionAppAccessRestrictionScenarioTest(ScenarioTest):
     def test_functionapp_access_restriction_show(self, resource_group, location):
         self.kwargs.update({
             'app_name': self.create_random_name(prefix='cli-funcapp-nwr', length=24),
-            'loc': location
+            'loc': location,
+            'plan_name': self.create_random_name(prefix='cli-plan-nwr', length=24)
         })
 
-        self.cmd('functionapp create -g {rg} -n {app_name} --consumption-plan-location {loc} -s {sa} --functions-version 4', checks=[
+        self.cmd('functionapp plan create -g {rg} -n {plan_name} --sku EP1')
+
+        self.cmd('functionapp create -g {rg} -n {app_name} -p {plan_name} -s {sa} --functions-version 4', checks=[
             JMESPathCheck('state', 'Running')
         ])
 
@@ -54,10 +57,13 @@ def test_functionapp_access_restriction_show(self, resource_group, location):
     def test_functionapp_access_restriction_set_simple(self, resource_group, location):
         self.kwargs.update({
             'app_name': self.create_random_name(prefix='cli-funcapp-nwr', length=24),
-            'loc': location
+            'loc': location,
+            'plan_name': self.create_random_name(prefix='cli-plan-nwr', length=24)
         })
 
-        self.cmd('functionapp create -g {rg} -n {app_name} --consumption-plan-location {loc} -s {sa} --functions-version 4', checks=[
+        self.cmd('functionapp plan create -g {rg} -n {plan_name} --sku EP1')
+
+        self.cmd('functionapp create -g {rg} -n {app_name} -p {plan_name} -s {sa} --functions-version 4', checks=[
             JMESPathCheck('state', 'Running')
         ])
 
@@ -85,10 +91,13 @@ def test_functionapp_access_restriction_set_simple(self, resource_group, locatio
     def test_functionapp_access_restriction_set_complex(self, resource_group, location):
         self.kwargs.update({
             'app_name': self.create_random_name(prefix='cli-funcapp-nwr', length=24),
-            'loc': location
+            'loc': location,
+            'plan_name': self.create_random_name(prefix='cli-plan-nwr', length=24)
         })
 
-        self.cmd('functionapp create -g {rg} -n {app_name} --consumption-plan-location {loc} -s {sa} --functions-version 4', checks=[
+        self.cmd('functionapp plan create -g {rg} -n {plan_name} --sku EP1')
+
+        self.cmd('functionapp create -g {rg} -n {app_name} -p {plan_name} -s {sa} --functions-version 4', checks=[
             JMESPathCheck('state', 'Running')
         ])
 
@@ -106,10 +115,13 @@ def test_functionapp_access_restriction_set_complex(self, resource_group, locati
     def test_functionapp_access_restriction_add(self, resource_group, location):
         self.kwargs.update({
             'app_name': self.create_random_name(prefix='cli-funcapp-nwr', length=24),
-            'loc': location
+            'loc': location,
+            'plan_name': self.create_random_name(prefix='cli-plan-nwr', length=24)
         })
 
-        self.cmd('functionapp create -g {rg} -n {app_name} --consumption-plan-location {loc} -s {sa} --functions-version 4', checks=[
+        self.cmd('functionapp plan create -g {rg} -n {plan_name} --sku EP1')
+
+        self.cmd('functionapp create -g {rg} -n {app_name} -p {plan_name} -s {sa} --functions-version 4', checks=[
             JMESPathCheck('state', 'Running')
         ])
 
@@ -126,10 +138,13 @@ def test_functionapp_access_restriction_add(self, resource_group, location):
     def test_functionapp_access_restriction_add_ip_address_validation(self, resource_group, location):
         self.kwargs.update({
             'app_name': self.create_random_name(prefix='cli-funcapp-nwr', length=24),
-            'loc': location
+            'loc': location,
+            'plan_name': self.create_random_name(prefix='cli-plan-nwr', length=24)
         })
 
-        self.cmd('functionapp create -g {rg} -n {app_name} --consumption-plan-location {loc} -s {sa} --functions-version 4', checks=[
+        self.cmd('functionapp plan create -g {rg} -n {plan_name} --sku EP1')
+
+        self.cmd('functionapp create -g {rg} -n {app_name} -p {plan_name} -s {sa} --functions-version 4', checks=[
             JMESPathCheck('state', 'Running')
         ])
 
@@ -181,10 +196,13 @@ def test_functionapp_access_restriction_add_service_endpoint(self, resource_grou
     def test_functionapp_access_restriction_remove(self, resource_group, location):
         self.kwargs.update({
             'app_name': self.create_random_name(prefix='cli-funcapp-nwr', length=24),
-            'loc': location
+            'loc': location,
+            'plan_name': self.create_random_name(prefix='cli-plan-nwr', length=24)
         })
 
-        self.cmd('functionapp create -g {rg} -n {app_name} --consumption-plan-location {loc} -s {sa} --functions-version 4', checks=[
+        self.cmd('functionapp plan create -g {rg} -n {plan_name} --sku EP1')
+
+        self.cmd('functionapp create -g {rg} -n {app_name} -p {plan_name} -s {sa} --functions-version 4', checks=[
             JMESPathCheck('state', 'Running')
         ])
 
@@ -207,10 +225,13 @@ def test_functionapp_access_restriction_remove(self, resource_group, location):
     def test_functionapp_access_restriction_add_scm(self, resource_group, location):
         self.kwargs.update({
             'app_name': self.create_random_name(prefix='cli-funcapp-nwr', length=24),
-            'loc': location
+            'loc': location,
+            'plan_name': self.create_random_name(prefix='cli-plan-nwr', length=24)
         })
 
-        self.cmd('functionapp create -g {rg} -n {app_name} --consumption-plan-location {loc} -s {sa} --functions-version 4', checks=[
+        self.cmd('functionapp plan create -g {rg} -n {plan_name} --sku EP1')
+
+        self.cmd('functionapp create -g {rg} -n {app_name} -p {plan_name} -s {sa} --functions-version 4', checks=[
             JMESPathCheck('state', 'Running')
         ])
 
@@ -227,10 +248,13 @@ def test_functionapp_access_restriction_add_scm(self, resource_group, location):
     def test_functionapp_access_restriction_remove_scm(self, resource_group, location):
         self.kwargs.update({
             'app_name': self.create_random_name(prefix='cli-funcapp-nwr', length=24),
-            'loc': location
+            'loc': location,
+            'plan_name': self.create_random_name(prefix='cli-plan-nwr', length=24)
         })
 
-        self.cmd('functionapp create -g {rg} -n {app_name} --consumption-plan-location {loc} -s {sa} --functions-version 4', checks=[
+        self.cmd('functionapp plan create -g {rg} -n {plan_name} --sku EP1')
+
+        self.cmd('functionapp create -g {rg} -n {app_name} -p {plan_name} -s {sa} --functions-version 4', checks=[
             JMESPathCheck('state', 'Running')
         ])