Draft PR

Signed-off-by: pintojoy <[email protected]>
red-hat-storage · May 22, 2024 · 1d4615d · 1d4615d
1 parent af39d35
commit 1d4615d
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/tests/cross_functional/performance/io_workload/test_fio_benchmark.py b/tests/cross_functional/performance/io_workload/test_fio_benchmark.py
@@ -194,7 +194,7 @@ def setting_storage_usage(self):
         log.info("Setting prefill value to False ")
         self.crd_data["spec"]["workload"]["args"]["prefill"] = False
 
-    def setting_io_pattern(self, io_pattern):
+    def setting_io_pattern(self, io_pattern, op):
         """
         Setting the test jobs according to the io pattern - random / sequential
 
@@ -205,10 +205,7 @@ def setting_io_pattern(self, io_pattern):
         if io_pattern == "sequential":
             self.crd_data["spec"]["workload"]["args"]["jobs"] = ["read"]
         if io_pattern == "random":
-            self.crd_data["spec"]["workload"]["args"]["jobs"] = [
-                "randwrite",
-                "randread",
-            ]
+            self.crd_data["spec"]["workload"]["args"]["jobs"] = [op]
 
     def init_full_results(self, full_results):
         """
@@ -378,27 +375,27 @@ def setup_internal_es(self):
                     self.es = None
 
     @pytest.mark.parametrize(
-        argnames=["interface", "io_pattern"],
+        argnames=["interface", "io_pattern", "op"],
         argvalues=[
             pytest.param(
-                *[constants.CEPHBLOCKPOOL, "sequential"],
-                marks=pytest.mark.polarion_id("OCS-844"),
+                *[constants.CEPHBLOCKPOOL, "random", "randread"],
+                marks=pytest.mark.polarion_id("OCS-846"),
             ),
             pytest.param(
-                *[constants.CEPHFILESYSTEM, "sequential"],
-                marks=pytest.mark.polarion_id("OCS-845"),
+                *[constants.CEPHFILESYSTEM, "random", "randwrite"],
+                marks=pytest.mark.polarion_id("OCS-847"),
             ),
             pytest.param(
-                *[constants.CEPHBLOCKPOOL, "random"],
+                *[constants.CEPHBLOCKPOOL, "random", "randwrite"],
                 marks=pytest.mark.polarion_id("OCS-846"),
             ),
             pytest.param(
-                *[constants.CEPHFILESYSTEM, "random"],
+                *[constants.CEPHFILESYSTEM, "random", "randread"],
                 marks=pytest.mark.polarion_id("OCS-847"),
             ),
         ],
     )
-    def test_fio_workload_simple(self, interface, io_pattern):
+    def test_fio_workload_simple(self, interface, io_pattern, op):
         """
         This is a basic fio perf test - non-compressed volumes
 
@@ -437,7 +434,7 @@ def test_fio_workload_simple(self, interface, io_pattern):
 
         self.get_env_info()
 
-        self.setting_io_pattern(io_pattern)
+        self.setting_io_pattern(io_pattern, op)
 
         self.run()