]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: for test fixture use constants from new constants.py
authorJohn Mulligan <jmulligan@redhat.com>
Thu, 17 Aug 2023 18:38:42 +0000 (14:38 -0400)
committerJohn Mulligan <jmulligan@redhat.com>
Wed, 30 Aug 2023 14:10:50 +0000 (10:10 -0400)
Signed-off-by: John Mulligan <jmulligan@redhat.com>
Pair-programmed-with: Adam King <adking@redhat.com>
Co-authored-by: Adam King <adking@redhat.com>
src/cephadm/tests/fixtures.py

index 76ac0b44cf98740dffc4a1d9ba352b0f51ce5958..db437e20fee3f4b1914d0e1a60debcc3f250d2fd 100644 (file)
@@ -67,6 +67,8 @@ def cephadm_fs(
     """
     use pyfakefs to stub filesystem calls
     """
+    from cephadmlib import constants
+
     uid = os.getuid()
     gid = os.getgid()
 
@@ -91,11 +93,11 @@ def cephadm_fs(
         except AttributeError:
             pass
 
-        fs.create_dir(_cephadm.DATA_DIR)
-        fs.create_dir(_cephadm.LOG_DIR)
-        fs.create_dir(_cephadm.LOCK_DIR)
-        fs.create_dir(_cephadm.LOGROTATE_DIR)
-        fs.create_dir(_cephadm.UNIT_DIR)
+        fs.create_dir(constants.DATA_DIR)
+        fs.create_dir(constants.LOG_DIR)
+        fs.create_dir(constants.LOCK_DIR)
+        fs.create_dir(constants.LOGROTATE_DIR)
+        fs.create_dir(constants.UNIT_DIR)
         fs.create_dir('/sys/block')
 
         yield fs