DAOS-15643 test: Enable dfuse register cleanup model

src/tests/ftest/aggregation/dfuse_space_check.py

@@ -7,6 +7,7 @@
 import os
 import time
 
+from dfuse_utils import get_dfuse, start_dfuse
 from ior_test_base import IorTestBase
 
 
@@ -57,16 +58,19 @@ def wait_for_aggregation(self, retries=4, interval=60):
         self.log.info("Free space when test terminated: %s", current_space)
         self.fail("Aggregation did not complete within {} seconds".format(retries * interval))
 
-    def write_multiple_files(self):
+    def write_multiple_files(self, dfuse):
         """Write multiple files.
 
+        Args:
+            dfuse (Dfuse): the dfuse object
+
         Returns:
             int: Total number of files created before going out of space.
 
         """
         file_count = 0
         while self.get_nvme_free_space(False) >= self.block_size:
-            file_path = os.path.join(self.dfuse.mount_dir.value, "file{}.txt".format(file_count))
+            file_path = os.path.join(dfuse.mount_dir.value, "file{}.txt".format(file_count))
             write_dd_cmd = "dd if=/dev/zero of={} bs={} count=1".format(file_path, self.block_size)
             if 0 in self.execute_cmd(write_dd_cmd, fail_on_err=True, display_output=False):
                 file_count += 1
@@ -106,13 +110,14 @@ def test_dfusespacecheck(self):
         # Create a pool, container, and start dfuse
         self.create_pool()
         self.create_cont()
-        self.start_dfuse(self.hostlist_clients, self.pool, self.container)
+        dfuse = get_dfuse(self, self.hostlist_clients)
+        start_dfuse(self, dfuse, self.pool, self.container)
 
         # get nvme space before write
         self.initial_space = self.get_nvme_free_space()
 
         # Create a file as large as we can
-        large_file = os.path.join(self.dfuse.mount_dir.value, 'largefile.txt')
+        large_file = os.path.join(dfuse.mount_dir.value, 'largefile.txt')
         self.execute_cmd('touch {}'.format(large_file))
         dd_count = (self.initial_space // self.block_size) + 1
         write_dd_cmd = "dd if=/dev/zero of={} bs={} count={}".format(
@@ -130,14 +135,14 @@ def test_dfusespacecheck(self):
         self.pool.set_property("reclaim", "disabled")
 
         # Write small files until we run out of space
-        file_count1 = self.write_multiple_files()
+        file_count1 = self.write_multiple_files(dfuse)
 
         # Enable aggregation
         self.log.info("Enabling aggregation")
         self.pool.set_property("reclaim", "time")
 
         # remove all the small files created above.
-        self.execute_cmd("rm -rf {}".format(os.path.join(self.dfuse.mount_dir.value, '*')))
+        self.execute_cmd("rm -rf {}".format(os.path.join(dfuse.mount_dir.value, '*')))
 
         # Wait for aggregation to complete after file removal
         self.wait_for_aggregation()
@@ -147,7 +152,7 @@ def test_dfusespacecheck(self):
         self.pool.set_property("reclaim", "disabled")
 
         # Write small files again until we run out of space and verify we wrote the same amount
-        file_count2 = self.write_multiple_files()
+        file_count2 = self.write_multiple_files(dfuse)
 
         self.log.info('file_count1 = %s', file_count1)
         self.log.info('file_count2 = %s', file_count2)

src/tests/ftest/daos_test/dfuse.py

@@ -7,13 +7,14 @@
 import os
 from collections import OrderedDict
 
+from apricot import TestWithServers
 from cmocka_utils import CmockaUtils
-from dfuse_test_base import DfuseTestBase
+from dfuse_utils import get_dfuse, start_dfuse
 from general_utils import create_directory, get_log_file
 from job_manager_utils import get_job_manager
 
 
-class DaosCoreTestDfuse(DfuseTestBase):
+class DaosCoreTestDfuse(TestWithServers):
     """Runs DAOS DFuse tests.
 
     :avocado: recursive
@@ -29,11 +30,11 @@ def run_test(self, il_lib=None):
         if il_lib is None:
             self.fail('il_lib is not defined.')
 
-        self.daos_test = os.path.join(self.bin, 'dfuse_test')
+        daos_test = os.path.join(self.bin, 'dfuse_test')
 
         # Create a pool, container and start dfuse.
-        self.add_pool(connect=False)
-        self.add_container(self.pool)
+        pool = self.get_pool(connect=False)
+        container = self.get_container(pool)
 
         cont_attrs = OrderedDict()
 
@@ -67,14 +68,15 @@ def run_test(self, il_lib=None):
         elif cache_mode == 'native':
             use_dfuse = False
         else:
-            self.fail('Invalid cache_mode: {}'.format(cache_mode))
+            self.fail(f'Invalid cache_mode: {cache_mode}')
 
         if use_dfuse:
-            self.container.set_attr(attrs=cont_attrs)
+            container.set_attr(attrs=cont_attrs)
 
-            self.start_dfuse(self.hostlist_clients, self.pool, self.container)
+            dfuse = get_dfuse(self, self.hostlist_clients)
+            start_dfuse(self, dfuse, pool, container)
 
-            mount_dir = self.dfuse.mount_dir.value
+            mount_dir = dfuse.mount_dir.value
         else:
             # Bypass, simply create a remote directory and use that.
             mount_dir = '/tmp/dfuse-test'
@@ -94,14 +96,14 @@ def run_test(self, il_lib=None):
 
             if il_lib == 'libpil4dfs.so':
                 daos_test_env['D_IL_MOUNT_POINT'] = mount_dir
-                daos_test_env['D_IL_POOL'] = self.pool.identifier
-                daos_test_env['D_IL_CONTAINER'] = self.container.identifier
+                daos_test_env['D_IL_POOL'] = pool.identifier
+                daos_test_env['D_IL_CONTAINER'] = container.identifier
                 daos_test_env['D_IL_REPORT'] = '0'
                 daos_test_env['D_IL_MAX_EQ'] = '2'
                 daos_test_env['D_IL_ENFORCE_EXEC_ENV'] = '1'
 
         command = [
-            self.daos_test,
+            daos_test,
             '--test-dir',
             mount_dir,
             '--io',

src/tests/ftest/datamover/negative.py

@@ -8,6 +8,7 @@
 from os.path import join
 
 from data_mover_test_base import DataMoverTestBase
+from dfuse_utils import get_dfuse, start_dfuse
 from duns_utils import format_path
 
 
@@ -60,7 +61,8 @@ def test_dm_bad_params_dcp(self):
         self.set_tool("DCP")
 
         # Start dfuse to hold all pools/containers
-        self.start_dfuse(self.dfuse_hosts)
+        dfuse = get_dfuse(self, self.dfuse_hosts)
+        start_dfuse(self, dfuse)
 
         # Create a test pool
         pool1 = self.create_pool()
@@ -69,7 +71,7 @@ def test_dm_bad_params_dcp(self):
         uns_cont = self.get_container(pool1)
 
         # Create a test container
-        cont1_path = join(self.dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns1')
+        cont1_path = join(dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns1')
         cont1 = self.get_container(pool1, path=cont1_path)
 
         # Create test files
@@ -209,7 +211,8 @@ def test_dm_bad_params_fs_copy(self):
         self.set_tool("FS_COPY")
 
         # Start dfuse to hold all pools/containers
-        self.start_dfuse(self.dfuse_hosts)
+        dfuse = get_dfuse(self, self.dfuse_hosts)
+        start_dfuse(self, dfuse)
 
         # Create a test pool
         pool1 = self.create_pool()
@@ -218,7 +221,7 @@ def test_dm_bad_params_fs_copy(self):
         uns_cont = self.get_container(pool1)
 
         # Create a test container
-        cont1_path = join(self.dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns1')
+        cont1_path = join(dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns1')
         cont1 = self.get_container(pool1, path=cont1_path)
 
         # Create test files

src/tests/ftest/datamover/posix_meta_entry.py

@@ -6,6 +6,7 @@
 from os.path import join
 
 from data_mover_test_base import DataMoverTestBase
+from dfuse_utils import get_dfuse, start_dfuse
 from exception_utils import CommandFailure
 
 
@@ -62,7 +63,8 @@ def run_dm_posix_meta_entry(self, tool):
         test_desc = self.test_id + " (preserve={})".format(str(preserve_on))
 
         # Start dfuse to hold all pools/containers
-        self.start_dfuse(self.dfuse_hosts)
+        dfuse = get_dfuse(self, self.dfuse_hosts)
+        start_dfuse(self, dfuse)
 
         # Create 1 pool
         pool1 = self.create_pool()
@@ -71,7 +73,7 @@ def run_dm_posix_meta_entry(self, tool):
         cont1 = self.get_container(pool1)
         daos_src_path = self.new_daos_test_path(False)
         dfuse_src_path = "{}/{}/{}{}".format(
-            self.dfuse.mount_dir.value, pool1.uuid, cont1.uuid, daos_src_path)
+            dfuse.mount_dir.value, pool1.uuid, cont1.uuid, daos_src_path)
         self.create_data(dfuse_src_path)
 
         # Create 1 source posix path with test data
@@ -84,7 +86,7 @@ def run_dm_posix_meta_entry(self, tool):
         # DAOS -> DAOS
         daos_dst_path = self.new_daos_test_path(False)
         dfuse_dst_path = "{}/{}/{}{}".format(
-            self.dfuse.mount_dir.value, pool1.uuid, cont1.uuid, daos_dst_path)
+            dfuse.mount_dir.value, pool1.uuid, cont1.uuid, daos_dst_path)
         self.run_datamover(
             test_desc + "(DAOS->DAOS)",
             "DAOS", daos_src_path, pool1, cont1,
@@ -105,7 +107,7 @@ def run_dm_posix_meta_entry(self, tool):
         # POSIX -> DAOS
         daos_dst_path = self.new_daos_test_path(False)
         dfuse_dst_path = "{}/{}/{}{}".format(
-            self.dfuse.mount_dir.value, pool1.uuid, cont1.uuid, daos_dst_path)
+            dfuse.mount_dir.value, pool1.uuid, cont1.uuid, daos_dst_path)
         self.run_datamover(
             test_desc + "(POSIX->DAOS)",
             "POSIX", posix_src_path, None, None,

src/tests/ftest/datamover/posix_subsets.py

@@ -7,6 +7,7 @@
 from os.path import join
 
 from data_mover_test_base import DataMoverTestBase
+from dfuse_utils import get_dfuse, start_dfuse
 
 
 class DmvrPosixSubsets(DataMoverTestBase):
@@ -49,21 +50,21 @@ def run_dm_posix_subsets(self, tool):
         self.set_tool(tool)
 
         # Start dfuse to hold all pools/containers
-        self.start_dfuse(self.dfuse_hosts)
+        dfuse = get_dfuse(self, self.dfuse_hosts)
+        start_dfuse(self, dfuse)
 
         # Create 1 pool
         pool1 = self.create_pool()
 
         # create dfuse containers to test copying to dfuse subdirectories
         dfuse_cont1 = self.get_container(pool1)
         dfuse_cont2 = self.get_container(pool1)
-        dfuse_src_dir = join(self.dfuse.mount_dir.value, pool1.uuid, dfuse_cont1.uuid)
+        dfuse_src_dir = join(dfuse.mount_dir.value, pool1.uuid, dfuse_cont1.uuid)
         # Create a special container to hold UNS entries
         uns_cont = self.get_container(pool1)
 
         # Create two test containers
-        container1_path = join(
-            self.dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns1')
+        container1_path = join(dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns1')
         container1 = self.get_container(pool1, path=container1_path)
         container2 = self.get_container(pool1)
 
@@ -128,7 +129,7 @@ def run_dm_posix_subsets(self, tool):
 
             dfuse_dst_dir = self.new_posix_test_path(
                 create=False,
-                parent=join(self.dfuse.mount_dir.value, pool1.uuid, dfuse_cont2.uuid))
+                parent=join(dfuse.mount_dir.value, pool1.uuid, dfuse_cont2.uuid))
             copy_list.append([
                 "copy_subsets (dfuse root to new dfuse dir)",
                 ["POSIX", dfuse_src_dir, None, None],

src/tests/ftest/datamover/posix_symlinks.py

@@ -6,6 +6,7 @@
 from os.path import join
 
 from data_mover_test_base import DataMoverTestBase
+from dfuse_utils import get_dfuse, start_dfuse
 
 
 class DmvrPosixSymlinks(DataMoverTestBase):
@@ -55,7 +56,8 @@ def run_dm_posix_symlinks(self, tool):
         self.set_tool(tool)
 
         # Start dfuse to hold all pools/containers
-        self.start_dfuse(self.dfuse_hosts)
+        dfuse = get_dfuse(self, self.dfuse_hosts)
+        start_dfuse(self, dfuse)
 
         # Create 1 pool
         pool1 = self.create_pool()
@@ -64,19 +66,19 @@ def run_dm_posix_symlinks(self, tool):
         uns_cont = self.get_container(pool1)
 
         # Test links that point forward
-        container1_path = join(self.dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns1')
+        container1_path = join(dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns1')
         container1 = self.get_container(pool1, path=container1_path)
         self.run_dm_posix_symlinks_fun(
             pool1, container1, self.create_links_forward, "forward")
 
         # Test links that point backward
-        container2_path = join(self.dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns2')
+        container2_path = join(dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns2')
         container2 = self.get_container(pool1, path=container2_path)
         self.run_dm_posix_symlinks_fun(
             pool1, container2, self.create_links_backward, "backward")
 
         # Test a mix of forward and backward links
-        container3_path = join(self.dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns3')
+        container3_path = join(dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns3')
         container3 = self.get_container(pool1, path=container3_path)
         self.run_dm_posix_symlinks_fun(
             pool1, container3, self.create_links_mixed, "mixed")

src/tests/ftest/datamover/posix_types.py

@@ -6,6 +6,7 @@
 from os.path import basename, join
 
 from data_mover_test_base import DataMoverTestBase
+from dfuse_utils import get_dfuse, start_dfuse
 from duns_utils import format_path, parse_path
 
 
@@ -63,7 +64,8 @@ def run_dm_posix_types(self, tool):
         self.set_tool(tool)
 
         # Start dfuse to hold all pools/containers
-        self.start_dfuse(self.dfuse_hosts)
+        dfuse = get_dfuse(self, self.dfuse_hosts)
+        start_dfuse(self, dfuse)
 
         # Create 2 pools
         pool1 = self.create_pool(label='pool1')
@@ -73,11 +75,11 @@ def run_dm_posix_types(self, tool):
         uns_cont = self.get_container(pool1)
 
         # Create all other containers
-        container1_path = join(self.dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns1')
+        container1_path = join(dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns1')
         container1 = self.get_container(pool1, path=container1_path, label='container1')
-        container2_path = join(self.dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns2')
+        container2_path = join(dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns2')
         container2 = self.get_container(pool1, path=container2_path, label='container2')
-        container3_path = join(self.dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns3')
+        container3_path = join(dfuse.mount_dir.value, pool1.uuid, uns_cont.uuid, 'uns3')
         container3 = self.get_container(pool2, path=container3_path, label='container3')
 
         # Create each source location

src/tests/ftest/datamover/serial_large_posix.py

@@ -4,6 +4,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 '''
 from data_mover_test_base import DataMoverTestBase
+from dfuse_utils import get_dfuse, start_dfuse
 from duns_utils import format_path
 
 
@@ -54,8 +55,9 @@ def run_dm_serial_large_posix(self, tool):
 
         # Use dfuse as a shared intermediate for serialize + deserialize
         dfuse_cont = self.get_container(pool1)
-        self.start_dfuse(self.dfuse_hosts, pool1, dfuse_cont)
-        self.serial_tmp_dir = self.dfuse.mount_dir.value
+        dfuse = get_dfuse(self, self.dfuse_hosts)
+        start_dfuse(self, dfuse, pool1, dfuse_cont)
+        self.serial_tmp_dir = dfuse.mount_dir.value
 
         # Serialize/Deserialize cont1 to a new cont2 in pool2
         result = self.run_datamover(