aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/smoke-cntt/tempest_conf.yaml6
-rw-r--r--functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml6
-rw-r--r--functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml6
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py11
4 files changed, 29 insertions, 0 deletions
diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index a1bc23284..4ce4cf42c 100644
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -55,6 +55,12 @@ network-feature-enabled:
floating_ips: true
placement:
max_microversion: "1.10"
+validation:
+ image_ssh_user: cirros
+ ssh_timeout: 196
+ ip_version_for_ssh: 4
+ run_validation: true
+ connect_method: floating
volume:
max_microversion: 3.43
storage_protocol: ceph
diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
index 70bc0e152..ce943384e 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -55,6 +55,12 @@ network-feature-enabled:
floating_ips: true
placement:
max_microversion: 1.36
+validation:
+ image_ssh_user: cirros
+ ssh_timeout: 196
+ ip_version_for_ssh: 4
+ run_validation: true
+ connect_method: floating
volume:
max_microversion: "3.60"
storage_protocol: ceph
diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
index 996a414cb..214b18eeb 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
@@ -55,6 +55,12 @@ network-feature-enabled:
floating_ips: true
placement:
max_microversion: 1.36
+validation:
+ image_ssh_user: cirros
+ ssh_timeout: 196
+ ip_version_for_ssh: 4
+ run_validation: true
+ connect_method: floating
volume:
max_microversion: "3.60"
storage_protocol: ceph
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index a996171e4..8fe1aae61 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -517,6 +517,16 @@ class TempestCommon(singlevm.VmReady2):
with open(self.conf_file, 'w') as config_file:
rconfig.write(config_file)
+ def update_validation_section(self):
+ """Update validation section in tempest.conf"""
+ rconfig = configparser.RawConfigParser()
+ rconfig.read(self.conf_file)
+ if not rconfig.has_section('validation'):
+ rconfig.add_section('validation')
+ rconfig.set('validation', 'network_for_ssh', self.network.name)
+ with open(self.conf_file, 'w') as config_file:
+ rconfig.write(config_file)
+
def update_scenario_section(self):
"""Update scenario section in tempest.conf"""
rconfig = configparser.RawConfigParser()
@@ -582,6 +592,7 @@ class TempestCommon(singlevm.VmReady2):
domain_id=self.project.domain.id)
self.update_network_section()
self.update_compute_section()
+ self.update_validation_section()
self.update_scenario_section()
self.backup_tempest_config(self.conf_file, self.res_dir)