DAOS-15645 test: change default cont control_method to daos (#15546)

Change the default container control_method to daos instead of API. Update configs to explicitly use API/daos to maintain existing behavior. Signed-off-by: Dalton Bohning <[email protected]>
daos-stack · Dec 9, 2024 · 55a4c8a · 55a4c8a
1 parent 84a4f34
commit 55a4c8a
Show file tree

Hide file tree

Showing 24 changed files with 50 additions and 1 deletion.
diff --git a/src/tests/ftest/checksum/csum_basic.yaml b/src/tests/ftest/checksum/csum_basic.yaml
@@ -20,6 +20,7 @@ pool:
   scm_size: 3000000000
   svcn: 1
 container: !mux
+  control_method: API
   properties:
     enable_checksum: true
 dkeys: !mux

diff --git a/src/tests/ftest/container/api_basic_attribute.yaml b/src/tests/ftest/container/api_basic_attribute.yaml
@@ -56,3 +56,6 @@ 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
@@ -33,3 +33,6 @@ 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
@@ -19,6 +19,7 @@ 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/query_attribute.yaml b/src/tests/ftest/container/query_attribute.yaml
@@ -15,3 +15,6 @@ server_config:
   system_ram_reserved: 1
 pool:
   scm_size: 1G
+
+container:
+  control_method: API
diff --git a/src/tests/ftest/container/snapshot.yaml b/src/tests/ftest/container/snapshot.yaml
@@ -35,3 +35,6 @@ 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
@@ -16,6 +16,7 @@ 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/dtx/basic.yaml b/src/tests/ftest/dtx/basic.yaml
@@ -30,3 +30,6 @@ server_config:
   system_ram_reserved: 1
 pool:
   scm_size: 1073741824
+
+container:
+  control_method: API
diff --git a/src/tests/ftest/erasurecode/rank_failure.yaml b/src/tests/ftest/erasurecode/rank_failure.yaml
@@ -35,3 +35,6 @@ 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
@@ -32,6 +32,7 @@ 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
@@ -19,3 +19,6 @@ 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
@@ -16,3 +16,6 @@ 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
@@ -46,3 +46,6 @@ 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
@@ -14,3 +14,6 @@ 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
@@ -15,3 +15,6 @@ 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
@@ -14,3 +14,6 @@ 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
@@ -38,6 +38,7 @@ pool:
   nvme_size: 54000000000
   svcn: 4
 container:
+  control_method: API
   properties:
     enable_checksum: true
 test_sequence:

diff --git a/src/tests/ftest/pool/evict.yaml b/src/tests/ftest/pool/evict.yaml
@@ -20,6 +20,7 @@ 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
@@ -24,6 +24,7 @@ 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
@@ -22,6 +22,7 @@ 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
@@ -20,6 +20,7 @@ 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
@@ -23,6 +23,7 @@ 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/telemetry/dkey_akey_enum_punch.yaml b/src/tests/ftest/telemetry/dkey_akey_enum_punch.yaml
@@ -17,3 +17,6 @@ server_config:
 
 pool:
   scm_size: 1G
+
+container:
+  control_method: API
diff --git a/src/tests/ftest/util/test_utils_base.py b/src/tests/ftest/util/test_utils_base.py
@@ -79,7 +79,7 @@ def __init__(self, namespace):
         # Test yaml parameter used to define the control method:
         #   USE_API    - use the API methods to create/destroy containers
         #   USE_DAOS   - use the daos command to create/destroy pools/containers
-        self.control_method = BasicParameter(self.USE_API, self.USE_API)
+        self.control_method = BasicParameter(self.USE_DAOS, self.USE_DAOS)
 
     def _log_method(self, name, kwargs):
         """Log the method call with its arguments.
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,3 +56,6 @@ attrtests: @@
           value:
             - NULL
             - FAIL
+    container:
+      control_method: API