diff --git a/src/tests/ftest/control/config_generate_run.py b/src/tests/ftest/control/config_generate_run.py index 98b57b64f00..efaa992df31 100644 --- a/src/tests/ftest/control/config_generate_run.py +++ b/src/tests/ftest/control/config_generate_run.py @@ -4,6 +4,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent ''' +import os + import yaml from apricot import TestWithServers from server_utils import ServerFailed @@ -45,16 +47,16 @@ def test_config_generate_run(self): # use_tmpfs_scm specifies that a MD-on-SSD conf should be generated and control metadata # path needs to be set in that case. - ext_md_path = "" + control_metadata = None if use_tmpfs_scm: - ext_md_path = self.test_env.log_dir + control_metadata = os.path.join(self.test_env.log_dir, 'control_metadata') # Call dmg config generate. AP is always the first server host. server_host = self.hostlist_servers[0] result = self.get_dmg_command().config_generate( access_points=server_host, num_engines=num_engines, scm_only=scm_only, net_class=net_class, net_provider=net_provider, use_tmpfs_scm=use_tmpfs_scm, - control_metadata_path=ext_md_path) + control_metadata_path=control_metadata) try: generated_yaml = yaml.safe_load(result.stdout) @@ -70,7 +72,7 @@ def test_config_generate_run(self): # Create a new server config from generated_yaml and update SCM-related # data in engine_params so that the cleanup before the server start # works. - self.log.info("Copy config to /etc/daos and update engine_params") + self.log.info("Copy config to %s and update engine_params", self.test_env.server_config) self.server_managers[0].update_config_file_from_file(generated_yaml) # Start server with the generated config. diff --git a/src/tests/ftest/harness/config.yaml b/src/tests/ftest/harness/config.yaml index a9c19625b3e..be19a641812 100644 --- a/src/tests/ftest/harness/config.yaml +++ b/src/tests/ftest/harness/config.yaml @@ -9,6 +9,8 @@ server_config: engines_per_host: 1 engines: 0: + targets: 4 + nr_xs_helpers: 0 storage: 0: class: ram diff --git a/src/tests/ftest/util/dmg_utils_base.py b/src/tests/ftest/util/dmg_utils_base.py index 31ba1b50f33..a601b590033 100644 --- a/src/tests/ftest/util/dmg_utils_base.py +++ b/src/tests/ftest/util/dmg_utils_base.py @@ -8,6 +8,7 @@ from ClusterShell.NodeSet import NodeSet from command_utils import CommandWithSubCommand, YamlCommand from command_utils_base import BasicParameter, CommandWithParameters, FormattedParameter +from environment_utils import TestEnvironment from general_utils import nodeset_append_suffix @@ -30,7 +31,7 @@ def __init__(self, path, yaml_cfg=None, hostlist_suffix=None): self.temporary_file_hosts = NodeSet(gethostname().split(".")[0]) # If specified use the configuration file from the YamlParameters object - default_yaml_file = None + default_yaml_file = TestEnvironment().control_config if self.yaml is not None and hasattr(self.yaml, "filename"): default_yaml_file = self.yaml.filename