Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  • diff --git a/src/tests/ftest/util/command_utils_base.py b/src/tests/ftest/util/command_utils_base.py
    index 31e94c1..8b31073 100644
    --- a/src/tests/ftest/util/command_utils_base.py
    +++ b/src/tests/ftest/util/command_utils_base.py
    @@ -415,7 +415,7 @@ class YamlParameters(ObjectWithParameters):
                 yaml_data = {}
             for name in self.get_param_names():
                 value = getattr(self, name).value
    -            if value is not None and value is not False:
    +            if value is not None:
                     yaml_data[name] = value

             return yaml_data if self.title is None else {self.title: yaml_data}
    diff --git a/src/tests/ftest/util/server_utils_params.py b/src/tests/ftest/util/server_utils_params.py
    index 7d68ad1..4bbd033 100644
    --- a/src/tests/ftest/util/server_utils_params.py
    +++ b/src/tests/ftest/util/server_utils_params.py
    @@ -106,6 +106,7 @@ class DaosServerYamlParameters(YamlParameters):

             self.provider = BasicParameter(None, default_provider)
             self.hyperthreads = BasicParameter(None, False)
    +        self.disable_vmd = BasicParameter(None, True)
             self.socket_dir = BasicParameter(None, "/var/run/daos_server")
             self.nr_hugepages = BasicParameter(None, 4096)
             self.control_log_mask = BasicParameter(None, "DEBUG")

    Code Block
    diff ---git a/src/tests/homeftest/samirravnvme/daos_CentOS8nvme_health.yaml b/src/tests/ftest/nvme/nvme_health.yaml   2021-07-01 01:32:40.148651459 +0000
    +++ 
    index 9ad6c67..5ec7dfe 100644
    --- a/src/tests/ftest/nvme/nvme_health.yaml
    +++ b/src/tests/ftest/nvme/nvme_health.yaml       2021-07-01
    22:18:24.236068631 +0000
    @@ -112,1024 +112,1024 @@  hosts:
       test_serversserver_config:
         - server-A -    - server-B
       test_clients:
         - client-C
     timeout: 900
    +disable_vmd: false
     server_config:
       engines_per_host: 2
       name: daos_server
    @@ -12,24 +12,24 @@
         0:
           pinned_numa_node: 0
           nr_ 0:
           pinned_numa_node: 0
           nr_xs_helpers: 1
    -         fabricfabric_iface: ib0
    + -        fabricfabric_iface_port: 31317eth0
    +      fabric_iface: eth0 +      fabricfabric_iface_port: 31317
    31416           loglog_file: daos_server0.log
               bdevbdev_class: nvme
    -         bdevbdev_list: ["0000:81:00.0"]
    -         scmscm_class: dcpm
    -         scmscm_list: ["/dev/pmem0"]
    +         bdevbdev_list: ["0000:5d:05.5"]
    +         scmscm_class: ram
    +         scmscm_size: 32
               scmscm_mount: /mnt/daos0
            11:
               pinnedpinned_numa_node: 1
               nrnr_xs_helpers: 1
    -         fabricfabric_iface: ib1
    +   -      fabricfabric_iface_port: 31417eth0
    +      fabric_iface: eth0 +      fabricfabric_iface_port: 31417
       31517        loglog_file: daos_server1.log
               bdevbdev_class: nvme
    -         bdevbdev_list: ["0000:da:00.0"]
    -         scmscm_class: dcpm
    -         scmscm_list: ["/dev/pmem1"]
    +         bdevbdev_list: ["0000:85:05.5"]
    +         scmscm_class: ram
    +         scmscm_size: 32
               scmscm_mount: /mnt/daos1
     
     transport_config:      allowtransport_insecureconfig:
    True @@ -45,3 +45,4 @@      control_method: dmg
         number_of_pools: 40
         pool_used_percentage: 75allow_insecure: True

    Update the test nvme_health.yaml file

...