Merge pull request #609 from AutomationSolutionz/lorust-report-enhancements

Lorust report enhancements

Author: sazid

Apps/lorust/lorust_Darwin_arm64.exe

@@ -61,6 +61,14 @@ def lorust_performance_action_handler(
                         for i in range(l, r+1):
                             actions_to_execute.append(i-1) #[9,10,11,12,13,14]
 
+        if max_tasks is None:
+            CommonUtil.ExecLog(
+                sModuleInfo,
+                "`max tasks` parameter is missing",
+                3,
+            )
+            return "zuez_failed"
+
         def find_row_by(
                 action: List[List[str]],
                 left: str | None = None,
@@ -86,7 +94,8 @@ def find_row_by(
         load_gen_function = {
             "spawn_rate": spawn_rate,
             "timeout": timeout,
-            "functions_to_execute": []
+            "max_tasks": max_tasks,
+            "functions_to_execute": [],
         }
         flow = {
             "functions": [
@@ -213,8 +222,12 @@ def find_row_by(
         metrics_output_path = save_path / "lorust_performance_report"
         metrics_output_path.mkdir(parents=True, exist_ok=True)
 
-        flow_save_path = metrics_output_path / "flow.json"
-        metrics_output_json_path = metrics_output_path / "http.json"
+        step_no: int = CommonUtil.current_step_sequence # type: ignore
+        action_no: int = CommonUtil.current_action_no # type: ignore
+        tc_id: str = CommonUtil.current_tc_no
+        file_name_prefix = f"{tc_id}_STEP-{step_no}_ACTION-{action_no}"
+        flow_save_path = metrics_output_path / f"{file_name_prefix}_flow.json"
+        metrics_output_json_path = metrics_output_path / f"{file_name_prefix}_http.json"
 
         # Save the flow configuration
         with open(flow_save_path, "w") as f:
@@ -237,11 +250,16 @@ def find_row_by(
         binary_name = f"lorust_{uname.system}_{uname.machine}.exe"
         lorust_path = lorust_path / binary_name
 
-        subprocess.run(' '.join([
-            str(lorust_path),
-            f"--output-path {metrics_output_path}",
-            f"--flow-path {flow_save_path}",
-        ]), shell=True)
+        subprocess.run(
+            " ".join(
+                [
+                    str(lorust_path),
+                    f"--output-path {metrics_output_json_path}",
+                    f"--flow-path {flow_save_path}",
+                ]
+            ),
+            shell=True,
+        )
 
         testendtime = time.perf_counter()
         duration = testendtime - teststarttime
@@ -296,7 +314,7 @@ def create_html_report(
 
     step_no: int = CommonUtil.current_step_sequence # type: ignore
     action_no: int = CommonUtil.current_action_no # type: ignore
-    file_name = report_save_path / f"{tc_id}_STEP-{step_no}_ACTION-{action_no}.html"
+    file_name = report_save_path / f"{tc_id}_STEP-{step_no}_ACTION-{action_no}_report.html"
 
     with open(file_name, "w", encoding="utf-8") as file:
         file.write(html)

Apps/lorust/lorust_Linux_aarch64.exe

@@ -137,10 +137,10 @@ def login():
     return data, r.status_code
 
 
-def form_uri(resource_path):
+def form_uri(resource_path: str | None = None) -> str:
     web_server_address = ConfigModule.get_config_value(AUTHENTICATION_CATEGORY, SERVER_ADDRESS_TAG)
     base_server_address = web_server_address
-    if len(resource_path) > 0:
+    if resource_path and len(resource_path) > 0:
         if resource_path[0] == "/":
             resource_path = resource_path[1:]
         base_server_address += "/" + resource_path