From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 6 Aug 2018 09:46:52 +0000 (+0200)
Subject: Change juju_epc cidr
X-Git-Tag: opnfv-7.0.0~140
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=27bc4acea711b5e6e09102bdc4209c9ef13283f3;p=functest.git

Change juju_epc cidr

juju cannot bootstrap if cidr already exists which now happens only
if a shared network with the same cidr is defined (it should be
considered as a bug about juju).

By allocation its own cidr, it protects vs remaining rally or tempest
remaining shared networks or vs parallel testing.

juju_epc can already run twice in parallel as it creates a new
project and a private network.

Change-Id: I76c4971d631f763307315478e6cf5a383c91ed36
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index b43675544..fb3c587ca 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -65,6 +65,8 @@ class JujuEpc(singlevm.VmReady2):
 
     __logger = logging.getLogger(__name__)
 
+    cidr = '192.168.121.0/24'
+
     filename = ('/home/opnfv/functest/images/'
                 'ubuntu-16.04-server-cloudimg-amd64-disk1.img')
     filename_alt = ('/home/opnfv/functest/images/'