diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-21 23:31:56 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-22 07:48:02 +0200 |
| commit | 47207b77f9c0649c3ec1292505258431657c507a (patch) | |
| tree | 8e29a418edce9850c5b5c14610b17fc2d8acbf70 | |
| parent | ecea6d7c62213e3b84c6af9ea1f1c606eddadfc8 (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>
(cherry picked from commit 0fd76322f95b755d347826f707c092105506311b)
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 8 |
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 7f85961a6..6b584519d 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): @@ -199,6 +200,10 @@ class TempestCommon(singlevm.VmReady1): if self.verification_id is None: raise Exception('Verification UUID not found') + 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) @@ -292,7 +297,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, @@ -307,6 +312,7 @@ class TempestCommon(singlevm.VmReady1): **kwargs) == testcase.TestCase.EX_OK self.update_rally_regex() self.update_default_role() + shutil.copy("/etc/rally/rally.conf", self.res_dir) self.configure(**kwargs) self.generate_test_list(**kwargs) self.apply_tempest_blacklist() |