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

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/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.dist-info → ceph_devstack-0.2.2.dist-info}/METADATA

@@ -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.dist-info → ceph_devstack-0.2.2.dist-info}/RECORD

@@ -5,10 +5,10 @@ ceph_devstack/ceph_devstack.te,sha256=68i9sBb1TAEnCJn2JtyM-ECzPSuZck4vKoymcTbptX
 ceph_devstack/cli.py,sha256=lSYwXrwfP8D-k60XuwSqhwZSZNKJFFQfvRM-av1rePM,2057
 ceph_devstack/config.toml,sha256=HsxO3FhwZkHomde69QfElztuN8U1bxk7cQk1_iWB4w0,562
 ceph_devstack/exec.py,sha256=gn95GEQttB6xgdWXXvTsxUxcQsx9TUu6PC8QVQ0_Y7w,2674
-ceph_devstack/host.py,sha256=IRLhQaE_jl4VyHLArkqGzYWi3mxT8_sCG6Y7iDol4vU,5456
+ceph_devstack/host.py,sha256=w_Hx912y1g62yXkTuPJsw_UdUwxJr_Pbxrj8iZtEP7Y,5470
 ceph_devstack/logging.conf,sha256=bGlswYcL_fz522y9EoKZOLInrSss8D44glNq0FievFY,521
 ceph_devstack/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ceph_devstack/requirements.py,sha256=7Ashf6qfXW1k-L1Gakj5_Q-fPOBEhMQWnh0hIvtUjh0,9980
+ceph_devstack/requirements.py,sha256=aE7PjSdcNuD1no12anidTZhjlYxEig8O0iatlz8EeHw,9536
 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
@@ -17,13 +17,13 @@ ceph_devstack/resources/ceph/containers.py,sha256=3QEwkh3I7f3r47SnlnMB-_mU8fYGR0
 ceph_devstack/resources/ceph/exceptions.py,sha256=C4ldyEA7Cukp-QUOwL-MnQ8kpgMDIQ6r_JQe0E9q4eM,101
 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.0.dist-info/licenses/LICENSE,sha256=bFeYufyeS1qw0W8pkW1Wj09F2itqX7TAGTnA2NIpApU,1067
+ceph_devstack-0.2.2.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/test_deep_merge.py,sha256=IP9zzCThmhVghl9XjAAiSrKsPdouH3KbEUaKq8n3Soc,2178
 tests/test_parse_args.py,sha256=2JDAT4Id88Ywl5QmiUHqq5IDGm_j5Yl3Kk7pbl3sOEk,7550
-tests/test_requirements_core.py,sha256=t7dE53E6N3owO1aHd0nLjXGZ9WDGFFUNIQKZQd1jJBY,19985
+tests/test_requirements_core.py,sha256=MnhENRBFQkhIYD9sI1HBYBEocqiDBChRw7bOuSI-kPk,20089
 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
@@ -37,8 +37,8 @@ tests/resources/ceph/test_ssh_keypair.py,sha256=M8Tc1CY9zb_1WaccMSfnSN35tyjR-Cbl
 tests/resources/ceph/test_testnode.py,sha256=wiftdOU058z9IKp5LeUNlv81U9XjojRUI0fYt8mrbgg,1253
 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.0.dist-info/METADATA,sha256=6QrXrp1vvd4eAAtp8rmKlzPnh6FdyBD9HLBPW-thmjI,6877
-ceph_devstack-0.2.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-ceph_devstack-0.2.0.dist-info/entry_points.txt,sha256=3cXOGOSb23ATcOZVQFBTY_imM4VFgFddXlYi-m8PA10,57
-ceph_devstack-0.2.0.dist-info/top_level.txt,sha256=NzTr-vAk2OWL08T8PsmfqkJZNEuezF5oaiHCMJBhHPM,20
-ceph_devstack-0.2.0.dist-info/RECORD,,
+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,,

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]