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)

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 7f85961..6b58451 100644 (file)
--- 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()