ceph-devstack 0.2.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

ceph_devstack/__init__.py

@@ -50,6 +50,8 @@ def parse_args(args: List[str]) -> argparse.Namespace:
     parser_config_set = subparsers_config.add_parser("set")
     parser_config_set.add_argument("name")
     parser_config_set.add_argument("value")
+    parser_config_unset = subparsers_config.add_parser("unset")
+    parser_config_unset.add_argument("name")
     parser_doc = subparsers.add_parser(
         "doctor", help="Check that the system meets requirements"
     )
@@ -129,6 +131,8 @@ class Config(dict):
     __slots__ = ["user_obj", "user_path"]
 
     def load(self, config_path: Path | None = None):
+        args = self.get("args")
+        self.clear()
         parsed = tomlkit.parse((Path(__file__).parent / "config.toml").read_text())
         self.update(parsed)
         if config_path:
@@ -140,6 +144,8 @@ class Config(dict):
                 raise OSError(f"Config file at {self.user_path} not found!")
             else:
                 self.user_obj = {}
+        if args:
+            self["args"] = args
 
     def dump(self):
         return tomlkit.dumps(self)
@@ -153,14 +159,14 @@ class Config(dict):
             try:
                 obj = obj[sub_path]
             except KeyError:
-                logger.error(f"{name} not found in config")
-                raise
+                logger.debug(f"{name} not found in config")
+                return ""
             i += 1
         if isinstance(obj, (str, int, bool)):
             return str(obj)
         return tomlkit.dumps(obj).strip()
 
-    def set_value(self, name: str, value: str) -> None:
+    def set_value(self, name: str, value: str) -> str:
         path = name.split(".")
         obj = self.user_obj
         i = 0
@@ -181,6 +187,25 @@ class Config(dict):
                 self.user_path.parent.mkdir(exist_ok=True)
                 self.user_path.write_text(tomlkit.dumps(self.user_obj).strip())
             i += 1
+        return str(item)
+
+    def unset_value(self, name: str) -> None:
+        path = name.split(".")
+        obj = self.user_obj
+        i = 0
+        last_index = len(path) - 1
+        while i <= last_index:
+            if i < last_index:
+                if path[i] not in obj:
+                    break
+                obj = obj[path[i]]
+            elif i == last_index:
+                obj.pop(path[i])
+                self.update(self.user_obj)
+                self.user_path.parent.mkdir(exist_ok=True)
+                self.user_path.write_text(tomlkit.dumps(self.user_obj).strip())
+            i += 1
+        self.load(self.user_path)
 
 
 config = Config()

ceph_devstack/cli.py

@@ -12,6 +12,7 @@ CONFIG_HANDLERS = {
     "dump": lambda config, args: print(config.dump()),
     "get": lambda config, args: print(config.get_value(args.name)),
     "set": lambda config, args: print(config.set_value(args.name, args.value)),
+    "unset": lambda config, args: config.unset_value(args.name),
 }
 
 COMMAND_HANDLERS = {

ceph_devstack/resources/ceph/__init__.py

@@ -24,8 +24,7 @@ from ceph_devstack.resources.ceph.requirements import (
     LoopControlDeviceWriteable,
     SELinuxModule,
 )
-from ceph_devstack.resources.ceph.utils import get_most_recent_run, get_job_id
-from ceph_devstack.resources.ceph.exceptions import TooManyJobsFound
+from ceph_devstack.resources.ceph.utils import get_runs, get_jobs
 
 
 class SSHKeyPair(Secret):
@@ -236,29 +235,31 @@ class CephDevStack:
             log_file = self.get_log_file(run_name, job_id)
         except FileNotFoundError:
             logger.error("No log file found")
-        except TooManyJobsFound as e:
-            msg = "Found too many jobs ({jobs}) for target run. Please pick a job id with -j option.".format(
-                jobs=", ".join(e.jobs)
-            )
-            logger.error(msg)
         else:
             if locate:
-                print(log_file)
+                print(str(log_file).replace(str(pathlib.Path.home()), "~"))
             else:
                 buffer_size = 8 * 1024
                 with open(log_file) as f:
                     while chunk := f.read(buffer_size):
                         print(chunk, end="")
 
-    def get_log_file(self, run_name: str = "", job_id: str = ""):
-        archive_dir = Teuthology().archive_dir.expanduser()
+    def get_log_file(self, run_name: str = "", job_id: str = "") -> pathlib.Path:
+        archive_dir = Teuthology().archive_dir
 
         if not run_name:
-            run_name = get_most_recent_run(os.listdir(archive_dir))
-        run_dir = archive_dir.joinpath(run_name)
+            runs = get_runs(archive_dir)
+            if not runs:
+                raise FileNotFoundError
+            run_dir = runs[0]
+        else:
+            run_dir = archive_dir.joinpath(run_name)
 
         if not job_id:
-            job_id = get_job_id(os.listdir(run_dir))
+            jobs = get_jobs(run_dir)
+            if not jobs:
+                raise FileNotFoundError
+            job_id = jobs[0].name
 
         log_file = run_dir.joinpath(job_id, "teuthology.log")
         if not log_file.exists():

ceph_devstack/resources/ceph/containers.py

@@ -411,7 +411,7 @@ class Teuthology(Container):
     }
 
     @property
-    def archive_dir(self):
+    def archive_dir(self) -> Path:
         return Path(config["data_dir"]) / "archive"
 
     async def create(self):

ceph_devstack/resources/ceph/utils.py

@@ -1,7 +1,7 @@
+import pathlib
 import re
 from datetime import datetime
-
-from ceph_devstack.resources.ceph.exceptions import TooManyJobsFound
+from typing import List
 
 RUN_DIRNAME_PATTERN = re.compile(
     r"^(?P<username>^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}))-(?P<timestamp>\d{4}-\d{2}-\d{2}_\d{2}:\d{2}:\d{2})"
@@ -14,32 +14,25 @@ def get_logtimestamp(dirname: str) -> datetime:
     return datetime.strptime(match_.group("timestamp"), "%Y-%m-%d_%H:%M:%S")
 
 
-def get_most_recent_run(runs: list[str]) -> str:
-    try:
-        run_name = next(
-            iter(
-                sorted(
-                    (
-                        dirname
-                        for dirname in runs
-                        if RUN_DIRNAME_PATTERN.search(dirname)
-                    ),
-                    key=lambda dirname: get_logtimestamp(dirname),
-                    reverse=True,
-                )
-            )
-        )
-        return run_name
-    except StopIteration as e:
-        raise FileNotFoundError from e
-
-
-def get_job_id(jobs: list[str]):
-    job_dir_pattern = re.compile(r"^\d+$")
-    dirs = [d for d in jobs if job_dir_pattern.match(d)]
-
-    if len(dirs) == 0:
-        raise FileNotFoundError
-    elif len(dirs) > 1:
-        raise TooManyJobsFound(dirs)
-    return dirs[0]
+def get_runs(directory: pathlib.Path) -> List[pathlib.Path]:
+    return sorted(
+        (
+            dir_
+            for dir_ in directory.expanduser().absolute().iterdir()
+            if RUN_DIRNAME_PATTERN.search(dir_.name)
+        ),
+        key=lambda dir_: dir_.stat().st_mtime,
+        reverse=True,
+    )
+
+
+def get_jobs(directory: pathlib.Path) -> List[pathlib.Path]:
+    return sorted(
+        (
+            dir_
+            for dir_ in directory.expanduser().absolute().iterdir()
+            if str(dir_.name).isdigit()
+        ),
+        key=lambda dir_: dir_.stat().st_mtime,
+        reverse=True,
+    )

{ceph_devstack-0.2.2.dist-info → ceph_devstack-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ceph-devstack
-Version: 0.2.2
+Version: 0.3.0
 Summary: Run a full teuthology lab on your laptop!
 Author-email: Zack Cerza <zack@cerza.org>
 License-Expression: MIT
@@ -11,7 +11,7 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: packaging

{ceph_devstack-0.2.2.dist-info → ceph_devstack-0.3.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 ceph_devstack/Dockerfile.selinux,sha256=5i8leCmaa5Hx8w4zIZcLoq7aTbxxwee44e2phWY7_zY,497
-ceph_devstack/__init__.py,sha256=16mCW0UIlCWviTfBOKtWtE6G36xgaYpnno7QjUC2Eg8,6012
+ceph_devstack/__init__.py,sha256=P5ySWtncR-pkxC8ju6xZUrU6ClnjLSANgkDPftkkEdU,6870
 ceph_devstack/ceph_devstack.pp,sha256=kiVP5xcwYigjKlNoGHVh2PwPKvr6HZZl5NyjY31jXWM,14537
 ceph_devstack/ceph_devstack.te,sha256=68i9sBb1TAEnCJn2JtyM-ECzPSuZck4vKoymcTbptXc,3461
-ceph_devstack/cli.py,sha256=lSYwXrwfP8D-k60XuwSqhwZSZNKJFFQfvRM-av1rePM,2057
+ceph_devstack/cli.py,sha256=Tl4rQXKt61TPGEJSS9rgs2ycRGo6sBGthDu-7V_u-C8,2122
 ceph_devstack/config.toml,sha256=HsxO3FhwZkHomde69QfElztuN8U1bxk7cQk1_iWB4w0,562
 ceph_devstack/exec.py,sha256=gn95GEQttB6xgdWXXvTsxUxcQsx9TUu6PC8QVQ0_Y7w,2674
 ceph_devstack/host.py,sha256=w_Hx912y1g62yXkTuPJsw_UdUwxJr_Pbxrj8iZtEP7Y,5470
@@ -12,33 +12,34 @@ ceph_devstack/requirements.py,sha256=aE7PjSdcNuD1no12anidTZhjlYxEig8O0iatlz8EeHw
 ceph_devstack/resources/__init__.py,sha256=D0vhJBU9Pqslq7hg2qreW_ZhndcRIOHZVVUA0zAIeDM,3386
 ceph_devstack/resources/container.py,sha256=suJNOQ9fMRfCnXQwvEZOcg4jnPtrxb-d17a3Y1s1xG0,5388
 ceph_devstack/resources/misc.py,sha256=iGD_3Xsqako-dOZrHJFEJbMWoQIzy7Q_KkEnkdBb8m0,552
-ceph_devstack/resources/ceph/__init__.py,sha256=EAm6dJZ9Hq7HoA2TeInsBd12YnI_zxqHOL_gBoE0IMQ,9265
-ceph_devstack/resources/ceph/containers.py,sha256=3QEwkh3I7f3r47SnlnMB-_mU8fYGR08WyUrrbdohmto,11494
-ceph_devstack/resources/ceph/exceptions.py,sha256=C4ldyEA7Cukp-QUOwL-MnQ8kpgMDIQ6r_JQe0E9q4eM,101
+ceph_devstack/resources/ceph/__init__.py,sha256=8XqvUiHE5CPHT0ZZ46lyMWss0YqOzgowWMgPl31fElw,9168
+ceph_devstack/resources/ceph/containers.py,sha256=s_YiiiyJS-URHNf_BANMCnDUirJkzrjyzJjOZuKXMQA,11502
 ceph_devstack/resources/ceph/requirements.py,sha256=ZJt7Eeb5y2bOc7dJN3-15ftAyySi80phD7erBsGdqSU,2691
-ceph_devstack/resources/ceph/utils.py,sha256=6-1sageEiLMcx53KHo_GKlIjaGw3swoZk8cQ-e-tDP0,1276
-ceph_devstack-0.2.2.dist-info/licenses/LICENSE,sha256=bFeYufyeS1qw0W8pkW1Wj09F2itqX7TAGTnA2NIpApU,1067
+ceph_devstack/resources/ceph/utils.py,sha256=q82WsEij-D4JVTiLvJmbM1G6ZOuDNI5kIy0wMqkyRQI,1045
+ceph_devstack-0.3.0.dist-info/licenses/LICENSE,sha256=bFeYufyeS1qw0W8pkW1Wj09F2itqX7TAGTnA2NIpApU,1067
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/conftest.py,sha256=qulfsMZz3PyAFMdWQ_VWpOFT9L_BiavRax_yQF2Ne24,128
-tests/test_config.py,sha256=RLAjt9DAcAo8GQXgv9dc3Ka3hhtongMs6ioz5YQwKhY,4394
+tests/conftest.py,sha256=qHW1Mjr3UtyP7SOPkfZiDfd-6aGcYswWRzahqGLvmb4,1300
+tests/test_config.py,sha256=yXkabts7UK73PZm4sPXPLqK5K8cD1r8RgxFOHz7r2Lk,4338
 tests/test_deep_merge.py,sha256=IP9zzCThmhVghl9XjAAiSrKsPdouH3KbEUaKq8n3Soc,2178
 tests/test_parse_args.py,sha256=2JDAT4Id88Ywl5QmiUHqq5IDGm_j5Yl3Kk7pbl3sOEk,7550
-tests/test_requirements_core.py,sha256=MnhENRBFQkhIYD9sI1HBYBEocqiDBChRw7bOuSI-kPk,20089
+tests/test_requirements_core.py,sha256=p3Nw2nyq5lfuyDyifoC6t4Fls3RrH5IOYSM_nF0N8JA,20390
 tests/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/resources/test_container.py,sha256=Xc4IGLf0PViSBIhUQXZHZQtRc-uI2R3PyNjU8lpX6BE,9081
-tests/resources/test_misc.py,sha256=dtOAPngMCTE9bYuYjNuxBiRaxvEibXuBq5VwVsWBdnY,1560
-tests/resources/test_podmanresource.py,sha256=bQz77l4AosIDyuG1cG89egY9NLuAl-OMvlrkPEJt7us,1765
+tests/resources/test_container.py,sha256=u3hk70BnTES-5oykP5xT06CgC6Ek0OM-br5x3MFJC4Q,9084
+tests/resources/test_misc.py,sha256=b0F67kRrE8FlKtjVHaRfKi4PXm8lxZ24k0Qp9XVfjz8,1580
+tests/resources/test_podmanresource.py,sha256=qtcWTTq-GNo-mvVcUjJlhRQaIEZQ5BfN-03OdZTXAvc,1785
 tests/resources/ceph/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/resources/ceph/test_cephdevstack_core.py,sha256=2Zopu-3TkXyj1amQbMG1KpsVXyRDJts73e6TLYNyz3Y,18340
-tests/resources/ceph/test_devstack.py,sha256=PRsEyYy9EKFIiZKkHYZh6vGffIzlZuW9jA9XEt7xz5M,6201
-tests/resources/ceph/test_env_vars.py,sha256=bLTcEJQJSQp0iiJBunPdGHtVQ94KRWSNEkK8HtXZQn0,2741
+tests/resources/ceph/test_cephdevstack_core.py,sha256=oTmu21quN-zzEorioow0QKVlawdDvZJrtUBOESajePk,17081
+tests/resources/ceph/test_devstack.py,sha256=U9jYm7wQyqT-MJjO0UidyZhzJOzJEfIdaflwCoPKhcE,3987
+tests/resources/ceph/test_env_vars.py,sha256=NiaMyV9TVy44MuQM4FOoAnY2Ku3lNIwyAcM3lsS_ed4,2979
 tests/resources/ceph/test_requirements_ceph.py,sha256=VLPHrzt1dLk3RnzjqRY3wyPUQbMspUuW6S_9cAWtpYU,9134
 tests/resources/ceph/test_ssh_keypair.py,sha256=M8Tc1CY9zb_1WaccMSfnSN35tyjR-CblNtTP0s4OsYU,4019
-tests/resources/ceph/test_testnode.py,sha256=wiftdOU058z9IKp5LeUNlv81U9XjojRUI0fYt8mrbgg,1253
+tests/resources/ceph/test_testnode.py,sha256=jfoixCR2Dr6X273VPSSkv-H8ribB_B9Fz5izypLRWUQ,1270
 tests/resources/ceph/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/resources/ceph/fixtures/testnode-config.toml,sha256=XaI4VACYHeshb7LLxN3viKBNxOBLOUpPuwlcQJyQO-U,44
-ceph_devstack-0.2.2.dist-info/METADATA,sha256=2wMAY48hHHICXdTTIlrXLl0ZM1fsqXJtl0kN-soxBFQ,6877
-ceph_devstack-0.2.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-ceph_devstack-0.2.2.dist-info/entry_points.txt,sha256=3cXOGOSb23ATcOZVQFBTY_imM4VFgFddXlYi-m8PA10,57
-ceph_devstack-0.2.2.dist-info/top_level.txt,sha256=NzTr-vAk2OWL08T8PsmfqkJZNEuezF5oaiHCMJBhHPM,20
-ceph_devstack-0.2.2.dist-info/RECORD,,
+ceph_devstack-0.3.0.dist-info/METADATA,sha256=s2P3nQwaVIzVMIxDrtazXLdeZi5_1512ud_Tv9mmpvE,6877
+ceph_devstack-0.3.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+ceph_devstack-0.3.0.dist-info/entry_points.txt,sha256=3cXOGOSb23ATcOZVQFBTY_imM4VFgFddXlYi-m8PA10,57
+ceph_devstack-0.3.0.dist-info/scm_file_list.json,sha256=1BOCnr5hAz_FTSzy5VVWcPqgpOr_lYlAg1Xx54rucd0,1817
+ceph_devstack-0.3.0.dist-info/scm_version.json,sha256=R6cOphoyTBSnU9AyHfeAMIFD0Br57-gBCZ97LYff0jw,160
+ceph_devstack-0.3.0.dist-info/top_level.txt,sha256=NzTr-vAk2OWL08T8PsmfqkJZNEuezF5oaiHCMJBhHPM,20
+ceph_devstack-0.3.0.dist-info/RECORD,,

ceph_devstack-0.3.0.dist-info/scm_file_list.json

@@ -0,0 +1,55 @@
+{
+  "files": [
+    "Jenkinsfile",
+    "build_selinux_module.sh",
+    ".pre-commit-config.yaml",
+    "README.md",
+    "uv.lock",
+    "LICENSE",
+    "pyproject.toml",
+    "ruff.toml",
+    ".gitignore",
+    ".flake8",
+    "docs/cgroup_v2.md",
+    "ceph_devstack/py.typed",
+    "ceph_devstack/__init__.py",
+    "ceph_devstack/ceph_devstack.te",
+    "ceph_devstack/ceph_devstack.pp",
+    "ceph_devstack/logging.conf",
+    "ceph_devstack/exec.py",
+    "ceph_devstack/host.py",
+    "ceph_devstack/config.toml",
+    "ceph_devstack/cli.py",
+    "ceph_devstack/Dockerfile.selinux",
+    "ceph_devstack/requirements.py",
+    "ceph_devstack/resources/__init__.py",
+    "ceph_devstack/resources/container.py",
+    "ceph_devstack/resources/misc.py",
+    "ceph_devstack/resources/ceph/containers.py",
+    "ceph_devstack/resources/ceph/__init__.py",
+    "ceph_devstack/resources/ceph/utils.py",
+    "ceph_devstack/resources/ceph/requirements.py",
+    "tests/test_config.py",
+    "tests/__init__.py",
+    "tests/test_requirements_core.py",
+    "tests/test_deep_merge.py",
+    "tests/conftest.py",
+    "tests/test_parse_args.py",
+    "tests/resources/__init__.py",
+    "tests/resources/test_podmanresource.py",
+    "tests/resources/test_misc.py",
+    "tests/resources/test_container.py",
+    "tests/resources/ceph/test_env_vars.py",
+    "tests/resources/ceph/__init__.py",
+    "tests/resources/ceph/test_devstack.py",
+    "tests/resources/ceph/test_ssh_keypair.py",
+    "tests/resources/ceph/test_cephdevstack_core.py",
+    "tests/resources/ceph/test_testnode.py",
+    "tests/resources/ceph/test_requirements_ceph.py",
+    "tests/resources/ceph/fixtures/__init__.py",
+    "tests/resources/ceph/fixtures/testnode-config.toml",
+    ".github/workflows/release.yml",
+    ".github/workflows/pytest.yml",
+    ".github/workflows/ci.yml"
+  ]
+}

ceph_devstack-0.3.0.dist-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.3.0",
+  "distance": 0,
+  "node": "g74b5f8b0878922261edc5ba01b8937dc4bd02d7c",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-06-26"
+}

tests/conftest.py

@@ -1,4 +1,9 @@
+import os
+import pathlib
 import pytest
+import random
+
+from datetime import datetime, timedelta
 
 from ceph_devstack import config
 
@@ -7,3 +12,32 @@ from ceph_devstack import config
 def reset_config():
     config.load()
     yield
+
+
+@pytest.fixture(scope="function")
+def create_log_file():
+    def _create_log_file(data_dir: pathlib.Path, **kwargs) -> pathlib.Path:
+        parts = {
+            "timestamp": (datetime.now() - timedelta(days=random.randint(1, 100))),
+            "test_type": random.choice(["ceph", "rgw", "rbd", "mds"]),
+            "job_id": random.randint(1, 100),
+            "content": "some log data",
+            **kwargs,
+        }
+        timestamp = parts["timestamp"].strftime("%Y-%m-%d_%H:%M:%S")
+        test_type = parts["test_type"]
+        job_id = parts["job_id"]
+        content = parts["content"]
+
+        run_name = f"root-{timestamp}-orch:cephadm:{test_type}-small-main-distro-default-testnode"
+        log_dir = data_dir / "archive" / run_name / str(job_id)
+
+        os.makedirs(log_dir, exist_ok=True)
+        time_ = parts["timestamp"].timestamp()
+        os.utime(log_dir, times=(time_, time_))
+        log_file = log_dir / "teuthology.log"
+        log_file.write_text(content)
+        os.utime(log_file, times=(time_, time_))
+        return log_file
+
+    return _create_log_file

tests/resources/ceph/test_cephdevstack_core.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
@@ -13,7 +14,6 @@ from ceph_devstack.resources.ceph.containers import (
     TestNode as _TestNode,
     Teuthology,
 )
-from ceph_devstack.resources.ceph.exceptions import TooManyJobsFound
 
 
 class TestCephDevStackServiceSpecs:
@@ -205,46 +205,21 @@ class TestCephDevStackGetLogFile:
             with pytest.raises(FileNotFoundError):
                 devstack.get_log_file(run_name, "1")
 
-    def test_get_log_file_uses_most_recent_when_no_run_name(self, tmp_path):
+    def test_get_log_file_uses_most_recent_when_no_run_name(
+        self, tmp_path, create_log_file
+    ):
+        config["data_dir"] = str(tmp_path)
+        create_log_file(
+            tmp_path, timestamp=datetime(year=2024, month=1, day=1), content="old log"
+        )
+        new_log_file = create_log_file(
+            tmp_path, timestamp=datetime(year=2025, month=1, day=1), content="new log"
+        )
         devstack = CephDevStack()
-        archive_dir = tmp_path / "archive"
-        archive_dir.mkdir()
-
-        # Create two runs
-        older_run = "root-2024-01-01_00:00:00-orch:cephadm:smoke-small-main-distro-default-testnode"
-        newer_run = "root-2025-01-01_00:00:00-orch:cephadm:smoke-small-main-distro-default-testnode"
-
-        older_dir = archive_dir / older_run
-        older_dir.mkdir()
-        older_job = older_dir / "1"
-        older_job.mkdir()
-        (older_job / "teuthology.log").write_text("old log")
-
-        newer_dir = archive_dir / newer_run
-        newer_dir.mkdir()
-        newer_job = newer_dir / "1"
-        newer_job.mkdir()
-        log_file = newer_job / "teuthology.log"
-        log_file.write_text("new log")
-
-        # Override listdir behavior
-        def mock_listdir(path):
-            if str(path) == str(archive_dir):
-                return [older_run, newer_run]
-            if str(path) == str(newer_dir):
-                return ["1"]
-            return []
-
-        with patch("ceph_devstack.resources.ceph.Teuthology") as MockTeuthology:
-            mock_teuthology = MagicMock()
-            mock_teuthology.archive_dir = archive_dir
-            MockTeuthology.return_value = mock_teuthology
+        result = devstack.get_log_file("", "")
+        assert str(result) == str(new_log_file)
 
-            with patch("os.listdir", side_effect=mock_listdir):
-                result = devstack.get_log_file("", "")
-                assert str(result) == str(log_file)
-
-    def test_get_log_file_raises_too_many_jobs_when_multiple_and_no_job_id(
+    def test_get_log_file_returns_latest_job_log_when_multiple_and_no_job_id(
         self, tmp_path
     ):
         devstack = CephDevStack()
@@ -269,17 +244,7 @@ class TestCephDevStackGetLogFile:
             mock_teuthology = MagicMock()
             mock_teuthology.archive_dir = archive_dir
             MockTeuthology.return_value = mock_teuthology
-
-            def mock_listdir(path):
-                if str(path) == str(run_dir):
-                    return ["1", "2"]
-                return []
-
-            with (
-                patch("os.listdir", side_effect=mock_listdir),
-                pytest.raises(TooManyJobsFound),
-            ):
-                devstack.get_log_file(run_name, "")
+            assert devstack.get_log_file(run_name, "").parent.name == "2"
 
 
 class TestCephDevStackRemove:

tests/resources/ceph/test_devstack.py

@@ -1,20 +1,18 @@
-import os
 import io
 import contextlib
-import random as rd
-from datetime import datetime, timedelta
+import pathlib
 import secrets
 import string
 
+from datetime import datetime, timedelta
+
 import pytest
 
 from ceph_devstack import config
 from ceph_devstack.resources.ceph.utils import (
     get_logtimestamp,
-    get_most_recent_run,
-    get_job_id,
+    get_jobs,
 )
-from ceph_devstack.resources.ceph.exceptions import TooManyJobsFound
 from ceph_devstack.resources.ceph import CephDevStack
 
 
@@ -23,47 +21,30 @@ class TestDevStack:
         dirname = "root-2025-03-20_18:34:43-orch:cephadm:smoke-small-main-distro-default-testnode"
         assert get_logtimestamp(dirname) == datetime(2025, 3, 20, 18, 34, 43)
 
-    def test_get_most_recent_run_returns_most_recent_run(self):
-        runs = [
-            "root-2024-02-07_12:23:43-orch:cephadm:smoke-small-devlop-distro-smithi-testnode",
-            "root-2025-02-20_11:23:43-orch:cephadm:smoke-small-devlop-distro-smithi-testnode",
-            "root-2025-03-20_18:34:43-orch:cephadm:smoke-small-main-distro-default-testnode",
-            "root-2025-01-18_18:34:43-orch:cephadm:smoke-small-main-distro-default-testnode",
-        ]
-        assert (
-            get_most_recent_run(runs)
-            == "root-2025-03-20_18:34:43-orch:cephadm:smoke-small-main-distro-default-testnode"
-        )
-
-    def test_get_job_id_returns_job_on_unique_job(self):
-        jobs = ["97"]
-        assert get_job_id(jobs) == "97"
+    def test_get_jobs_returns_job_on_unique_job(self, tmp_path):
+        temp_dir_path = pathlib.Path(tmp_path)
+        job_path = temp_dir_path / "97"
+        job_path.mkdir()
+        result = get_jobs(temp_dir_path)
+        assert len(result) == 1
+        assert result[0].name == "97"
 
-    def test_get_job_id_throws_filenotfound_on_missing_job(self):
-        jobs = []
+    def test_get_jobs_throws_filenotfound_on_missing_job(self):
         with pytest.raises(FileNotFoundError):
-            get_job_id(jobs)
-
-    def test_get_job_id_throws_toomanyjobsfound_on_more_than_one_job(self):
-        jobs = ["1", "2"]
-        with pytest.raises(TooManyJobsFound) as exc:
-            get_job_id(jobs)
-        assert exc.value.jobs == jobs
+            get_jobs(pathlib.Path("/fake/path"))
 
     async def test_logs_command_display_log_file_of_latest_run(
         self, tmp_path, create_log_file
     ):
-        data_dir = str(tmp_path)
-        config["data_dir"] = data_dir
+        config["data_dir"] = str(tmp_path)
         f = io.StringIO()
         content = "custom log content"
-        now = datetime.now().strftime("%Y-%m-%d_%H:%M:%S")
-        forty_days_ago = (datetime.now() - timedelta(days=40)).strftime(
-            "%Y-%m-%d_%H:%M:%S"
-        )
 
-        create_log_file(data_dir, timestamp=now, content=content)
-        create_log_file(data_dir, timestamp=forty_days_ago)
+        create_log_file(
+            tmp_path,
+            timestamp=datetime.now() - timedelta(days=40),
+        )
+        create_log_file(tmp_path, timestamp=datetime.now(), content=content)
 
         with contextlib.redirect_stdout(f):
             devstack = CephDevStack()
@@ -73,15 +54,17 @@ class TestDevStack:
     async def test_logs_display_roughly_contents_of_log_file(
         self, tmp_path, create_log_file
     ):
-        data_dir = str(tmp_path)
-        config["data_dir"] = data_dir
+        config["data_dir"] = str(tmp_path)
         f = io.StringIO()
         content = "".join(
             secrets.choice(string.ascii_letters + string.digits)
             for _ in range(6 * 8 * 1024)
         )
-        now = datetime.now().strftime("%Y-%m-%d_%H:%M:%S")
-        create_log_file(data_dir, timestamp=now, content=content)
+        create_log_file(
+            tmp_path,
+            timestamp=datetime.now(),
+            content=content,
+        )
 
         with contextlib.redirect_stdout(f):
             devstack = CephDevStack()
@@ -91,21 +74,24 @@ class TestDevStack:
     async def test_logs_command_display_log_file_of_given_job_id(
         self, tmp_path, create_log_file
     ):
-        data_dir = str(tmp_path)
-        config["data_dir"] = data_dir
+        config["data_dir"] = str(tmp_path)
         f = io.StringIO()
         content = "custom log message"
-        now = datetime.now().strftime("%Y-%m-%d_%H:%M:%S")
+        now = datetime.now()
 
         create_log_file(
-            data_dir,
+            tmp_path,
             timestamp=now,
             test_type="ceph",
             job_id="1",
             content="another log",
         )
         create_log_file(
-            data_dir, timestamp=now, test_type="ceph", job_id="2", content=content
+            tmp_path,
+            timestamp=now,
+            test_type="ceph",
+            job_id="2",
+            content=content,
         )
 
         with contextlib.redirect_stdout(f):
@@ -116,24 +102,18 @@ class TestDevStack:
     async def test_logs_display_content_of_provided_run_name(
         self, tmp_path, create_log_file
     ):
-        data_dir = str(tmp_path)
-        config["data_dir"] = data_dir
+        config["data_dir"] = str(tmp_path)
         f = io.StringIO()
         content = "custom content"
-        now = datetime.now().strftime("%Y-%m-%d_%H:%M:%S")
-        three_days_ago = (datetime.now() - timedelta(days=3)).strftime(
-            "%Y-%m-%d_%H:%M:%S"
-        )
-
         create_log_file(
-            data_dir,
-            timestamp=now,
+            tmp_path,
+            timestamp=datetime.now(),
         )
-        run_name = create_log_file(
-            data_dir,
-            timestamp=three_days_ago,
+        run_name: pathlib.Path = create_log_file(
+            tmp_path,
+            timestamp=datetime.now() - timedelta(days=3),
             content=content,
-        ).split("/")[-3]
+        ).parent.parent
 
         with contextlib.redirect_stdout(f):
             devstack = CephDevStack()
@@ -143,40 +123,10 @@ class TestDevStack:
     async def test_logs_locate_display_file_path_instead_of_config(
         self, tmp_path, create_log_file
     ):
-        data_dir = str(tmp_path)
-
-        config["data_dir"] = data_dir
+        config["data_dir"] = str(tmp_path)
         f = io.StringIO()
-        log_file = create_log_file(data_dir)
+        log_file = create_log_file(tmp_path)
         with contextlib.redirect_stdout(f):
             devstack = CephDevStack()
             await devstack.logs(locate=True)
-        assert log_file in f.getvalue()
-
-    @pytest.fixture(scope="class")
-    def create_log_file(self):
-        def _create_log_file(data_dir: str, **kwargs):
-            parts = {
-                "timestamp": (
-                    datetime.now() - timedelta(days=rd.randint(1, 100))
-                ).strftime("%Y-%m-%d_%H:%M:%S"),
-                "test_type": rd.choice(["ceph", "rgw", "rbd", "mds"]),
-                "job_id": rd.randint(1, 100),
-                "content": "some log data",
-                **kwargs,
-            }
-            timestamp = parts["timestamp"]
-            test_type = parts["test_type"]
-            job_id = parts["job_id"]
-            content = parts["content"]
-
-            run_name = f"root-{timestamp}-orch:cephadm:{test_type}-small-main-distro-default-testnode"
-            log_dir = f"{data_dir}/archive/{run_name}/{job_id}"
-
-            os.makedirs(log_dir, exist_ok=True)
-            log_file = f"{log_dir}/teuthology.log"
-            with open(log_file, "w") as f:
-                f.write(content)
-            return log_file
-
-        return _create_log_file
+        assert str(log_file) in f.getvalue()

tests/resources/ceph/test_env_vars.py

@@ -8,10 +8,12 @@ ANY_VALUE = "ANY_VALUE"
 
 class _TestContainerEnvVars:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         raise NotImplementedError
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         # return {}
         raise NotImplementedError
@@ -28,10 +30,12 @@ class _TestContainerEnvVars:
 
 class TestPostgres(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.Postgres
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {
             "POSTGRES_USER": "root",
@@ -44,10 +48,12 @@ class TestPostgres(_TestContainerEnvVars):
 
 class TestPaddles(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.Paddles
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {
             "PADDLES_SERVER_HOST": "0.0.0.0",
@@ -56,10 +62,12 @@ class TestPaddles(_TestContainerEnvVars):
 
 class TestPulpito(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.Pulpito
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {
             "PULPITO_PADDLES_ADDRESS": "http://paddles:8080",
@@ -68,10 +76,12 @@ class TestPulpito(_TestContainerEnvVars):
 
 class TestTestNode(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.TestNode
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {
             "CEPH_VOLUME_ALLOW_LOOP_DEVICES": "true",
@@ -80,10 +90,12 @@ class TestTestNode(_TestContainerEnvVars):
 
 class TestTeuthology(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.Teuthology
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {
             "SSH_PRIVKEY": "",
@@ -102,9 +114,11 @@ class TestTeuthology(_TestContainerEnvVars):
 
 class TestBeanstalk(_TestContainerEnvVars):
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return containers.Beanstalk
 
     @pytest.fixture(scope="class")
+    @classmethod
     def env_vars(self):
         return {}

tests/resources/ceph/test_testnode.py

@@ -8,6 +8,7 @@ from ceph_devstack import config
 
 class TestTestnode:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self) -> type[_TestNode]:
         return _TestNode
 

tests/resources/test_container.py

@@ -27,7 +27,7 @@ class TestContainerResource(_TestPodmanResource, _TestContainerBase):
         return Container
 
     @pytest.fixture(
-        scope="class", params=["build", "create", "start", "stop", "remove"]
+        scope="function", params=["build", "create", "start", "stop", "remove"]
     )
     def action(self, request):
         return request.param

tests/resources/test_misc.py

@@ -11,10 +11,11 @@ from .test_podmanresource import (
 
 class TestMiscResource(_TestPodmanResource):
     @pytest.fixture(scope="class", params=[Network, Secret])
+    @classmethod
     def cls(self, request):
         return request.param
 
-    @pytest.fixture(scope="class", params=["create", "exists", "remove"])
+    @pytest.fixture(scope="function", params=["create", "exists", "remove"])
     def action(self, request):
         return request.param
 

tests/resources/test_podmanresource.py

@@ -10,10 +10,11 @@ from ceph_devstack.resources import PodmanResource
 
 class TestPodmanResource:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return PodmanResource
 
-    @pytest.fixture(scope="class", params=["create", "remove"])
+    @pytest.fixture(scope="function", params=["create", "remove"])
     def action(self, request):
         return request.param
 

tests/test_config.py

@@ -1,8 +1,18 @@
+import pytest
 import tomlkit
 
 from ceph_devstack import config, Config
 
 
+@pytest.fixture(scope="function")
+def test_config(tmp_path) -> Config:
+    test_config = Config()
+    config_file = tmp_path / "test_config.toml"
+    config_file.write_text("")
+    test_config.load(config_file)
+    return test_config
+
+
 class TestConfigDump:
     def test_config_dump_returns_string(self):
         result = config.dump()
@@ -54,43 +64,26 @@ class TestConfigGetValue:
 
 
 class TestConfigSet:
-    def test_set_value_simple_key(self, tmp_path):
-        test_config = Config()
-        config_file = tmp_path / "test_config.toml"
-        config_file.write_text("")
-        test_config.load(config_file)
+    def test_set_value_simple_key(self, test_config):
         test_config.set_value("test_key", "test_value")
         assert test_config["test_key"] == "test_value"
 
-    def test_set_value_nested_key(self, tmp_path):
-        test_config = Config()
-        config_file = tmp_path / "test_config.toml"
-        config_file.write_text("")
-        test_config.load(config_file)
+    def test_set_value_returns_value(self, test_config):
+        assert test_config.set_value("test_key", "test_value") == "test_value"
+
+    def test_set_value_nested_key(self, test_config):
         test_config.set_value("test_section.test_key", "test_value")
         assert test_config["test_section"]["test_key"] == "test_value"
 
-    def test_set_value_updates_user_obj(self, tmp_path):
-        test_config = Config()
-        config_file = tmp_path / "test_config.toml"
-        config_file.write_text("")
-        test_config.load(config_file)
+    def test_set_value_updates_user_obj(self, test_config):
         test_config.set_value("new_key", "new_value")
         assert "new_key" in test_config.user_obj
 
-    def test_set_value_creates_intermediate_sections(self, tmp_path):
-        test_config = Config()
-        config_file = tmp_path / "test_config.toml"
-        config_file.write_text("")
-        test_config.load(config_file)
+    def test_set_value_creates_intermediate_sections(self, test_config):
         test_config.set_value("deep.nested.key", "value")
         assert test_config.user_obj["deep"]["nested"]["key"] == "value"
 
-    def test_set_value_overrides_existing(self, tmp_path):
-        test_config = Config()
-        config_file = tmp_path / "test_config.toml"
-        config_file.write_text("")
-        test_config.load(config_file)
+    def test_set_value_overrides_existing(self, test_config):
         original_count = test_config["containers"]["testnode"]["count"]
         new_count = original_count + 2
         test_config.set_value("containers.testnode.count", str(new_count))
@@ -98,6 +91,15 @@ class TestConfigSet:
         assert test_config["containers"]["testnode"]["count"] == new_count
 
 
+class TestConfigUnset:
+    def test_unset_value_simple_key(self, test_config):
+        test_config.set_value("test_key", "test_value")
+        assert "test_key" in test_config
+        assert test_config["test_key"] == "test_value"
+        test_config.unset_value("test_key")
+        assert "test_key" not in test_config
+
+
 class TestConfigDefaults:
     def test_config_defaults(self):
         assert config == {

tests/test_requirements_core.py

@@ -24,6 +24,7 @@ def os_type(request):
 
 class TestRequirement:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         class TestReq(requirements.Requirement):
             check_cmd = ["test", "command"]
@@ -53,6 +54,7 @@ class TestRequirement:
 
 class TestFixableRequirement:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         class TestReq(requirements.FixableRequirement):
             check_cmd = ["test", "-f", "/tmp/testfile"]
@@ -108,6 +110,7 @@ class TestFixableRequirement:
 
 class TestLocalRequirement:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         class TestReq(requirements.LocalRequirement):
             check_cmd = ["test"]
@@ -120,6 +123,7 @@ class TestLocalRequirement:
 
 class TestPodmanPlatform:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.PodmanPlatform
 
@@ -150,6 +154,7 @@ class TestPodmanPlatform:
 
 class TestPodmanMachinePresent:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.PodmanMachinePresent
 
@@ -165,6 +170,7 @@ class TestPodmanMachinePresent:
 
 class TestPodmanMachineRunning:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.PodmanMachineRunning
 
@@ -181,16 +187,19 @@ class TestPodmanMachineRunning:
 
 class TestPodmanRuntime:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.PodmanRuntime
 
 
 class TestPodmanVersionInit:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.PodmanVersion
 
-    @pytest.fixture(scope="class")
+    @pytest.fixture(scope="function")
+    @classmethod
     def req(self, cls):
         return cls("4.0.0")
 
@@ -204,10 +213,11 @@ class TestPodmanVersionInit:
 
 class TestSysctlValueInit:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.SysctlValue
 
-    @pytest.fixture(scope="class")
+    @pytest.fixture(scope="function")
     def req(self, cls):
         return cls("fs.aio-max-nr", 2097152)
 
@@ -223,10 +233,11 @@ class TestSysctlValueInit:
 
 class TestSELinuxBooleanInit:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.SELinuxBoolean
 
-    @pytest.fixture(scope="class")
+    @pytest.fixture(scope="function")
     def req(self, cls):
         return cls("test_bool")
 
@@ -242,6 +253,7 @@ class TestSELinuxBooleanInit:
 
 class TestFuseOverlayfsPresence:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.FuseOverlayfsPresence
 
@@ -257,6 +269,7 @@ class TestFuseOverlayfsPresence:
 
 class TestCgroupV2Properties:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.CgroupV2
 
@@ -274,6 +287,7 @@ class TestCgroupV2Properties:
 
 class TestCgroupV2Check:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.CgroupV2
 
@@ -292,10 +306,11 @@ class TestCgroupV2Check:
 
 class TestPodmanDNSPluginInit:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.PodmanDNSPlugin
 
-    @pytest.fixture(scope="class")
+    @pytest.fixture(scope="function")
     def dns_plugin_path(self, os_type):
         if os_type == "centos":
             return "/usr/libexec/cni/dnsname"
@@ -313,6 +328,7 @@ class TestPodmanDNSPluginInit:
 
 class TestAppArmorProfile:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         return requirements.AppArmorProfile
 
@@ -328,6 +344,7 @@ class TestAppArmorProfile:
 
 class TestFixableRequirementSuggestMsg:
     @pytest.fixture(scope="class")
+    @classmethod
     def cls(self):
         class TestReq(requirements.FixableRequirement):
             check_cmd = ["test"]

ceph_devstack/resources/ceph/exceptions.py

@@ -1,3 +0,0 @@
-class TooManyJobsFound(Exception):
-    def __init__(self, jobs: list[str]):
-        self.jobs = jobs