From 1e6b7a08862b4a8ebe372fc5f3a46356181618f3 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 31 Jul 2018 16:04:36 +0200 Subject: Protect VMTP vs cidr conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- functest/core/tenantnetwork.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'functest/core') 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 -- cgit 1.2.3-korg