Fixing payload for failureCriteria and updated test recordings (#7312)

* Fixing payload for failureCriteria and updated test recordings * Updated History and setup * Changed | to update method to support python 3.8 * refactoring code and fixing test recordings * nit: formatting
Azure · Mar 1, 2024 · 6cb7b72 · 6cb7b72
1 parent 3407910
commit 6cb7b72
Show file tree

Hide file tree

Showing 24 changed files with 10,007 additions and 8,406 deletions.
diff --git a/src/load/HISTORY.rst b/src/load/HISTORY.rst
@@ -2,6 +2,9 @@
 
 Release History
 ===============
+1.0.1
+++++++
+* Fix for sending correct failureCriteria request payload when using `az load test create` and `az load test update` commands with `--load-test-config-file` option and config file having failureCriteria.
 
 1.0.0
 ++++++

diff --git a/src/load/azext_load/data_plane/utils/utils.py b/src/load/azext_load/data_plane/utils/utils.py
@@ -62,7 +62,7 @@ def get_load_test_resource_endpoint(
         credential=cred,
         subscription_id=subscription_id,
         base_url=arm_endpoint,
-        credential_scopes=arm_token_scope
+        credential_scopes=arm_token_scope,
     )
     data_plane_uri = mgmt_client.load_tests.get(resource_group, name).data_plane_uri
     logger.info("Azure Load Testing data plane URI: %s", data_plane_uri)
@@ -128,7 +128,9 @@ def get_data_plane_scope(cli_ctx):
 def get_arm_endpoint_and_scope(cli_ctx):
     cloud_name = cli_ctx.cloud.name
     if cloud_name.lower() == "azureusgovernment":
-        return "https://management.usgovcloudapi.net", ["https://management.usgovcloudapi.net/.default"]
+        return "https://management.usgovcloudapi.net", [
+            "https://management.usgovcloudapi.net/.default"
+        ]
 
     return "https://management.azure.com", ["https://management.azure.com/.default"]
 
@@ -324,22 +326,20 @@ def convert_yaml_to_test(data):
             except InvalidArgumentValueError as e:
                 logger.error("Invalid failure criteria: %s", str(e))
             new_body["passFailCriteria"]["passFailMetrics"][metric_id] = {}
-            new_body["passFailCriteria"]["passFailMetrics"][metric_id][
-                "aggregate"
-            ] = components.split("(")[0].strip()
+            new_body["passFailCriteria"]["passFailMetrics"][metric_id]["aggregate"] = (
+                components.split("(")[0].strip()
+            )
             new_body["passFailCriteria"]["passFailMetrics"][metric_id][
                 "clientMetric"
             ] = (components.split("(")[1].split(")")[0].strip())
-            new_body["passFailCriteria"]["passFailMetrics"][metric_id][
-                "condition"
-            ] = components.split(")")[1].strip()[0]
-            new_body["passFailCriteria"]["passFailMetrics"][metric_id][
-                "value"
-            ] = components.split(
-                new_body["passFailCriteria"]["passFailMetrics"][metric_id]["condition"]
-            )[
-                1
-            ].strip()
+            new_body["passFailCriteria"]["passFailMetrics"][metric_id]["condition"] = (
+                components.split(")")[1].strip()[0]
+            )
+            new_body["passFailCriteria"]["passFailMetrics"][metric_id]["value"] = (
+                components.split(
+                    new_body["passFailCriteria"]["passFailMetrics"][metric_id]["condition"]
+                )[1].strip()
+            )
             if name is not None:
                 new_body["passFailCriteria"]["passFailMetrics"][metric_id][
                     "requestName"
@@ -444,14 +444,19 @@ def create_or_update_test_with_config(
     # quick test is not supported in CLI
     new_body["loadTestConfiguration"]["quickStartTest"] = False
 
-    new_body["passFailCriteria"] = {}
-    for key in body.get("passFailCriteria", {}):
-        if "passFailCriteria" not in new_body:
-            new_body["passFailCriteria"] = {}
-        new_body.get("passFailCriteria", {})[key] = None
-        new_body["passFailCriteria"][key] = None
-    if yaml_test_body.get("passFailCriteria") is not None:
-        new_body["passFailCriteria"] = yaml_test_body.get("passFailCriteria", {})
+    # make all metrics in existing passFailCriteria None to remove it from the test and add passFailCriteria from yaml
+    existing_pass_fail_Criteria = body.get("passFailCriteria", {})
+    yaml_pass_fail_criteria = yaml_test_body.get("passFailCriteria", {})
+    if existing_pass_fail_Criteria or yaml_pass_fail_criteria:
+        new_body["passFailCriteria"] = {
+            "passFailMetrics": {
+                key: None
+                for key in existing_pass_fail_Criteria.get("passFailMetrics", {})
+            }
+        }
+        new_body["passFailCriteria"]["passFailMetrics"].update(
+            yaml_pass_fail_criteria.get("passFailMetrics", {})
+        )
     if split_csv is not None:
         new_body["loadTestConfiguration"]["splitAllCSVs"] = split_csv
     elif (

diff --git a/src/load/azext_load/tests/latest/recordings/test_load_app_component.yaml b/src/load/azext_load/tests/latest/recordings/test_load_app_component.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_app_component.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_app_component.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_create.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_create.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_create_with_args.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_create_with_args.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_delete.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_delete.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_download_files.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_download_files.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_file.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_file.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_list.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_list.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_run_create.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_run_create.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_run_delete.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_run_delete.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_run_download_files.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_run_download_files.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_run_list.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_run_list.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_run_metrics.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_run_metrics.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_run_server_metric.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_run_server_metric.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_run_show.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_run_show.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_run_stop.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_run_stop.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_run_update.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_run_update.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_server_metric.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_server_metric.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_show.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_show.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_update.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_update.yaml
diff --git a/src/load/azext_load/tests/latest/recordings/test_load_test_update_with_config.yaml b/src/load/azext_load/tests/latest/recordings/test_load_test_update_with_config.yaml
diff --git a/src/load/setup.py b/src/load/setup.py
@@ -10,7 +10,7 @@
 
 
 # HISTORY.rst entry.
-VERSION = '1.0.0'
+VERSION = '1.0.1'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers