summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-08-21 23:31:56 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-08-21 23:34:46 +0200
commit0fd76322f95b755d347826f707c092105506311b (patch)
treee825c47744a90af5c8b31e4aefa5b53422731daf
parent734347cf09463fbfef7c8eab6484f2487a2609f9 (diff)
Fix fixed_network_name in tempest.conf
It also copies rally.conf and tempest.log in res_dir. Change-Id: Ib907a29ba3f47ca861d3af8afc0ee74446222e89 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 1182f2339..216709f83 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -36,6 +36,7 @@ class TempestCommon(singlevm.VmReady1):
"""TempestCommon testcases implementation class."""
visibility = 'public'
+ shared_network = True
filename_alt = '/home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img'
def __init__(self, **kwargs):
@@ -226,6 +227,10 @@ class TempestCommon(singlevm.VmReady1):
raise Exception('Verification UUID not found')
LOGGER.info('Verification UUID: %s', self.verification_id)
+ shutil.copy(
+ "{}/tempest.log".format(self.deployment_dir),
+ "{}/tempest.debug.log".format(self.res_dir))
+
def parse_verifier_result(self):
"""Parse and save test results."""
stat = self.get_verifier_result(self.verification_id)
@@ -346,7 +351,7 @@ class TempestCommon(singlevm.VmReady1):
self.conf_file = conf_utils.configure_verifier(self.deployment_dir)
conf_utils.configure_tempest_update_params(
- self.conf_file, network_name=self.network.id,
+ self.conf_file, network_name=self.network.name,
image_id=self.image.id,
flavor_id=self.flavor.id,
compute_cnt=compute_cnt,
@@ -362,6 +367,7 @@ class TempestCommon(singlevm.VmReady1):
self.update_rally_regex()
self.update_default_role()
self.update_rally_logs()
+ shutil.copy("/etc/rally/rally.conf", self.res_dir)
self.configure(**kwargs)
self.generate_test_list(**kwargs)
self.apply_tempest_blacklist()