[az][load] bug fixes on kvrefid splitcsv & terminal state

src/load/azext_load/data_plane/utils/utils.py

@@ -310,6 +310,10 @@ def convert_yaml_to_test(data):
             "Quick start test is not supported currently in CLI. Please use portal to run quick start test"
         )
     if data.get("splitAllCSVs") is not None:
+        if not isinstance(data.get("splitAllCSVs"), bool):
+            raise InvalidArgumentValueError(
+                "Invalid value for splitAllCSVs. Allowed values are boolean true or false"
+            )
         new_body["loadTestConfiguration"]["splitAllCSVs"] = data.get("splitAllCSVs")
 
     if data.get("failureCriteria"):

src/load/azext_load/tests/latest/constants.py

@@ -19,7 +19,10 @@ class LoadConstants:
     INVALID_ZIP_ARTIFACT_LOAD_TEST_CONFIG_FILE = os.path.join(
         TEST_RESOURCES_DIR, r"invalid-config-with-zip-artifacts.yaml"
     )
-    LOAD_TEST_CONFIG_FILE_KVREFID = os.path.join(TEST_RESOURCES_DIR, r"config-with-kvrefid.yaml")
+    LOAD_TEST_CONFIG_FILE_KVREFID = os.path.join(TEST_RESOURCES_DIR, r"config-kvrefid.yaml")
+    LOAD_TEST_CONFIG_FILE_INVALID_KVREFID = os.path.join(TEST_RESOURCES_DIR, r"config-invalid-kvrefid.yaml")
+    LOAD_TEST_CONFIG_FILE_SPLITCSV_FALSE = os.path.join(TEST_RESOURCES_DIR, r"config-splitcsv-false.yaml")
+    LOAD_TEST_CONFIG_FILE_INVALID_SPLITCSV = os.path.join(TEST_RESOURCES_DIR, r"config-invalid-splitcsv.yaml")
     TEST_PLAN = os.path.join(TEST_RESOURCES_DIR, r"sample-JMX-file.jmx")
     ADDITIONAL_FILE = os.path.join(TEST_RESOURCES_DIR, r"additional-data.csv")
     FILE_NAME = "sample-JMX-file.jmx"
@@ -88,7 +91,8 @@ class LoadTestConstants(LoadConstants):
     APP_COMPONENT_TEST_ID = "app-component-test-case"
     SERVER_METRIC_TEST_ID = "server-metric-test-case"
     FILE_TEST_ID = "file-test-case"
-    CREATE_TEST_KVREF_ID = "create-testwithkvrefid-case"
+    LOAD_TEST_KVREF_ID = "loadtest-kvrefid-case"
+    LOAD_TEST_SPLITCSV_ID = "loadtest-splitcsv-case"
 
     INVALID_UPDATE_TEST_ID = "invalid-update-test-case"
     INVALID_PF_TEST_ID = "invalid-pf-test-case"

src/load/azext_load/tests/latest/resources/config-invalid-kvrefid.yaml

@@ -0,0 +1,21 @@
+# Invalid key vault reference identity value
+displayName: CLI-Test
+testPlan: sample-JMX-file.jmx
+description: 'Test created from az load test command'
+engineInstances: 1
+configurationFiles:
+  - additional-data.csv
+zipArtifacts:
+   - sample-ZIP-artifact.zip
+failureCriteria:
+  - avg(requests_per_sec) > 78
+  - percentage(error) > 50
+  - GetCustomerDetails: avg(latency) > 200
+env:
+  - name: 'rps'
+    value: 1
+splitAllCSVs: False
+autoStop:
+  errorPercentage: 90
+  timeWindow: 60
+keyVaultReferenceIdentity: Random

src/load/azext_load/tests/latest/resources/config-invalid-splitcsv.yaml

@@ -0,0 +1,18 @@
+# Invalid split csv value
+testPlan: sample-JMX-file.jmx
+engineInstances: 1
+configurationFiles:
+  - additional-data.csv
+zipArtifacts:
+   - sample-ZIP-artifact.zip
+failureCriteria:
+  - avg(requests_per_sec) > 78
+  - percentage(error) > 50
+  - GetCustomerDetails: avg(latency) > 200
+env:
+  - name: 'rps'
+    value: 1
+splitAllCSVs: random
+autoStop:
+  errorPercentage: 90
+  timeWindow: 60

src/load/azext_load/tests/latest/resources/config-with-kvrefid.yaml → src/load/azext_load/tests/latest/resources/config-kvrefid.yaml

@@ -1,3 +1,4 @@
+# Valid key vault reference identity configuration
 displayName: CLI-Test
 testPlan: sample-JMX-file.jmx
 description: 'Test created from az load test command'

src/load/azext_load/tests/latest/resources/config-splitcsv-false.yaml

@@ -0,0 +1,18 @@
+# Valid split csv false configuration
+testPlan: sample-JMX-file.jmx
+engineInstances: 1
+configurationFiles:
+  - additional-data.csv
+zipArtifacts:
+   - sample-ZIP-artifact.zip
+failureCriteria:
+  - avg(requests_per_sec) > 78
+  - percentage(error) > 50
+  - GetCustomerDetails: avg(latency) > 200
+env:
+  - name: 'rps'
+    value: 1
+splitAllCSVs: false
+autoStop:
+  errorPercentage: 90
+  timeWindow: 60

src/load/azext_load/tests/latest/test_load_test.py

@@ -1099,19 +1099,19 @@ def test_load_test_file(self):
     @LoadTestResourcePreparer(**load_params)
     @StorageAccountPreparer(**sa_params)
     def test_load_test_kvrefid(self, rg, load):
+        # Create load test from config file with keyvault reference id
         self.kwargs.update(
             {
-                "test_id": LoadTestConstants.CREATE_TEST_KVREF_ID,
+                "test_id": LoadTestConstants.LOAD_TEST_KVREF_ID,
                 "load_test_config_file": LoadTestConstants.LOAD_TEST_CONFIG_FILE_KVREFID,
             }
         )
         checks = [
-            JMESPathCheck("testId", LoadTestConstants.CREATE_TEST_KVREF_ID),
+            JMESPathCheck("testId", LoadTestConstants.LOAD_TEST_KVREF_ID),
             JMESPathCheck(
                 "keyvaultReferenceIdentityId", LoadTestConstants.KEYVAULT_REFERENCE_ID
             ),
         ]
-        # Create load test from config file with keyvault reference id
         self.cmd(
             "az load test create "
             "--test-id {test_id} "
@@ -1120,10 +1120,10 @@ def test_load_test_kvrefid(self, rg, load):
             '--load-test-config-file "{load_test_config_file}" ',
             checks=checks,
         )
-
+        # Update test with keyvault reference id null using parameters
         self.kwargs.update(
             {
-                "test_id": LoadTestConstants.CREATE_TEST_KVREF_ID,
+                "test_id": LoadTestConstants.LOAD_TEST_KVREF_ID,
                 "keyvault_reference_id": "null",
             }
         )
@@ -1138,6 +1138,102 @@ def test_load_test_kvrefid(self, rg, load):
             "--keyvault-reference-id {keyvault_reference_id} ",
             checks=checks,
         )
+        # Update test with keyvault reference id using parameters
+        self.kwargs.update(
+            {
+                "test_id": LoadTestConstants.LOAD_TEST_KVREF_ID,
+                "keyvault_reference_id": LoadTestConstants.KEYVAULT_REFERENCE_ID,
+            }
+        )
+        checks = [
+            JMESPathCheck("keyvaultReferenceIdentityType", "UserAssigned"),
+            JMESPathCheck(
+                "keyvaultReferenceIdentityId", LoadTestConstants.KEYVAULT_REFERENCE_ID
+            ),
+        ]
+        self.cmd(
+            "az load test update "
+            "--test-id {test_id} "
+            "--load-test-resource {load_test_resource} "
+            "--resource-group {resource_group} "
+            "--keyvault-reference-id {keyvault_reference_id} ",
+            checks=checks,
+        )
+        # Update test with keyvault reference id not provided in config file
+        self.kwargs.update(
+            {
+                "test_id": LoadTestConstants.LOAD_TEST_KVREF_ID,
+                "load_test_config_file": LoadTestConstants.LOAD_TEST_CONFIG_FILE,
+            }
+        )
+        checks = [
+            JMESPathCheck("keyvaultReferenceIdentityType", "SystemAssigned"),
+        ]
+        self.cmd(
+            "az load test update "
+            "--test-id {test_id} "
+            "--load-test-resource {load_test_resource} "
+            '--load-test-config-file "{load_test_config_file}" '
+            "--resource-group {resource_group} ",
+            checks=checks,
+        )
+        # Update test with keyvault reference id using CLI arguments when
+        # both parameters and config file are provided
+        self.kwargs.update(
+            {
+                "test_id": LoadTestConstants.LOAD_TEST_KVREF_ID,
+                "keyvault_reference_id": LoadTestConstants.KEYVAULT_REFERENCE_ID,
+                "load_test_config_file": LoadTestConstants.LOAD_TEST_CONFIG_FILE_KVREFID,
+            }
+        )
+        checks = [
+            JMESPathCheck("keyvaultReferenceIdentityType", "UserAssigned"),
+            JMESPathCheck(
+                "keyvaultReferenceIdentityId", LoadTestConstants.KEYVAULT_REFERENCE_ID
+            ),
+        ]
+        self.cmd(
+            "az load test update "
+            "--test-id {test_id} "
+            "--load-test-resource {load_test_resource} "
+            '--load-test-config-file "{load_test_config_file}" '
+            "--resource-group {resource_group} "
+            "--keyvault-reference-id {keyvault_reference_id} ",
+            checks=checks,
+        )
+        # Invalid test case for keyvault reference id
+        self.kwargs.update(
+            {
+                "test_id": LoadTestConstants.LOAD_TEST_KVREF_ID,
+                "keyvault_reference_id": "Random",
+            }
+        )
+        try:
+            self.cmd(
+                "az load test update "
+                "--test-id {test_id} "
+                "--load-test-resource {load_test_resource} "
+                "--resource-group {resource_group} "
+                "--keyvault-reference-id {keyvault_reference_id} ",
+            )
+        except Exception as e:
+            assert "(InvalidManagedIdentity)" in str(e)
+        self.kwargs.update(
+            {
+                "test_id": LoadTestConstants.LOAD_TEST_KVREF_ID,
+                "load_test_config_file": LoadTestConstants.LOAD_TEST_CONFIG_FILE_INVALID_KVREFID,
+            }
+        )
+        try:
+            self.cmd(
+                "az load test update "
+                "--test-id {test_id} "
+                "--load-test-resource {load_test_resource} "
+                '--load-test-config-file "{load_test_config_file}" '
+                "--resource-group {resource_group} ",
+            )
+        except Exception as e:
+            assert "(InvalidManagedIdentity)" in str(e)
 
     @ResourceGroupPreparer(**rg_params)
     @LoadTestResourcePreparer(**load_params)
@@ -1146,7 +1242,7 @@ def test_load_test_splitcsv(self, rg, load):
         # Create load test from config file with split csv true
         self.kwargs.update(
             {
-                "test_id": LoadTestConstants.CREATE_TEST_ID,
+                "test_id": LoadTestConstants.LOAD_TEST_SPLITCSV_ID,
                 "load_test_config_file": LoadTestConstants.LOAD_TEST_CONFIG_FILE,
             }
         )
@@ -1162,10 +1258,10 @@ def test_load_test_splitcsv(self, rg, load):
             '--load-test-config-file "{load_test_config_file}" ',
             checks=checks,
         )
-        # Update test with split csv false
+        # Update test with split csv false from CLI arguments
         self.kwargs.update(
             {
-                "test_id": LoadTestConstants.CREATE_TEST_ID,
+                "test_id": LoadTestConstants.LOAD_TEST_SPLITCSV_ID,
                 "split_csv": LoadTestConstants.SPLIT_CSV_FALSE,
             }
         )
@@ -1180,10 +1276,10 @@ def test_load_test_splitcsv(self, rg, load):
             "--split-csv {split_csv} ",
             checks=checks,
         )
-        # Update test with split csv true
+        # Update test with split csv true from CLI arguments
         self.kwargs.update(
             {
-                "test_id": LoadTestConstants.CREATE_TEST_ID,
+                "test_id": LoadTestConstants.LOAD_TEST_SPLITCSV_ID,
                 "split_csv": LoadTestConstants.SPLIT_CSV_TRUE,
             }
         )
@@ -1201,8 +1297,8 @@ def test_load_test_splitcsv(self, rg, load):
         # Update test with split csv false using config file
         self.kwargs.update(
             {
-                "test_id": LoadTestConstants.CREATE_TEST_ID,
-                "load_test_config_file": LoadTestConstants.LOAD_TEST_CONFIG_FILE_KVREFID,
+                "test_id": LoadTestConstants.LOAD_TEST_SPLITCSV_ID,
+                "load_test_config_file": LoadTestConstants.LOAD_TEST_CONFIG_FILE_SPLITCSV_FALSE,
             }
         )
         checks = [
@@ -1215,4 +1311,58 @@ def test_load_test_splitcsv(self, rg, load):
             "--resource-group {resource_group} "
             '--load-test-config-file "{load_test_config_file}" ',
             checks=checks,
-        )
+        )
+        # Update test with split csv CLI parameter when
+        # both config file and CLI parameter are provided
+        self.kwargs.update(
+            {
+                "test_id": LoadTestConstants.LOAD_TEST_SPLITCSV_ID,
+                "split_csv": LoadTestConstants.SPLIT_CSV_TRUE,
+                "load_test_config_file": LoadTestConstants.LOAD_TEST_CONFIG_FILE_SPLITCSV_FALSE,
+            }
+        )
+        checks = [
+            JMESPathCheck("loadTestConfiguration.splitAllCSVs", True),
+        ]
+        self.cmd(
+            "az load test update "
+            "--test-id {test_id} "
+            "--load-test-resource {load_test_resource} "
+            '--load-test-config-file "{load_test_config_file}" '
+            "--resource-group {resource_group} "
+            "--split-csv {split_csv} ",
+            checks=checks,
+        )
+        # Invalid test case for split csv
+        self.kwargs.update(
+            {
+                "test_id": LoadTestConstants.LOAD_TEST_SPLITCSV_ID,
+                "split_csv": "Random",
+            }
+        )
+        try:
+            self.cmd(
+                "az load test update "
+                "--test-id {test_id} "
+                "--load-test-resource {load_test_resource} "
+                "--resource-group {resource_group} "
+                "--split-csv {split_csv} ",
+            )
+        except Exception as e:
+            assert "Invalid split-csv value: Random. Allowed values: true, false, yes, no, y, n" in str(e)
+        self.kwargs.update(
+            {
+                "test_id": LoadTestConstants.LOAD_TEST_SPLITCSV_ID,
+                "load_test_config_file": LoadTestConstants.LOAD_TEST_CONFIG_FILE_INVALID_SPLITCSV,
+            }
+        )
+        try:
+            self.cmd(
+                "az load test update "
+                "--test-id {test_id} "
+                "--load-test-resource {load_test_resource} "
+                '--load-test-config-file "{load_test_config_file}" '
+                "--resource-group {resource_group} ",
+            )
+        except Exception as e:
+            assert "Invalid value for splitAllCSVs. Allowed values are boolean true or false" in str(e)