Stop creating network resources in tempest

fixed_network_name is not used in neutron or nova gates [1].
It may bypass juju bug (subnet discovery).

[1] http://logs.openstack.org/46/603046/1/check/tempest-full/a8468a1/controller/logs/tempest_conf.txt

Change-Id: I820e8c723918ed683ed1f8016363eb70bad0d14a
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit ac31a32320122ea1683fe9884e5bf1f969678b03)

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 8eaf609..d779d63 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -171,7 +171,7 @@ def update_tempest_conf_file(conf_file, rconfig):
 
 
 def configure_tempest_update_params(
-        tempest_conf_file, network_name=None, image_id=None, flavor_id=None,
+        tempest_conf_file, image_id=None, flavor_id=None,
         compute_cnt=1, image_alt_id=None, flavor_alt_id=None,
         domain_name="Default"):
     # pylint: disable=too-many-branches, too-many-arguments
@@ -181,7 +181,6 @@ def configure_tempest_update_params(
     LOGGER.debug("Updating selected tempest.conf parameters...")
     rconfig = configparser.RawConfigParser()
     rconfig.read(tempest_conf_file)
-    rconfig.set('compute', 'fixed_network_name', network_name)
     rconfig.set('compute', 'volume_device_name', env.get('VOLUME_DEVICE_NAME'))
     if image_id is not None:
         rconfig.set('compute', 'image_ref', image_id)

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index da22d69..1307e32 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -36,7 +36,6 @@ class TempestCommon(singlevm.VmReady2):
     """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):
@@ -93,6 +92,9 @@ class TempestCommon(singlevm.VmReady2):
         except Exception:  # pylint: disable=broad-except
             pass
 
+    def create_network_resources(self):
+        pass
+
     def check_services(self):
         """Check the mandatory services."""
         for service in self.services:
@@ -398,7 +400,7 @@ class TempestCommon(singlevm.VmReady2):
         if not self.conf_file:
             raise Exception("Tempest verifier configuring failed")
         conf_utils.configure_tempest_update_params(
-            self.conf_file, network_name=self.network.name,
+            self.conf_file,
             image_id=self.image.id,
             flavor_id=self.flavor.id,
             compute_cnt=compute_cnt,