ft-orchestration fix sim_threshold result and add test id in html report name

Author: pascal260303

tools/ft-orchestration/src/common/html_report_plugin.py

@@ -16,7 +16,7 @@
 from pytest_html.plugin import HTMLReport
 from ftanalyzer.reports import ValidationReportSummary
 from py.xml import html  # type: ignore
-from src.config.scenario import ScenarioCfg
+from src.config.scenario import ScenarioCfg, SimulationScenario
 
 
 class SimulationTestsSummary:
@@ -332,6 +332,8 @@ def pytest_runtest_makereport(item: pytest.Function) -> None:  # type: ignore
             if not isinstance(scenario, ScenarioCfg):
                 raise ValueError
             report.test_name = scenario.name
+            if isinstance(scenario, SimulationScenario) and scenario.test:
+                report.test_name += " " + scenario.test.id
             report.test_description = scenario.description
         except (AttributeError, ValueError):
             report.test_name = ""

tools/ft-orchestration/tests/simulation/test_simulation_threshold.py

@@ -342,16 +342,16 @@ def run_single_test(loops: int, speed: MbpsSpeed) -> tuple[bool, StatisticalRepo
         objects_to_cleanup = []
         gc.collect()
 
-    passed = scenario.test.mbps_required <= speed_min
+    passed = scenario.test.mbps_required <= speed_current
     report.print_results()
     HTMLReportData.simulation_summary_report.update_stats("sim_threshold", passed)
 
     logging.getLogger().info(
         "maximum throughput: %s Mbps (accuracy: %s Mbps)",
-        speed_min,
+        speed_current,
         scenario.test.mbps_accuracy,
     )
-    if passed:
+    if not passed:
         pytest.xfail(
-            f"throughput ({speed_min} Mbps) is less than required ({scenario.test.mbps_required} Mbps)"
+            f"throughput ({speed_current} Mbps) is less than required ({scenario.test.mbps_required} Mbps)"
         )