diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-27 13:26:46 +0100 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-27 13:26:46 +0100 |
commit | 3ab6d5693cb303fb73049287e772713a99f84be7 (patch) | |
tree | 945c57c3168250ef2d4e1a0a85f3d5358ef51338 /functest/core/tenantnetwork.py | |
parent | 126f2631f9f109bb7bb7feec8c140d021a8ebbc7 (diff) |
Protect vs false detected external networks if l2-only
Change-Id: I0e58c9df0e9971fcdae5fa7b209940569ae51a78
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/core/tenantnetwork.py')
-rw-r--r-- | functest/core/tenantnetwork.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/functest/core/tenantnetwork.py b/functest/core/tenantnetwork.py index 157cb149b..8b820cea5 100644 --- a/functest/core/tenantnetwork.py +++ b/functest/core/tenantnetwork.py @@ -155,19 +155,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 |