ceph-devstack 0.2.0__tar.gz → 0.2.2__tar.gz

{ceph_devstack-0.2.0 → ceph_devstack-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ceph-devstack
-Version: 0.2.0
+Version: 0.2.2
 Summary: Run a full teuthology lab on your laptop!
 Author-email: Zack Cerza <zack@cerza.org>
 License-Expression: MIT

{ceph_devstack-0.2.0 → ceph_devstack-0.2.2}/ceph_devstack/host.py

@@ -73,6 +73,7 @@ class Host:
             self._kernel_version = parse_version(raw_version.split("-")[0])
         return self._kernel_version
 
+    @property
     def os_type(self) -> str:
         if not hasattr(self, "_os_type"):
             proc = self.run(["uname"])

{ceph_devstack-0.2.0 → ceph_devstack-0.2.2}/ceph_devstack/requirements.py

@@ -1,6 +1,5 @@
 import shlex
 
-from pathlib import Path
 from packaging.version import parse as parse_version, Version
 from typing import List
 
@@ -56,7 +55,7 @@ class PodmanPlatform(LocalFixableRequirement):
 
     @property
     def fix_cmd(self):
-        host_os = self.host.os_type()
+        host_os = self.host.os_type
         if host_os == "darwin":
             return ["brew", "install", "podman"]
         return ["sudo", host.package_manager(), "install", "-y", "podman"]
@@ -161,28 +160,19 @@ class PodmanVersion(Requirement):
         return True
 
 
-class PodmanRuntime(Requirement):
+class PodmanRuntime(FixableRequirement):
+    suggest_msg = "Could not find the 'crun' container runtime"
+
     @property
     def fix_cmd(self):
-        if self.host.os_type() != "darwin":
+        if self.host.os_type != "darwin":
             return ["sudo", self.host.package_manager(), "install", "-y", "crun"]
         return []
 
     async def check(self):
         podman_info = await self.host.podman_info()
-        storage_conf_path = podman_info["store"]["configFile"]
         runtime = podman_info["host"]["ociRuntime"]["name"]
-        if runtime == "crun":
-            return True
-        else:
-            containers_conf_path = Path(storage_conf_path).parent / "containers.conf"
-            cmd = host.cmd(["podman", "system", "reset"])
-            logger.error(
-                f"The configured runtime is '{runtime}'. "
-                f"It must be set to 'crun' in {containers_conf_path}. "
-                f"Afterward, run '{cmd}'."
-            )
-            return False
+        return runtime == "crun"
 
 
 class SELinuxBoolean(FixableRequirement):
@@ -214,7 +204,7 @@ class PodmanDNSPlugin(FixableRequirement):
 
     @property
     def dns_plugin_path(self):
-        os_type = self.host.os_type()
+        os_type = self.host.os_type
         if os_type in ["ubuntu", "debian"]:
             return "/usr/lib/cni/dnsname"
         return "/usr/libexec/cni/dnsname"
@@ -225,7 +215,7 @@ class PodmanDNSPlugin(FixableRequirement):
 
     @property
     def fix_cmd(self):
-        os_type = self.host.os_type()
+        os_type = self.host.os_type
         if os_type == "centos":
             return ["sudo", "dnf", "install", "-y", self.dns_plugin_path]
         elif os_type in ["ubuntu", "debian"]:
@@ -261,7 +251,7 @@ class AppArmorProfile(FixableRequirement):
 async def check_requirements():
     if not await PodmanPlatform().evaluate():
         return False
-    if local_host.os_type() == "darwin":
+    if local_host.os_type == "darwin":
         if not await PodmanMachinePresent().evaluate():
             return False
         if not await PodmanMachineRunning().evaluate():

{ceph_devstack-0.2.0 → ceph_devstack-0.2.2}/ceph_devstack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ceph-devstack
-Version: 0.2.0
+Version: 0.2.2
 Summary: Run a full teuthology lab on your laptop!
 Author-email: Zack Cerza <zack@cerza.org>
 License-Expression: MIT

{ceph_devstack-0.2.0 → ceph_devstack-0.2.2}/tests/test_requirements_core.py

@@ -1,7 +1,7 @@
 import asyncio
 import pytest
 from packaging.version import parse as parse_version
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch, PropertyMock
 
 
 from ceph_devstack import config, requirements
@@ -303,7 +303,10 @@ class TestPodmanDNSPluginInit:
             return "/usr/lib/cni/dnsname"
 
     def test_podman_dns_plugin_config(self, cls, os_type, dns_plugin_path):
-        with patch.object(cls.host, "os_type", return_value=os_type):
+        with patch(
+            "ceph_devstack.host.Host.os_type", new_callable=PropertyMock
+        ) as MockHost:
+            MockHost.return_value = os_type
             req = cls()
             assert req.check_cmd == ["test", "-x", dns_plugin_path]