Revert "[load] CLI changes for the CICD improvements. (Azure#8546)"

This reverts commit b461181.

Author: bavneetsingh16

src/load/HISTORY.rst

@@ -3,10 +3,6 @@
 Release History
 ===============
 
-1.7.0
-++++++
-* Add support for metrics reference identity. Metrics reference identity can be set using `--metrics-reference-identity` argument in 'az load test create' and 'az load test update' commands. Metrics reference identity set in YAML config file under key `referenceIdentities` with `kind` as `Metrics` will also be honoured.
-
 
 1.6.0
 ++++++

src/load/azext_load/data_plane/load_test/custom.py

@@ -21,10 +21,6 @@
     load_yaml,
     upload_file_to_test,
     upload_files_helper,
-    merge_existing_app_components,
-    merge_existing_server_metrics,
-    parse_app_comps_and_server_metrics,
-    is_not_empty_dictionary,
 )
 from azext_load.data_plane.utils.models import (
     AllowedTestTypes,
@@ -52,7 +48,6 @@ def create_test(
     secrets=None,
     certificate=None,
     key_vault_reference_identity=None,
-    metrics_reference_identity=None,
     subnet_id=None,
     split_csv=None,
     disable_public_ip=None,
@@ -71,14 +66,12 @@ def create_test(
         body = client.get_test(test_id)
     except ResourceNotFoundError:
         pass
-
     if body is not None:
         msg = f"Test with given test ID : {test_id} already exist."
         logger.debug(msg)
         raise InvalidArgumentValueError(msg)
     body = {}
     yaml, yaml_test_body = None, None
-    app_components, add_defaults_to_app_components, server_metrics = None, None, None
     autostop_criteria = create_autostop_criteria_from_args(
         autostop=autostop, error_rate=autostop_error_rate, time_window=autostop_error_rate_time_window)
     if load_test_config_file is None:
@@ -95,7 +88,6 @@ def create_test(
             secrets=secrets,
             certificate=certificate,
             key_vault_reference_identity=key_vault_reference_identity,
-            metrics_reference_identity=metrics_reference_identity,
             subnet_id=subnet_id,
             split_csv=split_csv,
             disable_public_ip=disable_public_ip,
@@ -107,7 +99,6 @@ def create_test(
     else:
         yaml = load_yaml(load_test_config_file)
         yaml_test_body = convert_yaml_to_test(cmd, yaml)
-        app_components, add_defaults_to_app_components, server_metrics = parse_app_comps_and_server_metrics(data=yaml)
         test_type = (
             test_type or
             yaml.get(LoadTestConfigKeys.TEST_TYPE) or
@@ -127,7 +118,6 @@ def create_test(
             secrets=secrets,
             certificate=certificate,
             key_vault_reference_identity=key_vault_reference_identity,
-            metrics_reference_identity=metrics_reference_identity,
             subnet_id=subnet_id,
             split_csv=split_csv,
             disable_public_ip=disable_public_ip,
@@ -146,32 +136,8 @@ def create_test(
     upload_files_helper(
         client, test_id, yaml, test_plan, load_test_config_file, not custom_no_wait, evaluated_test_type
     )
-    logger.info("Upload files to test %s has completed", test_id)
-    if is_not_empty_dictionary(app_components):
-        # only get and patch the app components if its present in the yaml.
-        app_component_response = client.create_or_update_app_components(
-            test_id=test_id, body={"testId": test_id, "components": app_components}
-        )
-        logger.warning(
-            "Added app components for test ID: %s and response is %s", test_id, app_component_response
-        )
-    if is_not_empty_dictionary(server_metrics):
-        # only get and patch the app components if its present in the yaml.
-        server_metrics_existing = None
-        try:
-            server_metrics_existing = client.get_server_metrics_config(test_id)
-        except ResourceNotFoundError:
-            server_metrics_existing = {"metrics": {}}
-        server_metrics_merged = merge_existing_server_metrics(
-            add_defaults_to_app_components, server_metrics, server_metrics_existing.get("metrics", {})
-        )
-        server_metric_response = client.create_or_update_server_metrics_config(
-            test_id=test_id, body={"testId": test_id, "metrics": server_metrics_merged}
-        )
-        logger.warning(
-            "Added server metrics for test ID: %s and response is %s", test_id, server_metric_response
-        )
     response = client.get_test(test_id)
+    logger.info("Upload files to test %s has completed", test_id)
     logger.info("Test %s has been created successfully", test_id)
     return response.as_dict()
 
@@ -190,7 +156,6 @@ def update_test(
     secrets=None,
     certificate=None,
     key_vault_reference_identity=None,
-    metrics_reference_identity=None,
     subnet_id=None,
     split_csv=None,
     disable_public_ip=None,
@@ -213,13 +178,11 @@ def update_test(
     logger.debug("Retrieved test with test ID: %s and body : %s", test_id, body)
 
     yaml, yaml_test_body = None, None
-    app_components, server_metrics, add_defaults_to_app_components = None, None, None
     autostop_criteria = create_autostop_criteria_from_args(
         autostop=autostop, error_rate=autostop_error_rate, time_window=autostop_error_rate_time_window)
     if load_test_config_file is not None:
         yaml = load_yaml(load_test_config_file)
         yaml_test_body = convert_yaml_to_test(cmd, yaml)
-        app_components, add_defaults_to_app_components, server_metrics = parse_app_comps_and_server_metrics(data=yaml)
         body = create_or_update_test_with_config(
             test_id,
             body,
@@ -231,7 +194,6 @@ def update_test(
             secrets=secrets,
             certificate=certificate,
             key_vault_reference_identity=key_vault_reference_identity,
-            metrics_reference_identity=metrics_reference_identity,
             subnet_id=subnet_id,
             split_csv=split_csv,
             disable_public_ip=disable_public_ip,
@@ -251,7 +213,6 @@ def update_test(
             secrets=secrets,
             certificate=certificate,
             key_vault_reference_identity=key_vault_reference_identity,
-            metrics_reference_identity=metrics_reference_identity,
             subnet_id=subnet_id,
             split_csv=split_csv,
             disable_public_ip=disable_public_ip,
@@ -269,37 +230,6 @@ def update_test(
     upload_files_helper(
         client, test_id, yaml, test_plan, load_test_config_file, not custom_no_wait, body.get("kind")
     )
-
-    if is_not_empty_dictionary(app_components):
-        # only get and patch the app components if its present in the yaml.
-        try:
-            app_components_existing = client.get_app_components(test_id)
-        except ResourceNotFoundError:
-            app_components_existing = {"components": {}}
-        app_components_merged = merge_existing_app_components(
-            app_components, app_components_existing.get("components", {})
-        )
-        app_component_response = client.create_or_update_app_components(
-            test_id=test_id, body={"testId": test_id, "components": app_components_merged}
-        )
-        logger.warning(
-            "Added app components for test ID: %s and response is %s", test_id, app_component_response
-        )
-    if is_not_empty_dictionary(server_metrics):
-        # only get and patch the app components if its present in the yaml.
-        try:
-            server_metrics_existing = client.get_server_metrics_config(test_id)
-        except ResourceNotFoundError:
-            server_metrics_existing = {"metrics": {}}
-        server_metrics_merged = merge_existing_server_metrics(
-            add_defaults_to_app_components, server_metrics_existing.get("metrics", {}), server_metrics
-        )
-        server_metric_response = client.create_or_update_server_metrics_config(
-            test_id=test_id, body={"testId": test_id, "metrics": server_metrics_merged}
-        )
-        logger.warning(
-            "Added server metrics for test ID: %s and response is %s", test_id, server_metric_response
-        )
     response = client.get_test(test_id)
     logger.info("Upload files to test %s has completed", test_id)
     logger.info("Test %s has been updated successfully", test_id)

src/load/azext_load/data_plane/load_test/help.py

@@ -49,9 +49,6 @@
     - name: Create a test with user assigned Managed Identity reference for engine.
       text: |
         az load test create --test-id sample-test-id --load-test-resource sample-alt-resource --resource-group sample-rg --display-name "Sample Name" --engine-ref-id-type UserAssigned --engine-ref-ids "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-rg/providers/microsoft.managedidentity/userassignedidentities/sample-mi"
-    - name: Create a test with user assigned Managed Identity reference for accessing the metrics of the configured apps.
-      text: |
-        az load test create --test-id sample-test-id --load-test-resource sample-alt-resource --resource-group sample-rg --display-name "Sample Name" --engine-ref-id-type UserAssigned --metrics-reference-id "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-rg/providers/microsoft.managedidentity/userassignedidentities/sample-mi"
 """
 
 helps[

src/load/azext_load/data_plane/load_test/params.py

@@ -27,9 +27,6 @@ def load_arguments(self, _):
         c.argument(
             "key_vault_reference_identity", argtypes.key_vault_reference_identity
         )
-        c.argument(
-            "metrics_reference_identity", argtypes.metrics_reference_identity, help="The identity that will be used to access the metrics. This will be defaulted to SystemAssigned if not given."
-        )
         c.argument("engine_instances", argtypes.engine_instances)
         c.argument("custom_no_wait", argtypes.custom_no_wait)
         c.argument("disable_public_ip", argtypes.disable_public_ip)
@@ -51,9 +48,6 @@ def load_arguments(self, _):
         c.argument(
             "key_vault_reference_identity", argtypes.key_vault_reference_identity, help="The identity that will be used to access the key vault. Provide `null` or `None` to use the system assigned identity of the load test resource."
         )
-        c.argument(
-            "metrics_reference_identity", argtypes.metrics_reference_identity, help="The identity that will be used to access the metrics. Provide `null` or `None` to use the system assigned identity of the load test resource."
-        )
         c.argument("engine_instances", argtypes.engine_instances)
         c.argument("subnet_id", argtypes.subnet_id)
         c.argument("split_csv", argtypes.split_csv)

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

@@ -129,19 +129,11 @@
 )
 
 key_vault_reference_identity = CLIArgumentType(
-    validator=validators.validate_keyvault_identity_ref_id,
     options_list=["--keyvault-reference-id"],
     type=str,
     help="The identity that will be used to access the key vault.",
 )
 
-metrics_reference_identity = CLIArgumentType(
-    validator=validators.validate_metrics_identity_ref_id,
-    options_list=["--metrics-reference-id"],
-    type=str,
-    help="The identity that will be used to get the metrics of the configured apps from server pass-fail criteria.",
-)
-
 split_csv = CLIArgumentType(
     validator=validators.validate_split_csv,
     options_list=["--split-csv"],

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

@@ -4,7 +4,6 @@
 # --------------------------------------------------------------------------------------------
 
 from dataclasses import dataclass
-from typing import ClassVar
 from .models import AllowedTrendsResponseTimeAggregations
 
 
@@ -25,25 +24,12 @@ class LoadTestConfigKeys:
     AUTOSTOP_ERROR_RATE = "errorPercentage"
     AUTOSTOP_ERROR_RATE_TIME_WINDOW = "timeWindow"
     FAILURE_CRITERIA = "failureCriteria"
-    CLIENT_METRICS_PF = "clientMetrics"
-    SERVER_METRICS_PF = "serverMetrics"
-    METRIC_NAME = "metricName"
-    METRIC_NAME_SERVER_METRICS = "name"
-    METRIC_NAMESPACE_SERVER_METRICS = "namespace"
-    METRIC_NAMESPACE = "metricNamespace"
-    RESOURCEID = "resourceId"
-    AGGREGATION = "aggregation"
-    CONDITION = "condition"
-    APP_COMPONENTS = "appComponents"
-    SERVER_METRICS_APP_COMPONENTS = "metrics"
     REGIONAL_LOADTEST_CONFIG = "regionalLoadTestConfig"
     REGION = "region"
     QUICK_START = "quickStartTest"
     SPLIT_CSV = "splitAllCSVs"
     REFERENCE_IDENTITIES = "referenceIdentities"
     ENGINE = "Engine"
-    METRICS = "Metrics"
-    KEY_VAULT = "KeyVault"
     TYPE = "type"
     KIND = "kind"
     VALUE = "value"
@@ -90,11 +76,3 @@ class LoadTestTrendsKeys:
         AllowedTrendsResponseTimeAggregations.P999.value: "pct999ResTime",
         AllowedTrendsResponseTimeAggregations.P9999.value: "pct9999ResTime",
     }
-
-
-@dataclass
-class LoadTestFailureCriteriaKeys:
-    CONDITION_ENUM_MAP: ClassVar[dict[str, str]] = {
-        "LessThan": "<",
-        "GreaterThan": ">"
-    }