feat(tests): integrate with xcp-ng fixtures

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

Author: Millefeuille42

tests/storage/benchmarks/conftest.py

@@ -3,46 +3,99 @@
 import os
 import logging
 
-from helpers import load_results_from_csv
+from lib.commands import SSHCommandFailed
+from .helpers import load_results_from_csv
 
-@pytest.fixture(scope='package')
-def ext_sr(host, sr_disk):
-    sr = host.sr_create('ext', "EXT-local-SR-test", {'device': '/dev/' + sr_disk})
-    yield sr
-    # teardown
-    sr.destroy()
-
-@pytest.fixture(scope='module', params=['raw', 'vhd', 'qcow2'])
-def disk_on_ext_sr(request, ext_sr):
-    disk_type = request.param
-    disk = {}
-    if disk_type == 'raw':
-        ...
-    elif disk_type == 'vhd':
-        ...
-    elif disk_type == 'qcow2':
-        ...
+MAX_LENGTH = 64*(1024**3) # 64GiB
+
+# use vhd, qcow2, raw... when image_format support will be available
+@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")
+    )
+
+    for check_cmd, install_cmd, remove in install_cmds:
+        try:
+            vm.ssh(check_cmd, check=True)
+            logging.info(f">> Installing fio with {install_cmd}")
+            vm.ssh(install_cmd, check=True)
+            remove_cmd = remove
+            break
+        except SSHCommandFailed: ...
     else:
-        raise ValueError(f"Unsupported disk type: {disk_type}")
+        raise RuntimeError("Unsupported package manager: could not install fio")
 
-    yield disk
+    yield vm
 
     # teardown
-    ...
+    logging.info(f"<< Removing fio with {remove_cmd}")
+    vm.ssh(remove_cmd, check=False)
+
+
+@pytest.fixture(scope="module")
+def vdi_on_local_sr(host, local_sr_on_hostA1, image_format):
+    sr = local_sr_on_hostA1
+    vdi = sr.create_vdi("testVDI", MAX_LENGTH)
+    vdi.image_format = image_format
+    logging.info(f">> Created VDI {vdi.uuid} of type {image_format}")
+
+    yield vdi
+
+    # teardown
+    logging.info(f"<< Destroying VDI {vdi.uuid}")
+    vdi.destroy()
+
+@pytest.fixture(scope="module")
+def running_unix_vm_and_vbd(host, vdi_on_local_sr, running_unix_vm_with_fio):
+    vm = running_unix_vm_with_fio
+    vdi = vdi_on_local_sr
+    vbd = vm.create_vbd("autodetect", vdi.uuid)
+
+    logging.info(f">> Plugging VDI {vdi.uuid} on VM {vm.uuid}")
+    vbd.plug()
+
+    yield vm, vbd
 
-@pytest.fixture(scope='module')
-def vm_on_ext_sr(host, ext_sr, vm_ref):
-    vm = host.import_vm(vm_ref, sr_uuid=ext_sr.uuid)
-    yield vm
     # teardown
-    logging.info("<< Destroy VM")
-    vm.destroy(verify=True)
+    logging.info(f"<< Unplugging VDI {vdi.uuid} from VM {vm.uuid}")
+    vbd.unplug()
+    vbd.destroy()
+
+@pytest.fixture(scope="module")
+def vm_with_vbd(running_unix_vm_and_vbd):
+    vm, _vbd = running_unix_vm_and_vbd
+    return vm
+
+@pytest.fixture(scope="module")
+def plugged_vbd(running_unix_vm_and_vbd):
+    _vm, vbd = running_unix_vm_and_vbd
+    return vbd
 
-@pytest.fixture
-def temp_dir():
+@pytest.fixture(scope="module")
+def local_temp_dir():
     with tempfile.TemporaryDirectory() as tmpdir:
         yield tmpdir
 
+@pytest.fixture(scope="module")
+def temp_dir(vm_with_vbd):
+    vm = vm_with_vbd
+    tempdir = vm.ssh("mktemp -d")
+
+    yield tempdir
+
+    # teardown
+    vm.ssh(f"rm -r {tempdir}")
+
+
 def pytest_addoption(parser):
     parser.addoption(
         "--prev-csv",

tests/storage/benchmarks/test_disk_perf.py

@@ -2,12 +2,12 @@
 import os
 import json
 import statistics
-import subprocess
 import pytest
 import logging
 from datetime import datetime
 
-from helpers import load_results_from_csv, log_result_csv, mean
+from lib.commands import SSHCommandFailed
+from .helpers import load_results_from_csv, log_result_csv, mean
 
 ### Tests default settings ###
 
@@ -32,25 +32,21 @@
         "randwrite"
 )
 
-test_types = {
-    "read": "seq_read",
-    "randread": "rand_read",
-    "write": "seq_write",
-    "randwrite": "rand_write"
-}
-
 ### 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,
         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")
     if not file_path:
         file_path = os.path.join(temp_dir, DEFAULT_FILE)
     fio_cmd = [
@@ -69,12 +65,14 @@ def run_fio(
         "--output-format=json",
         f"--output={json_output_path}"
     ]
-
-    result = subprocess.run(fio_cmd, capture_output=True, text=True)
-    if result.returncode != 0:
-        raise RuntimeError(f"fio failed for {test_name}:\n{result.stderr}")
-
-    with open(json_output_path) as f:
+    logging.debug(f"Running {fio_cmd}")
+    try:
+        vm.ssh(fio_cmd, check=True)
+    except SSHCommandFailed as e:
+        raise RuntimeError(f"fio failed for {test_name}:{e}")
+    vm.scp(json_output_path, local_json_path, local_dest=True)
+    logging.debug(f"Stored json at {local_json_path}")
+    with open(local_json_path) as f:
         return json.load(f)
 
 def assert_performance_not_degraded(current, previous, threshold=10):
@@ -107,14 +105,36 @@ class TestDiskPerf:
     def test_disk_benchmark(
             self,
             temp_dir,
+            local_temp_dir,
             prev_results,
             block_size,
             file_size,
-            rw_mode
+            rw_mode,
+            vm_with_vbd,
+            plugged_vbd,
+            image_format
     ):
-        test_type = test_types[rw_mode]
+        vm = vm_with_vbd
+        vbd = plugged_vbd
+        device = f"/dev/{vbd.param_get(param_name="device")}"
+        test_type = "{}-{}-{}-{}".format(
+            block_size,
+            file_size,
+            rw_mode,
+            image_format
+        )
+
         for i in range(DEFAULT_SAMPLES_NUM):
-            result = run_fio(test_type, rw_mode, temp_dir)
+            result = run_fio(
+                vm,
+                test_type,
+                rw_mode,
+                temp_dir,
+                local_temp_dir,
+                file_path=device,
+                bs=block_size,
+                size=file_size
+            )
             summary = log_result_csv(test_type, rw_mode, result, CSV_FILE)
             assert summary["IOPS"] > 0
         results = load_results_from_csv(CSV_FILE)