aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-05-24 12:04:16 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-05-24 12:05:27 +0200
commit7ccc1b0793e32cad3912e63bbca971d5c3ecd724 (patch)
treedf08bb8ad3adb529d90fd6bb81fca85193819032
parent82ceefd8f1609508a476aa2e4573e59926653165 (diff)
Precise validation configs in Neutron
ServerActionsTestJSON.test_reboot_server_hard [1] sometimes fails in gates. We may increase timeouts if it stills fails. [1] http://artifacts.opnfv.org/functest/LIQH38CPR30X/functest-opnfv-functest-smoke-hunter-tempest_full-run-649/tempest_full/tempest-report.html Change-Id: Ia27c0faead1df5c2b33a3e1a272e5a1010a5a83e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-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 44b6288d4..9317a832e 100644
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -56,6 +56,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 9217b36f1..efd7114a2 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -56,6 +56,12 @@ network-feature-enabled:
floating_ips: true
placement:
max_microversion: "1.30"
+validation:
+ image_ssh_user: cirros
+ ssh_timeout: 196
+ ip_version_for_ssh: 4
+ run_validation: true
+ connect_method: floating
volume:
max_microversion: 3.55
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 e1cec94e2..068edc09c 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
@@ -56,6 +56,12 @@ network-feature-enabled:
floating_ips: true
placement:
max_microversion: "1.30"
+validation:
+ image_ssh_user: cirros
+ ssh_timeout: 196
+ ip_version_for_ssh: 4
+ run_validation: true
+ connect_method: floating
volume:
max_microversion: 3.55
storage_protocol: ceph
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 84aab74d4..3ca7ee4f4 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -525,6 +525,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()
@@ -590,6 +600,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)