[az load] fix empty object on cli when file upload (#8148)

* fix empty object on cli when file upload * add terminal state NOT_VALIDATED * update history.rst
Azure · Oct 18, 2024 · 8f8028e · 8f8028e
1 parent adf3781
commit 8f8028e
Show file tree

Hide file tree

Showing 27 changed files with 7,491 additions and 8,127 deletions.
diff --git a/src/load/HISTORY.rst b/src/load/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+1.1.1
+++++++
+* Fix empty response object on CLI when using 'az load test file upload'
+* Add 'NOT_VALIDATED' as a terminal status for File Validation
+
 1.1.0
 ++++++
 * Add support for ZIP artifacts upload to a test. Artifacts can be uploaded through YAML config when using --load-test-config-file and through cmd `az load test file upload`, the associate --file-type is `ZIPPED_ARTIFACTS`

diff --git a/src/load/azext_load/data_plane/load_test/custom.py b/src/load/azext_load/data_plane/load_test/custom.py
@@ -386,7 +386,7 @@ def upload_test_file(
     )
     logger.debug("Upload test file response: %s", response)
     logger.info("Upload test file completed")
-    return response
+    return response.as_dict()
 
 
 def list_test_file(

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_scenarios.yaml b/src/load/azext_load/tests/latest/recordings/test_load_scenarios.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/azext_load/tests/latest/test_load_test.py b/src/load/azext_load/tests/latest/test_load_test.py
@@ -886,15 +886,15 @@ def test_load_test_file(self):
             "file_type": LoadTestConstants.ZIP_ARTIFACT_TYPE,
             "file_path": LoadTestConstants.ZIP_ARTIFACT_FILE
         })
-        self.cmd(
+        response = self.cmd(
             "az load test file upload "
             "--test-id {test_id} "
             "--load-test-resource {load_test_resource} "
             "--resource-group {resource_group} "
             "--file-type {file_type} "
             '--path "{file_path}" '
-        )
-        time.sleep(10)
+        ).get_output_in_json()
+        assert self.kwargs["file_name"] == response["fileName"]
         files = self.cmd(
             "az load test file list "
             "--test-id {test_id} "

diff --git a/src/load/azext_load/vendored_sdks/loadtesting/_operations/_patch.py b/src/load/azext_load/vendored_sdks/loadtesting/_operations/_patch.py
@@ -81,6 +81,7 @@ def __init__(self, interval=5) -> None:
         self._polling_interval = interval
         self._status = None
         self._termination_statuses = [
+            "NOT_VALIDATED",
             "VALIDATION_SUCCESS",
             "VALIDATION_FAILED",
             "VALIDATION_NOT_REQUIRED",

diff --git a/src/load/setup.py b/src/load/setup.py
@@ -10,7 +10,7 @@
 
 
 # HISTORY.rst entry.
-VERSION = '1.1.0'
+VERSION = '1.1.1'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers