feat(disk_perf): add support of uri for previous csv file

- style(disk_perf): sort imports and minor style fixes

Signed-off-by: Mathieu Labourier <[email protected]>

Author: Millefeuille42

tests/storage/benchmarks/conftest.py

@@ -1,26 +1,33 @@
-import pytest
-import tempfile
-import os
 import logging
+import os
+import tempfile
+import urllib.request
+from urllib.parse import urlparse
+from uuid import uuid4
+
+import pytest
 
 from lib.commands import SSHCommandFailed
+
 from .helpers import load_results_from_csv
 
-MAX_LENGTH = 64 * (1024**3) # 64GiB
+MAX_LENGTH = 64 * (1024**3)  # 64GiB
+
 
 # use vhd, qcow2, raw... when image_format support will be available
-@pytest.fixture(scope="module", params=['vdi'])
+@pytest.fixture(scope="module", params=["vdi"])
 def image_format(request):
     return request.param
 
+
 @pytest.fixture(scope="module")
 def running_unix_vm_with_fio(running_unix_vm):
     vm = running_unix_vm
     install_cmds = (
         ("command -v apt", "apt update && apt install -y fio", "apt remove -y fio"),
         ("command -v dnf", "dnf install -y fio", "dnf remove -y fio"),
         ("command -v yum", "yum install -y fio", "yum remove -y fio"),
-        ("command -v apk", "apk add fio", "apk del fio")
+        ("command -v apk", "apk add fio", "apk del fio"),
     )
 
     for check_cmd, install_cmd, remove in install_cmds:
@@ -55,6 +62,7 @@ def vdi_on_local_sr(host, local_sr_on_hostA1, image_format):
     logging.info(f"<< Destroying VDI {vdi.uuid}")
     vdi.destroy()
 
+
 @pytest.fixture(scope="module")
 def plugged_vbd(vdi_on_local_sr, running_unix_vm_with_fio):
     vm = running_unix_vm_with_fio
@@ -71,11 +79,13 @@ def plugged_vbd(vdi_on_local_sr, running_unix_vm_with_fio):
     vbd.unplug()
     vbd.destroy()
 
+
 @pytest.fixture(scope="module")
 def local_temp_dir():
     with tempfile.TemporaryDirectory() as tmpdir:
         yield tmpdir
 
+
 @pytest.fixture(scope="module")
 def temp_dir(running_unix_vm_with_fio):
     vm = running_unix_vm_with_fio
@@ -92,13 +102,19 @@ def pytest_addoption(parser):
         "--prev-csv",
         action="store",
         default=None,
-        help="Path to previous CSV results file for comparison",
+        help="Path/URI to previous CSV results file for comparison",
     )
 
+
 @pytest.fixture(scope="session")
-def prev_results(request):
-    csv_path = request.config.getoption("--prev-csv")
-    results = {}
-    if csv_path and os.path.exists(csv_path):
-        load_results_from_csv(csv_path)
-    return results
+def prev_results(pytestconfig):
+    csv_uri = pytestconfig.getoption("--prev-csv")
+    if not csv_uri:
+        return {}
+    csv_path = csv_uri
+    if urlparse(csv_uri).scheme != "":
+        csv_path = f"{uuid4()}.csv"
+        urllib.request.urlretrieve(csv_uri, csv_path)
+    if not os.path.exists(csv_path):
+        raise FileNotFoundError(csv_path)
+    return load_results_from_csv(csv_path)

tests/storage/benchmarks/helpers.py

@@ -1,6 +1,6 @@
+import csv
 import os
 import statistics
-import csv
 from datetime import datetime
 
 
@@ -43,6 +43,4 @@ def load_results_from_csv(csv_path):
 
 
 def mean(data, key):
-    return statistics.mean(
-        [float(x[key]) for x in data if key in x]
-    )
+    return statistics.mean([float(x[key]) for x in data if key in x])

tests/storage/benchmarks/test_disk_perf.py

@@ -1,12 +1,14 @@
 import itertools
-import os
 import json
-import statistics
-import pytest
 import logging
+import os
+import statistics
 from datetime import datetime
 
+import pytest
+
 from lib.commands import SSHCommandFailed
+
 from .helpers import load_results_from_csv, log_result_csv, mean
 
 # Tests default settings #
@@ -22,31 +24,27 @@
 
 # Tests parameters #
 
-system_memory = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES')
+system_memory = os.sysconf("SC_PAGE_SIZE") * os.sysconf("SC_PHYS_PAGES")
 
 block_sizes = ("4k", "16k", "64k", "1M")
 file_sizes = ("1G", "4G", f"{int((system_memory // (1024.**3)) * 2)}G")
 
-modes = (
-    "read",
-    "randread",
-    "write",
-    "randwrite"
-)
+modes = ("read", "randread", "write", "randwrite")
 
 # End of tests parameters #
 
+
 def run_fio(
-        vm,
-        test_name,
-        rw_mode,
-        temp_dir,
-        local_temp_dir,
-        bs=DEFAULT_BS,
-        iodepth=DEFAULT_IODEPTH,
-        size=DEFAULT_SIZE,
-        numjobs=DEFAULT_NUMJOBS,
-        file_path="",
+    vm,
+    test_name,
+    rw_mode,
+    temp_dir,
+    local_temp_dir,
+    bs=DEFAULT_BS,
+    iodepth=DEFAULT_IODEPTH,
+    size=DEFAULT_SIZE,
+    numjobs=DEFAULT_NUMJOBS,
+    file_path="",
 ):
     json_output_path = os.path.join(temp_dir, f"{test_name}.json")
     local_json_path = os.path.join(local_temp_dir, f"{test_name}.json")
@@ -66,7 +64,7 @@ def run_fio(
         f"--numjobs={numjobs}",
         "--group_reporting",
         "--output-format=json",
-        f"--output={json_output_path}"
+        f"--output={json_output_path}",
     ]
     logging.debug(f"Running {fio_cmd}")
     try:
@@ -78,6 +76,7 @@ def run_fio(
     with open(local_json_path) as f:
         return json.load(f)
 
+
 def assert_performance_not_degraded(current, previous, threshold=10):
     diffs = {}
     for metric in ("bw_MBps", "IOPS", "latency"):
@@ -88,8 +87,9 @@ def assert_performance_not_degraded(current, previous, threshold=10):
             logging.info(f"Missing metric ({metric}), skipping comparison")
             continue
         diff = (curr - prev if metric == "latency" else prev - curr) / (prev * 100)
-        assert diff <= threshold, \
-            f"{metric} changed by {diff:.2f}% (allowed {threshold}%)"
+        assert (
+            diff <= threshold
+        ), f"{metric} changed by {diff:.2f}% (allowed {threshold}%)"
         diffs[metric] = diff
 
     logging.info("Performance difference summary:")
@@ -103,26 +103,21 @@ class TestDiskPerf:
 
     @pytest.mark.parametrize("block_size,file_size,rw_mode", test_cases)
     def test_disk_benchmark(
-            self,
-            temp_dir,
-            local_temp_dir,
-            prev_results,
-            block_size,
-            file_size,
-            rw_mode,
-            running_unix_vm_with_fio,
-            plugged_vbd,
-            image_format
+        self,
+        temp_dir,
+        local_temp_dir,
+        prev_results,
+        block_size,
+        file_size,
+        rw_mode,
+        running_unix_vm_with_fio,
+        plugged_vbd,
+        image_format,
     ):
         vm = running_unix_vm_with_fio
         vbd = plugged_vbd
         device = f"/dev/{vbd.param_get(param_name='device')}"
-        test_type = "{}-{}-{}-{}".format(
-            block_size,
-            file_size,
-            rw_mode,
-            image_format
-        )
+        test_type = "{}-{}-{}-{}".format(block_size, file_size, rw_mode, image_format)
 
         for i in range(DEFAULT_SAMPLES_NUM):
             result = run_fio(
@@ -133,7 +128,7 @@ def test_disk_benchmark(
                 local_temp_dir,
                 file_path=device,
                 bs=block_size,
-                size=file_size
+                size=file_size,
             )
             summary = log_result_csv(test_type, rw_mode, result, CSV_FILE)
             assert summary["IOPS"] > 0