Protect vs false detected external networks if l2-only

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

diff --git a/functest/core/tenantnetwork.py b/functest/core/tenantnetwork.py
index d15dd94..3f53f94 100644 (file)
--- a/functest/core/tenantnetwork.py
+++ b/functest/core/tenantnetwork.py
@@ -158,19 +158,19 @@ class TenantNetwork1(testcase.TestCase):
         self.res_dir = os.path.join(self.dir_results, self.case_name)
         self.output_log_name = 'functest.log'
         self.output_debug_log_name = 'functest.debug.log'
+        self.ext_net = None
         try:
             cloud_config = os_client_config.get_config()
             self.cloud = self.orig_cloud = shade.OpenStackCloud(
                 cloud_config=cloud_config)
         except Exception:  # pylint: disable=broad-except
             self.cloud = self.orig_cloud = None
-            self.ext_net = None
             self.__logger.exception("Cannot connect to Cloud")
-        try:
-            self.ext_net = self.get_external_network(self.cloud)
-        except Exception:  # pylint: disable=broad-except
-            self.ext_net = None
-            self.__logger.exception("Cannot get the external network")
+        if env.get('NO_TENANT_NETWORK').lower() != 'true':
+            try:
+                self.ext_net = self.get_external_network(self.cloud)
+            except Exception:  # pylint: disable=broad-except
+                self.__logger.exception("Cannot get the external network")
         self.guid = str(uuid.uuid4())
         self.network = None
         self.subnet = None

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index a88f581..c9b5312 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -509,12 +509,14 @@ class TempestCommon(singlevm.VmReady2):
         """Update network section in tempest.conf"""
         rconfig = configparser.RawConfigParser()
         rconfig.read(self.conf_file)
-        if not rconfig.has_section('network'):
-            rconfig.add_section('network')
         if self.ext_net:
+            if not rconfig.has_section('network'):
+                rconfig.add_section('network')
             rconfig.set('network', 'public_network_id', self.ext_net.id)
             rconfig.set('network', 'floating_network_name', self.ext_net.name)
         else:
+            if not rconfig.has_section('network-feature-enabled'):
+                rconfig.add_section('network-feature-enabled')
             rconfig.set('network-feature-enabled', 'floating_ips', False)
         with open(self.conf_file, 'w') as config_file:
             rconfig.write(config_file)