aboutsummaryrefslogtreecommitdiffstats
path: root/functest/core
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-31 16:04:36 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-08-03 12:12:26 +0200
commit1e6b7a08862b4a8ebe372fc5f3a46356181618f3 (patch)
tree6f23e9640e774b31ba6f4299a6d1d932e1503a17 /functest/core
parent8cfa994563a238bbd34d01e97de1fcfd40535e6e (diff)
Protect VMTP vs cidr conflicts
It now runs vtmp via a new admin member. Else it fails due to cidr already used. It only creates a router and both tenant networks are still created by VMTP. Change-Id: I05ed41a3b7a01ee97c720176c404929bf8ea97a0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/core')
-rw-r--r--functest/core/tenantnetwork.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/functest/core/tenantnetwork.py b/functest/core/tenantnetwork.py
index 5c3af2260..760dc30e9 100644
--- a/functest/core/tenantnetwork.py
+++ b/functest/core/tenantnetwork.py
@@ -184,7 +184,14 @@ class TenantNetwork1(testcase.TestCase):
'service_id': keystone_id})[0].url
return endpoint
- def _create_network_resources(self):
+ def create_network_resources(self):
+ """Create all tenant network resources
+
+ It creates a router which gateway is the external network detected.
+ The new subnet is attached to that router.
+
+ Raises: expection on error
+ """
assert self.cloud
assert self.ext_net
provider = {}
@@ -224,7 +231,7 @@ class TenantNetwork1(testcase.TestCase):
try:
assert self.cloud
self.start_time = time.time()
- self._create_network_resources()
+ self.create_network_resources()
self.result = 100
status = testcase.TestCase.EX_OK
except Exception: # pylint: disable=broad-except