From b116591e60ceb51ed3d38b838884c33de74f40a5 Mon Sep 17 00:00:00 2001 From: Dalton Bohning Date: Mon, 7 Oct 2024 07:23:01 -0700 Subject: [PATCH] DAOS-15776 test: remove DataMoverTestBase.create_pool (#15079) (#15254) Replace DataMoverTestBase.create_pool with self.get_pool Signed-off-by: Dalton Bohning --- src/tests/ftest/datamover/copy_procs.py | 4 ++-- src/tests/ftest/datamover/dst_create.py | 6 ++---- src/tests/ftest/datamover/large_dir.py | 4 ++-- src/tests/ftest/datamover/large_file.py | 4 ++-- src/tests/ftest/datamover/negative.py | 4 ++-- src/tests/ftest/datamover/obj_large_posix.py | 4 ++-- src/tests/ftest/datamover/obj_small.py | 8 +++----- src/tests/ftest/datamover/posix_meta_entry.py | 2 +- src/tests/ftest/datamover/posix_preserve_props.py | 5 ++--- src/tests/ftest/datamover/posix_subsets.py | 4 ++-- src/tests/ftest/datamover/posix_symlinks.py | 2 +- src/tests/ftest/datamover/posix_types.py | 6 +++--- src/tests/ftest/datamover/serial_large_posix.py | 6 +++--- src/tests/ftest/datamover/serial_small.py | 8 +++----- src/tests/ftest/deployment/basic_checkout.py | 4 ++-- src/tests/ftest/util/data_mover_test_base.py | 15 --------------- 16 files changed, 32 insertions(+), 54 deletions(-) diff --git a/src/tests/ftest/datamover/copy_procs.py b/src/tests/ftest/datamover/copy_procs.py index ce980f373f4..a1734659587 100644 --- a/src/tests/ftest/datamover/copy_procs.py +++ b/src/tests/ftest/datamover/copy_procs.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2020-2022 Intel Corporation. + (C) Copyright 2020-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -46,7 +46,7 @@ def test_copy_procs(self): :avocado: tags=DmvrCopyProcs,test_copy_procs """ # Create pool and containers - pool1 = self.create_pool() + pool1 = self.get_pool() cont1 = self.get_container(pool1) cont2 = self.get_container(pool1) diff --git a/src/tests/ftest/datamover/dst_create.py b/src/tests/ftest/datamover/dst_create.py index a0a5f4bef27..379c152f763 100644 --- a/src/tests/ftest/datamover/dst_create.py +++ b/src/tests/ftest/datamover/dst_create.py @@ -58,8 +58,7 @@ def run_dm_dst_create(self, tool, cont_type, api, check_props): self.set_api(api) # Create 1 pool - pool1 = self.create_pool() - pool1.connect(2) + pool1 = self.get_pool() # Create a source cont cont1 = self.get_container(pool1, type=cont_type) @@ -98,8 +97,7 @@ def run_dm_dst_create(self, tool, cont_type, api, check_props): self.verify_cont(cont3, api, check_props, src_props) # Create another pool - pool2 = self.create_pool() - pool2.connect(2) + pool2 = self.get_pool() result = self.run_datamover( self.test_id + " cont1 to cont4 (different pool) (empty cont)", diff --git a/src/tests/ftest/datamover/large_dir.py b/src/tests/ftest/datamover/large_dir.py index f5e6c0e9aac..53187382007 100644 --- a/src/tests/ftest/datamover/large_dir.py +++ b/src/tests/ftest/datamover/large_dir.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2020-2022 Intel Corporation. + (C) Copyright 2020-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -46,7 +46,7 @@ def run_dm_large_dir(self, tool): file_size = self.params.get("bytes", self.mdtest_cmd.namespace) # create pool and cont1 - pool = self.create_pool() + pool = self.get_pool() cont1 = self.get_container(pool) # run mdtest to create data in cont1 diff --git a/src/tests/ftest/datamover/large_file.py b/src/tests/ftest/datamover/large_file.py index 6fc9faf03e0..b962bdca376 100644 --- a/src/tests/ftest/datamover/large_file.py +++ b/src/tests/ftest/datamover/large_file.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2020-2023 Intel Corporation. + (C) Copyright 2020-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -43,7 +43,7 @@ def run_dm_large_file(self, tool): self.fail("Failed to get ior processes for {}".format(self.tool)) # create pool and cont - pool = self.create_pool() + pool = self.get_pool() cont1 = self.get_container(pool) # create initial data in cont1 diff --git a/src/tests/ftest/datamover/negative.py b/src/tests/ftest/datamover/negative.py index 3b05e1c8dfd..f3891045d86 100644 --- a/src/tests/ftest/datamover/negative.py +++ b/src/tests/ftest/datamover/negative.py @@ -65,7 +65,7 @@ def test_dm_bad_params_dcp(self): start_dfuse(self, dfuse) # Create a test pool - pool1 = self.create_pool() + pool1 = self.get_pool() # Create a special container to hold UNS entries uns_cont = self.get_container(pool1) @@ -215,7 +215,7 @@ def test_dm_bad_params_fs_copy(self): start_dfuse(self, dfuse) # Create a test pool - pool1 = self.create_pool() + pool1 = self.get_pool() # Create a special container to hold UNS entries uns_cont = self.get_container(pool1) diff --git a/src/tests/ftest/datamover/obj_large_posix.py b/src/tests/ftest/datamover/obj_large_posix.py index 87f252ea23e..f522e7a92df 100644 --- a/src/tests/ftest/datamover/obj_large_posix.py +++ b/src/tests/ftest/datamover/obj_large_posix.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2020-2022 Intel Corporation. + (C) Copyright 2020-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -37,7 +37,7 @@ def run_dm_obj_large_posix(self, tool): file_size = self.params.get("bytes", "/run/mdtest/*") # Create pool1 and cont1 - pool1 = self.create_pool() + pool1 = self.get_pool() cont1 = self.get_container(pool1) # Create a large directory in cont1 diff --git a/src/tests/ftest/datamover/obj_small.py b/src/tests/ftest/datamover/obj_small.py index ed9ba5674b5..4e3a4d1fbb2 100644 --- a/src/tests/ftest/datamover/obj_small.py +++ b/src/tests/ftest/datamover/obj_small.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2020-2023 Intel Corporation. + (C) Copyright 2020-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -58,8 +58,7 @@ def run_dm_obj_small(self, tool): self.set_tool(tool) # Create pool1 - pool1 = self.create_pool() - pool1.connect(2) + pool1 = self.get_pool() # Create cont1 cont1 = self.get_container(pool1) @@ -85,8 +84,7 @@ def run_dm_obj_small(self, tool): self.num_akeys_array, self.akey_sizes, self.akey_extents) # Create pool2 - pool2 = self.create_pool() - pool2.connect(2) + pool2 = self.get_pool() # Clone cont1 to a new cont3 in pool2 result = self.run_datamover( diff --git a/src/tests/ftest/datamover/posix_meta_entry.py b/src/tests/ftest/datamover/posix_meta_entry.py index bb608c27853..a37818ccbcc 100644 --- a/src/tests/ftest/datamover/posix_meta_entry.py +++ b/src/tests/ftest/datamover/posix_meta_entry.py @@ -67,7 +67,7 @@ def run_dm_posix_meta_entry(self, tool): start_dfuse(self, dfuse) # Create 1 pool - pool1 = self.create_pool() + pool1 = self.get_pool() # Create 1 source container with test data cont1 = self.get_container(pool1) diff --git a/src/tests/ftest/datamover/posix_preserve_props.py b/src/tests/ftest/datamover/posix_preserve_props.py index 91df7c11135..bc1e52ace71 100644 --- a/src/tests/ftest/datamover/posix_preserve_props.py +++ b/src/tests/ftest/datamover/posix_preserve_props.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2020-2023 Intel Corporation. + (C) Copyright 2020-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -56,8 +56,7 @@ def run_dm_preserve_props(self, tool, cont_type, api): self.set_api(api) # Create 1 pool - pool1 = self.create_pool() - pool1.connect(2) + pool1 = self.get_pool() # set the path to read and write container properties self.preserve_props_path = join(self.tmp, "cont_props.h5") diff --git a/src/tests/ftest/datamover/posix_subsets.py b/src/tests/ftest/datamover/posix_subsets.py index 45e33d9cec9..fd14e0cf7b0 100644 --- a/src/tests/ftest/datamover/posix_subsets.py +++ b/src/tests/ftest/datamover/posix_subsets.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2020-2023 Intel Corporation. + (C) Copyright 2020-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -54,7 +54,7 @@ def run_dm_posix_subsets(self, tool): start_dfuse(self, dfuse) # Create 1 pool - pool1 = self.create_pool() + pool1 = self.get_pool() # create dfuse containers to test copying to dfuse subdirectories dfuse_cont1 = self.get_container(pool1) diff --git a/src/tests/ftest/datamover/posix_symlinks.py b/src/tests/ftest/datamover/posix_symlinks.py index 68d60e4c973..f1dc87e46d7 100644 --- a/src/tests/ftest/datamover/posix_symlinks.py +++ b/src/tests/ftest/datamover/posix_symlinks.py @@ -60,7 +60,7 @@ def run_dm_posix_symlinks(self, tool): start_dfuse(self, dfuse) # Create 1 pool - pool1 = self.create_pool() + pool1 = self.get_pool() # Create a special container to hold UNS entries uns_cont = self.get_container(pool1) diff --git a/src/tests/ftest/datamover/posix_types.py b/src/tests/ftest/datamover/posix_types.py index 0ef85d018a8..79583bfb574 100644 --- a/src/tests/ftest/datamover/posix_types.py +++ b/src/tests/ftest/datamover/posix_types.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2020-2023 Intel Corporation. + (C) Copyright 2020-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -68,8 +68,8 @@ def run_dm_posix_types(self, tool): start_dfuse(self, dfuse) # Create 2 pools - pool1 = self.create_pool(label='pool1') - pool2 = self.create_pool(label='pool2') + pool1 = self.get_pool(label='pool1') + pool2 = self.get_pool(label='pool2') # Create a special container to hold UNS entries uns_cont = self.get_container(pool1) diff --git a/src/tests/ftest/datamover/serial_large_posix.py b/src/tests/ftest/datamover/serial_large_posix.py index 6917097d901..0feb7253a8d 100644 --- a/src/tests/ftest/datamover/serial_large_posix.py +++ b/src/tests/ftest/datamover/serial_large_posix.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2020-2022 Intel Corporation. + (C) Copyright 2020-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -43,7 +43,7 @@ def run_dm_serial_large_posix(self, tool): file_size = self.params.get("bytes", "/run/mdtest/*") # Create pool1 and cont1 - pool1 = self.create_pool() + pool1 = self.get_pool() cont1 = self.get_container(pool1) # Create a large directory in cont1 @@ -51,7 +51,7 @@ def run_dm_serial_large_posix(self, tool): self.run_mdtest_with_params("DAOS", "/", pool1, cont1, flags=mdtest_flags[0]) # Create pool2 - pool2 = self.create_pool() + pool2 = self.get_pool() # Use dfuse as a shared intermediate for serialize + deserialize dfuse_cont = self.get_container(pool1) diff --git a/src/tests/ftest/datamover/serial_small.py b/src/tests/ftest/datamover/serial_small.py index 28ce84bee35..75e91285959 100644 --- a/src/tests/ftest/datamover/serial_small.py +++ b/src/tests/ftest/datamover/serial_small.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2020-2022 Intel Corporation. + (C) Copyright 2020-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -56,8 +56,7 @@ def run_dm_serial_small(self, tool): self.set_tool(tool) # Create pool1 - pool1 = self.create_pool() - pool1.connect(2) + pool1 = self.get_pool() # Create cont1 cont1 = self.get_container(pool1) @@ -69,8 +68,7 @@ def run_dm_serial_small(self, tool): self.num_akeys_array, self.akey_sizes, self.akey_extents) # Create pool2 - pool2 = self.create_pool() - pool2.connect(2) + pool2 = self.get_pool() # Serialize/Deserialize cont1 to a new cont2 in pool2 result = self.run_datamover( diff --git a/src/tests/ftest/deployment/basic_checkout.py b/src/tests/ftest/deployment/basic_checkout.py index 52a828e8329..216e89fd795 100644 --- a/src/tests/ftest/deployment/basic_checkout.py +++ b/src/tests/ftest/deployment/basic_checkout.py @@ -1,5 +1,5 @@ """ - (C) Copyright 2018-2023 Intel Corporation. + (C) Copyright 2018-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent """ @@ -120,7 +120,7 @@ def test_basic_checkout_dm(self): self.ior_ppn = self.ppn # create pool and container - pool = self.create_pool() + pool = self.get_pool() cont = self.get_container(pool, oclass=self.ior_cmd.dfs_oclass.value) # run datamover diff --git a/src/tests/ftest/util/data_mover_test_base.py b/src/tests/ftest/util/data_mover_test_base.py index 669a720228c..64a330c09c8 100644 --- a/src/tests/ftest/util/data_mover_test_base.py +++ b/src/tests/ftest/util/data_mover_test_base.py @@ -113,7 +113,6 @@ def __init__(self, *args, **kwargs): self.ddeserialize_cmd = None self.fs_copy_cmd = None self.cont_clone_cmd = None - self.pool = [] self.dfuse_hosts = None self.num_run_datamover = 0 # Number of times run_datamover was called @@ -306,20 +305,6 @@ def _validate_param_type(self, param_type): self.fail("Invalid param_type: {}".format(_type)) return None - def create_pool(self, **params): - """Create a TestPool object and adds to self.pool. - - Returns: - TestPool: the created pool - - """ - pool = self.get_pool(connect=False, **params) - - # Save the pool - self.pool.append(pool) - - return pool - def parse_create_cont_label(self, output): """Parse a uuid or label from create container output.