diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-26 17:40:26 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-26 17:43:55 +0100 |
| commit | b55a01b168ebd5142d71e07555a1e8b215937f22 (patch) | |
| tree | 8d89da0030625238f8cbfee6ab31930202bb4c32 | |
| parent | eec4faf2092f29b5b3a9bb9a306d3e419780850d (diff) | |
Remove former allow_no_fip logic
Change-Id: Ie6e45572e98108fca114a1d798f2d2a99ad41299
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit e28706a10c20bcb359f7d2283802ea9b4ef4bc66)
| -rw-r--r-- | functest/core/tenantnetwork.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/rally.py | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/functest/core/tenantnetwork.py b/functest/core/tenantnetwork.py index 366477d00..d15dd9419 100644 --- a/functest/core/tenantnetwork.py +++ b/functest/core/tenantnetwork.py @@ -149,7 +149,6 @@ class TenantNetwork1(testcase.TestCase): __logger = logging.getLogger(__name__) cidr = '192.168.120.0/24' shared_network = False - allow_no_fip = False def __init__(self, **kwargs): if "case_name" not in kwargs: @@ -223,7 +222,7 @@ class TenantNetwork1(testcase.TestCase): Raises: expection on error """ assert self.cloud - if not self.allow_no_fip: + if env.get('NO_TENANT_NETWORK').lower() != 'true': assert self.ext_net provider = {} if hasattr(config.CONF, '{}_network_type'.format(self.case_name)): diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index c0999b196..1242e7960 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -68,7 +68,6 @@ class RallyBase(singlevm.VmReady2): visibility = 'public' shared_network = True - allow_no_fip = True task_timeout = 3600 def __init__(self, **kwargs): |