diff --git a/src/tests/ftest/checksum/csum_basic.py b/src/tests/ftest/checksum/csum_basic.py index 8f7e12778f9b..a5c5efd12686 100644 --- a/src/tests/ftest/checksum/csum_basic.py +++ b/src/tests/ftest/checksum/csum_basic.py @@ -33,17 +33,14 @@ def test_single_object_with_checksum(self): :avocado: tags=checksum :avocado: tags=CsumContainerValidation,test_single_object_with_checksum """ - no_of_dkeys = self.params.get("no_of_dkeys", '/run/dkeys/*')[0] - no_of_akeys = self.params.get("no_of_akeys", '/run/akeys/*')[0] + no_of_dkeys = self.params.get("no_of_dkeys", '/run/dkeys/*') + no_of_akeys = self.params.get("no_of_akeys", '/run/akeys/*') record_length = self.params.get("length", '/run/record/*') pool = add_pool(self, connect=False) pool.connect(2) - enable_checksum = self.params.get("enable_checksum", '/run/container/*') - container = add_container(self, pool, create=False) - container.input_params.enable_chksum = enable_checksum - container.create() + container = add_container(self, pool) container.open() obj = DaosObj(self.context, container.container) @@ -51,7 +48,7 @@ def test_single_object_with_checksum(self): obj.open() ioreq = IORequest(self.context, container.container, obj, objtype=4) - self.d_log.info("Writing the Single Dataset") + self.log_step("Write single dataset") record_index = 0 for dkey in range(no_of_dkeys): for akey in range(no_of_akeys): @@ -66,7 +63,7 @@ def test_single_object_with_checksum(self): if record_index == len(record_length): record_index = 0 - self.d_log.info("Single Dataset Verification -- Started") + self.log_step("Verify single dataset") record_index = 0 for dkey in range(no_of_dkeys): for akey in range(no_of_akeys): @@ -79,7 +76,7 @@ def test_single_object_with_checksum(self): "ERROR:Data mismatch for dkey={}, akey={}: indata={}, " "val={}".format( dkey, akey, indata, val.value.decode('utf-8'))) - self.d_log.error(message) + self.log.error(message) self.fail(message) record_index = record_index + 1 if record_index == len(record_length): diff --git a/src/tests/ftest/checksum/csum_basic.yaml b/src/tests/ftest/checksum/csum_basic.yaml index aae0ffadae0c..c8546cc8c90c 100644 --- a/src/tests/ftest/checksum/csum_basic.yaml +++ b/src/tests/ftest/checksum/csum_basic.yaml @@ -1,9 +1,9 @@ -# change host names to your reserved nodes, the -# required quantity is indicated by the placeholders hosts: test_servers: 1 test_clients: 1 + timeout: 100 + server_config: name: daos_server engines_per_host: 1 @@ -16,21 +16,20 @@ server_config: class: ram scm_mount: /mnt/daos system_ram_reserved: 1 + pool: scm_size: 3000000000 svcn: 1 -container: !mux - control_method: API - properties: - enable_checksum: true -dkeys: !mux - single: - no_of_dkeys: - - 50 -akeys: !mux - single: - no_of_akeys: - - 10 + +container: + properties: cksum:crc16,cksum_size:16384 + +dkeys: + no_of_dkeys: 50 + +akeys: + no_of_akeys: 10 + record: !mux 1Byte: length: diff --git a/src/tests/ftest/container/api_basic_attribute.py b/src/tests/ftest/container/api_basic_attribute.py index 026620a0cfef..7a967868dd3d 100644 --- a/src/tests/ftest/container/api_basic_attribute.py +++ b/src/tests/ftest/container/api_basic_attribute.py @@ -1,5 +1,5 @@ ''' - (C) Copyright 2018-2023 Intel Corporation. + (C) Copyright 2018-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' @@ -165,8 +165,8 @@ def test_basic_attribute_sync(self): if set_exp_result == 'FAIL': self.fail("set_attr() was expected to fail but it worked!") except DaosApiError as error: - print(error) - print(traceback.format_exc()) + self.log.error(error) + self.log.error(traceback.format_exc()) if self.expected_result == "PASS": self.fail( "set_attr was supposed to work, but failed! name-value = {}".format( @@ -176,8 +176,8 @@ def test_basic_attribute_sync(self): try: size, buf = self.container.container.list_attr() except DaosApiError as excep: - print(excep) - print(traceback.format_exc()) + self.log.error(excep) + self.log.error(traceback.format_exc()) self.fail("list_attr failed!") if self.expected_result == 'PASS': @@ -195,8 +195,8 @@ def test_basic_attribute_sync(self): if self.expected_result == 'FAIL': self.fail("get_attr() was expected to fail but it worked!") except (DaosApiError, DaosTestError) as excep: - print(excep) - print(traceback.format_exc()) + self.log.error(excep) + self.log.error(traceback.format_exc()) if self.expected_result == 'PASS': msg = "get_attr was supposed to work, but failed! attr_name = {}".format( self.attr_name) @@ -238,8 +238,8 @@ def test_basic_attribute_async(self): ret_code=callback_handler.ret_code, expected_result=set_exp_result, method_name="set_attr") except DaosApiError as error: - print(error) - print(traceback.format_exc()) + self.log.error(error) + self.log.error(traceback.format_exc()) if self.expected_result == "PASS": self.fail( "set_attr was supposed to work, but failed! name-value = {}".format( @@ -256,8 +256,8 @@ def test_basic_attribute_async(self): if ret_code != 0: self.fail("Unexpected RC after list_attr! {}".format(ret_code)) except DaosApiError as excep: - print(excep) - print(traceback.format_exc()) + self.log.error(excep) + self.log.error(traceback.format_exc()) self.fail("list_attr failed!") if self.expected_result == 'PASS': @@ -281,8 +281,8 @@ def test_basic_attribute_async(self): ret_code=callback_handler.ret_code, expected_result=self.expected_result, method_name="get_attr") except DaosApiError as excep: - print(excep) - print(traceback.format_exc()) + self.log.error(excep) + self.log.error(traceback.format_exc()) if self.expected_result == 'PASS': msg = "get_attr was supposed to work, but failed! attr_name = {}".format( self.attr_name) diff --git a/src/tests/ftest/container/api_basic_attribute.yaml b/src/tests/ftest/container/api_basic_attribute.yaml index 66632baecb53..ad61ff574573 100644 --- a/src/tests/ftest/container/api_basic_attribute.yaml +++ b/src/tests/ftest/container/api_basic_attribute.yaml @@ -56,6 +56,3 @@ attrtests: value: - NULL - FAIL - -container: - control_method: API diff --git a/src/tests/ftest/container/basic_snapshot.yaml b/src/tests/ftest/container/basic_snapshot.yaml index ec23305e92ed..6d934adc06a0 100644 --- a/src/tests/ftest/container/basic_snapshot.yaml +++ b/src/tests/ftest/container/basic_snapshot.yaml @@ -33,6 +33,3 @@ object_class: !mux obj_class: OC_RP_2G1 OC_RP_2G2: obj_class: OC_RP_2G2 - -container: - control_method: API diff --git a/src/tests/ftest/container/boundary.yaml b/src/tests/ftest/container/boundary.yaml index e0110b8307aa..fbee71255d65 100644 --- a/src/tests/ftest/container/boundary.yaml +++ b/src/tests/ftest/container/boundary.yaml @@ -19,7 +19,6 @@ pool: label: pool set_logmasks: False container: - control_method: API akey_size: 5 dkey_size: 5 data_size: 256 diff --git a/src/tests/ftest/container/destroy.yaml b/src/tests/ftest/container/destroy.yaml index a6545bca929c..2390b4d47123 100644 --- a/src/tests/ftest/container/destroy.yaml +++ b/src/tests/ftest/container/destroy.yaml @@ -21,9 +21,6 @@ server_config: pool: scm_size: 1G -container: - control_method: API - destroy_variants: destroy_uuid: !mux good_uid: diff --git a/src/tests/ftest/container/query_attribute.yaml b/src/tests/ftest/container/query_attribute.yaml index a47cc58dd7b1..5afa41b83fcf 100644 --- a/src/tests/ftest/container/query_attribute.yaml +++ b/src/tests/ftest/container/query_attribute.yaml @@ -15,6 +15,5 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1G - container: - control_method: API + properties: cksum:crc16,cksum_size:16384 diff --git a/src/tests/ftest/container/query_properties.py b/src/tests/ftest/container/query_properties.py index b288ddd1cdba..a562e87e9989 100644 --- a/src/tests/ftest/container/query_properties.py +++ b/src/tests/ftest/container/query_properties.py @@ -1,20 +1,16 @@ ''' - (C) Copyright 2018-2023 Intel Corporation. + (C) Copyright 2018-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent ''' -import ctypes - from apricot import TestWithServers -from pydaos.raw import DaosApiError, DaosContPropEnum, conversion, daos_cref from test_utils_container import add_container from test_utils_pool import add_pool class QueryPropertiesTest(TestWithServers): """ - Test Class Description: Verify container properties are set during container query - over pydaos API. + Test Class Description: Verify daos container get-prop :avocado: recursive """ @@ -26,124 +22,24 @@ def test_query_properties(self): some properties during create. Use Cases: - 1. Create a container with some properties related to checksum, type, etc. - configured. - 2. Call container query. it returns container info such as UUID, snapshots, etc., - but not properties. We verify the property by passing in an empty data structure - as pass by reference. - 3. Verify the property data structure passed in during step 2. + 1. Create a container with some properties related to checksum, type, etc. configured. + 2. Verify container get-prop returns the same properties set on create. :avocado: tags=all,full_regression :avocado: tags=vm :avocado: tags=container :avocado: tags=QueryPropertiesTest,test_query_properties """ - errors = [] - + self.log_step("Create pool and container with properties") pool = add_pool(self) - container = add_container(self, pool, create=False) - - # Prepare DaosContProperties. Update some items from default. These are - # properties that determine the values, not the actual values. The actual values - # are set in DaosContainer.create() based on these configurations. - chksum_type_conf = self.params.get("configured", "/run/properties/chksum_type/*") - srv_verify_conf = self.params.get("configured", "/run/properties/srv_verify/*") - chunk_size_conf = self.params.get("configured", "/run/properties/chunk_size/*") - - cont_prop_type = bytes("POSIX", "utf-8") # Updated - enable_chksum = True # Updated - srv_verify = srv_verify_conf - chksum_type = ctypes.c_uint64(chksum_type_conf) - chunk_size = ctypes.c_uint64(chunk_size_conf) - rd_lvl = ctypes.c_uint64(daos_cref.DAOS_PROP_CO_REDUN_DEFAULT) - con_in = [ - cont_prop_type, - enable_chksum, - srv_verify, - chksum_type, - chunk_size, - rd_lvl - ] - - # Create container with the DaosContProperties. - container.create(con_in=con_in) - - # Open the container. - container.open(pool_handle=pool.pool.handle) - - # Prepare the DaosProperty data structure that stores the values that are - # configured based on the properties we used during create. Here, we create - # the empty data structure and set the dpe_type fields. The values (dpe_val) will - # be filled during query. See DaosContainer.create() and DaosContProperties for - # more details. - - # If DaosContProperties.type is not "Unknown", there will be 4 elements. - - # Element 0: Layout type, which is determined by the container type. If the - # container type is POSIX, we expect the value to be - # DaosContPropEnum.DAOS_PROP_CO_LAYOUT_POSIX.value - - # Note: enable_chksum needs to be set to True to get the following 3 elements. - # Element 1: Checksum. In default, we expect it to be 1. - # Element 2: Checksum server verify. Since we updated the srv_verify to True, we - # expect the value to be 1. - # Element 3: Checksum chunk size. In default we expect it to be 16384. - cont_prop = daos_cref.DaosProperty(4) - - cont_prop.dpp_entries[0].dpe_type = ctypes.c_uint32( - DaosContPropEnum.DAOS_PROP_CO_LAYOUT_TYPE.value) - cont_prop.dpp_entries[1].dpe_type = ctypes.c_uint32( - DaosContPropEnum.DAOS_PROP_CO_CSUM.value) - cont_prop.dpp_entries[2].dpe_type = ctypes.c_uint32( - DaosContPropEnum.DAOS_PROP_CO_CSUM_SERVER_VERIFY.value) - cont_prop.dpp_entries[3].dpe_type = ctypes.c_uint32( - DaosContPropEnum.DAOS_PROP_CO_CSUM_CHUNK_SIZE.value) - - try: - cont_info = container.container.query(cont_prop=cont_prop) - except DaosApiError as error: - self.log.info("Container query error! %s", error) - - # Sanity check that query isn't broken. - uuid_query = conversion.c_uuid_to_str(cont_info.ci_uuid) - uuid_create = container.container.get_uuid_str() - if uuid_query != uuid_create: - msg = ("Container UUID obtained after create and after query don't match! " - "Create: {}, Query: {}".format(uuid_create, uuid_query)) - errors.append(msg) - - # Verify values set in cont_prop. - chksum_type_exp = self.params.get("expected", "/run/properties/chksum_type/*") - srv_verify_exp = self.params.get("expected", "/run/properties/srv_verify/*") - chunk_size_exp = self.params.get("expected", "/run/properties/chunk_size/*") - - # Verify layout type. - actual_layout_type = cont_prop.dpp_entries[0].dpe_val - expected_layout_type = DaosContPropEnum.DAOS_PROP_CO_LAYOUT_POSIX.value - if actual_layout_type != expected_layout_type: - msg = "Layout type is not POSIX! Expected = {}; Actual = {}".format( - expected_layout_type, actual_layout_type) - errors.append(msg) - - # Verify checksum. - if cont_prop.dpp_entries[1].dpe_val != chksum_type_exp: - msg = "Unexpected checksum from query! Expected = {}; Actual = {}".format( - chksum_type_exp, cont_prop.dpp_entries[1].dpe_val) - errors.append(msg) - - # Verify server verify. - if cont_prop.dpp_entries[2].dpe_val != srv_verify_exp: - msg = ("Unexpected server verify from query! " - "Expected = {}; Actual = {}".format( - srv_verify_exp, cont_prop.dpp_entries[2].dpe_val)) - errors.append(msg) + container = add_container(self, pool) - # Verify checksum chunk size. - if cont_prop.dpp_entries[3].dpe_val != chunk_size_exp: - msg = ("Unexpected checksum chunk size from query! " - "Expected = {}; Actual = {}".format( - chunk_size_exp, cont_prop.dpp_entries[3].dpe_val)) - errors.append(msg) + expected_props = { + "layout_type": self.params.get("layout_type", "/run/expected_get_prop/*"), + "cksum": self.params.get("cksum", "/run/expected_get_prop/*"), + "cksum_size": self.params.get("cksum_size", "/run/expected_get_prop/*"), + "srv_cksum": self.params.get("srv_cksum", "/run/expected_get_prop/*")} - if errors: - self.fail("\n----- Errors detected! -----\n{}".format("\n".join(errors))) + self.log_step("Verify container get-prop matches create") + if not container.verify_prop(expected_props): + self.fail("Unexpected properties from daos container get-prop") diff --git a/src/tests/ftest/container/query_properties.yaml b/src/tests/ftest/container/query_properties.yaml index 18c0447e8651..621de7b60b7b 100644 --- a/src/tests/ftest/container/query_properties.yaml +++ b/src/tests/ftest/container/query_properties.yaml @@ -20,15 +20,11 @@ pool: scm_size: 1G container: - control_method: API + type: POSIX + properties: cksum:crc16,cksum_size:16384,srv_cksum:on -properties: - chksum_type: - configured: 100 # Default - expected: 1 - srv_verify: - configured: true # Updated - expected: 1 - chunk_size: - configured: 0 # Default - expected: 16384 +expected_get_prop: + layout_type: "POSIX (1)" + cksum: "crc16" + cksum_size: "16384" + srv_cksum: "on" diff --git a/src/tests/ftest/container/snapshot.yaml b/src/tests/ftest/container/snapshot.yaml index d6ad5bab0e69..434ed451975f 100644 --- a/src/tests/ftest/container/snapshot.yaml +++ b/src/tests/ftest/container/snapshot.yaml @@ -35,6 +35,3 @@ object_class: !mux obj_class: OC_SX OC_RP_2GX: obj_class: OC_RP_2GX - -container: - control_method: API diff --git a/src/tests/ftest/control/dmg_system_cleanup.yaml b/src/tests/ftest/control/dmg_system_cleanup.yaml index 1eacdd1a6eab..905e4010b36f 100644 --- a/src/tests/ftest/control/dmg_system_cleanup.yaml +++ b/src/tests/ftest/control/dmg_system_cleanup.yaml @@ -16,7 +16,6 @@ server_config: pool: scm_size: 1GB container: - control_method: API akey_size: 5 dkey_size: 5 data_size: 32 diff --git a/src/tests/ftest/datamover/obj_small.yaml b/src/tests/ftest/datamover/obj_small.yaml index 0fd4d8c4ccf8..fb7f4f572926 100644 --- a/src/tests/ftest/datamover/obj_small.yaml +++ b/src/tests/ftest/datamover/obj_small.yaml @@ -18,8 +18,6 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1G -container: - control_method: API dcp: client_processes: np: 3 diff --git a/src/tests/ftest/datamover/serial_small.yaml b/src/tests/ftest/datamover/serial_small.yaml index 0a609336ce8f..a30bb50a1860 100644 --- a/src/tests/ftest/datamover/serial_small.yaml +++ b/src/tests/ftest/datamover/serial_small.yaml @@ -16,8 +16,6 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1G -container: - control_method: API dserialize: client_processes: np: 3 diff --git a/src/tests/ftest/dtx/basic.yaml b/src/tests/ftest/dtx/basic.yaml index bc3c22191513..ed26708ee145 100644 --- a/src/tests/ftest/dtx/basic.yaml +++ b/src/tests/ftest/dtx/basic.yaml @@ -30,6 +30,3 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1073741824 - -container: - control_method: API diff --git a/src/tests/ftest/erasurecode/offline_rebuild_single.yaml b/src/tests/ftest/erasurecode/offline_rebuild_single.yaml index 5e1e6caf22e6..210dd4589f65 100644 --- a/src/tests/ftest/erasurecode/offline_rebuild_single.yaml +++ b/src/tests/ftest/erasurecode/offline_rebuild_single.yaml @@ -36,7 +36,6 @@ pool: pool_query_timeout: 30 container: type: POSIX - control_method: API single_data_set: # [object_qty, record_qty, dkey, akey, data_size] - [1, 1, 1, 1, 4194304] diff --git a/src/tests/ftest/erasurecode/online_rebuild_single.yaml b/src/tests/ftest/erasurecode/online_rebuild_single.yaml index 7284a1f7134a..781605d841b2 100644 --- a/src/tests/ftest/erasurecode/online_rebuild_single.yaml +++ b/src/tests/ftest/erasurecode/online_rebuild_single.yaml @@ -34,7 +34,6 @@ pool: properties: rd_fac:2 container: type: POSIX - control_method: API single_data_set: # [object_qty, record_qty, dkey, akey, data_size] - [1, 1, 1, 1, 4194304] diff --git a/src/tests/ftest/erasurecode/rank_failure.yaml b/src/tests/ftest/erasurecode/rank_failure.yaml index 4b1319f8be15..51efe6370951 100644 --- a/src/tests/ftest/erasurecode/rank_failure.yaml +++ b/src/tests/ftest/erasurecode/rank_failure.yaml @@ -35,6 +35,3 @@ gen_io_conf: record_size: "1000" obj_num: "3" obj_class: "EC_8P2GX" - -container: - control_method: API diff --git a/src/tests/ftest/nvme/object.yaml b/src/tests/ftest/nvme/object.yaml index c2c2adbeea43..9df027486522 100644 --- a/src/tests/ftest/nvme/object.yaml +++ b/src/tests/ftest/nvme/object.yaml @@ -32,7 +32,6 @@ pool_3: scm_size: 4GB nvme_size: 350GB container: - control_method: API object_qty: 10 record_size: - 1 diff --git a/src/tests/ftest/object/create_many_dkeys.yaml b/src/tests/ftest/object/create_many_dkeys.yaml index 1ac3f1f3807c..66f06ce59f7e 100644 --- a/src/tests/ftest/object/create_many_dkeys.yaml +++ b/src/tests/ftest/object/create_many_dkeys.yaml @@ -19,6 +19,3 @@ pool: scm_size: 3G dkeys: number_of_dkeys: 1000000 - -container: - control_method: API diff --git a/src/tests/ftest/object/fetch_bad_param.yaml b/src/tests/ftest/object/fetch_bad_param.yaml index c2ee039ddc44..dc9c81ccd9e1 100644 --- a/src/tests/ftest/object/fetch_bad_param.yaml +++ b/src/tests/ftest/object/fetch_bad_param.yaml @@ -16,6 +16,3 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1073741824 - -container: - control_method: API diff --git a/src/tests/ftest/object/integrity.yaml b/src/tests/ftest/object/integrity.yaml index b6779465caf1..fefea0e42525 100644 --- a/src/tests/ftest/object/integrity.yaml +++ b/src/tests/ftest/object/integrity.yaml @@ -46,6 +46,3 @@ record: !mux - 32 - 512 - 1024 - -container: - control_method: APi diff --git a/src/tests/ftest/object/open_bad_param.yaml b/src/tests/ftest/object/open_bad_param.yaml index f59b15bc1640..722fe1dd5f32 100644 --- a/src/tests/ftest/object/open_bad_param.yaml +++ b/src/tests/ftest/object/open_bad_param.yaml @@ -14,6 +14,3 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1073741824 - -container: - control_method: API diff --git a/src/tests/ftest/object/punch_test.yaml b/src/tests/ftest/object/punch_test.yaml index 784c410c91e0..a6b0874ef0cb 100644 --- a/src/tests/ftest/object/punch_test.yaml +++ b/src/tests/ftest/object/punch_test.yaml @@ -15,6 +15,3 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1073741824 - -container: - control_method: API diff --git a/src/tests/ftest/object/update_bad_param.yaml b/src/tests/ftest/object/update_bad_param.yaml index d597e8df23d5..302650e4424c 100644 --- a/src/tests/ftest/object/update_bad_param.yaml +++ b/src/tests/ftest/object/update_bad_param.yaml @@ -14,6 +14,3 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1073741824 - -container: - control_method: API diff --git a/src/tests/ftest/osa/dmg_negative_test.yaml b/src/tests/ftest/osa/dmg_negative_test.yaml index 90bd43720462..b2adbe6584f7 100644 --- a/src/tests/ftest/osa/dmg_negative_test.yaml +++ b/src/tests/ftest/osa/dmg_negative_test.yaml @@ -38,9 +38,7 @@ pool: nvme_size: 54000000000 svcn: 4 container: - control_method: API - properties: - enable_checksum: true + properties: cksum:crc16,cksum_size:16384 test_sequence: dmg_cmd_test: # Rank list, target_list, Pass/Fail Condition diff --git a/src/tests/ftest/pool/evict.yaml b/src/tests/ftest/pool/evict.yaml index 1834742b9868..599129ee189f 100644 --- a/src/tests/ftest/pool/evict.yaml +++ b/src/tests/ftest/pool/evict.yaml @@ -20,7 +20,6 @@ pool: scm_size: 1G container: - control_method: API akey_size: 5 dkey_size: 5 data_size: 32 diff --git a/src/tests/ftest/rebuild/basic.yaml b/src/tests/ftest/rebuild/basic.yaml index 90443b8422f0..31d203f3036f 100644 --- a/src/tests/ftest/rebuild/basic.yaml +++ b/src/tests/ftest/rebuild/basic.yaml @@ -24,7 +24,6 @@ pool: pool_query_timeout: 30 properties: rd_fac:2 container: - control_method: API akey_size: 5 dkey_size: 5 debug: true diff --git a/src/tests/ftest/rebuild/cascading_failures.yaml b/src/tests/ftest/rebuild/cascading_failures.yaml index 0a771da31a2a..abc15a45f29f 100644 --- a/src/tests/ftest/rebuild/cascading_failures.yaml +++ b/src/tests/ftest/rebuild/cascading_failures.yaml @@ -22,7 +22,6 @@ pool: pool_query_timeout: 30 properties: rd_fac:2 container: - control_method: API akey_size: 5 dkey_size: 5 data_size: 5 diff --git a/src/tests/ftest/rebuild/delete_objects.yaml b/src/tests/ftest/rebuild/delete_objects.yaml index 63ca43d3bdb3..e80a2aec9c4d 100644 --- a/src/tests/ftest/rebuild/delete_objects.yaml +++ b/src/tests/ftest/rebuild/delete_objects.yaml @@ -20,7 +20,6 @@ pool: pool_query_timeout: 30 properties: rd_fac:2 container: - control_method: API akey_size: 5 dkey_size: 5 sizes: !mux diff --git a/src/tests/ftest/rebuild/read_array.yaml b/src/tests/ftest/rebuild/read_array.yaml index 144e9ef5043b..b7a64dfc3e28 100644 --- a/src/tests/ftest/rebuild/read_array.yaml +++ b/src/tests/ftest/rebuild/read_array.yaml @@ -23,7 +23,6 @@ pool: pool_query_timeout: 30 properties: rd_fac:2 container: - control_method: API object_qty: 10 record_qty: 10 akey_size: 5 diff --git a/src/tests/ftest/recovery/ddb.yaml b/src/tests/ftest/recovery/ddb.yaml index 1c5b90f22019..616bbe1b8c75 100644 --- a/src/tests/ftest/recovery/ddb.yaml +++ b/src/tests/ftest/recovery/ddb.yaml @@ -24,6 +24,3 @@ setup: pool: scm_size: 1G - -container: - control_method: API diff --git a/src/tests/ftest/server/metadata.yaml b/src/tests/ftest/server/metadata.yaml index 442d4b1a8381..e257ec8bcc64 100644 --- a/src/tests/ftest/server/metadata.yaml +++ b/src/tests/ftest/server/metadata.yaml @@ -53,7 +53,6 @@ pool: # properties: svc_ops_entry_age:300 # properties: svc_ops_entry_age:600 container: - control_method: API silent: true ior: clientslots: diff --git a/src/tests/ftest/telemetry/dkey_akey_enum_punch.yaml b/src/tests/ftest/telemetry/dkey_akey_enum_punch.yaml index aef14b8001dc..761086f2c2c3 100644 --- a/src/tests/ftest/telemetry/dkey_akey_enum_punch.yaml +++ b/src/tests/ftest/telemetry/dkey_akey_enum_punch.yaml @@ -17,6 +17,3 @@ server_config: pool: scm_size: 1G - -container: - control_method: API diff --git a/src/tests/ftest/util/test_utils_container.py b/src/tests/ftest/util/test_utils_container.py index 6dc3dd407368..da87f5e835a9 100644 --- a/src/tests/ftest/util/test_utils_container.py +++ b/src/tests/ftest/util/test_utils_container.py @@ -456,11 +456,10 @@ def skip_cleanup(self): @fail_on(DaosApiError) @fail_on(CommandFailure) - def create(self, con_in=None, query_id=None): + def create(self, query_id=None): """Create a container. Args: - con_in (optional): to be defined. Defaults to None. query_id (str, optional): container uuid or label which if specified will be used to find an existing container through a daos query. Defaults to None which will use a create command to populate this object. @@ -496,16 +495,8 @@ def create(self, con_in=None, query_id=None): # Refer daos_api for setting input params for DaosContainer. cop = self.input_params.get_con_create_params() - if con_in is not None: - cop.type = con_in[0] - cop.enable_chksum = con_in[1] - cop.srv_verify = con_in[2] - cop.chksum_type = con_in[3] - cop.chunk_size = con_in[4] - cop.rd_lvl = con_in[5] - else: - # Default to RANK fault domain (rd_lvl:1) when not specified - cop.rd_lvl = ctypes.c_uint64(1) + # Default to RANK fault domain (rd_lvl:1) + cop.rd_lvl = ctypes.c_uint64(1) kwargs["con_prop"] = cop