From 1bd43d4e5bdd609ad2441aa084a53115716f062d Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 26 Feb 2018 16:04:44 +0100 Subject: Add guid in neutron resource names in juju_epc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JIRA: FUNCTEST-937 Change-Id: Ia0912dfe2cdbecf4c169aecb6ba1b71774e0a02f Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/vnf/epc/juju_epc.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py index 3b62a9a1c..adf2b6d10 100644 --- a/functest/opnfv_tests/vnf/epc/juju_epc.py +++ b/functest/opnfv_tests/vnf/epc/juju_epc.py @@ -229,13 +229,16 @@ class JujuEpc(vnf.VnfOnBoarding): self.__logger.info("Deployed Orchestrator") private_net_name = getattr( config.CONF, 'vnf_{}_private_net_name'.format(self.case_name)) - private_subnet_name = getattr( - config.CONF, 'vnf_{}_private_subnet_name'.format(self.case_name)) + private_subnet_name = '{}-{}'.format( + getattr(config.CONF, + 'vnf_{}_private_subnet_name'.format(self.case_name)), + self.uuid) private_subnet_cidr = getattr( config.CONF, 'vnf_{}_private_subnet_cidr'.format(self.case_name)) - abot_router = getattr( - config.CONF, 'vnf_{}_external_router'.format(self.case_name)) - + abot_router = '{}-{}'.format( + getattr(config.CONF, + 'vnf_{}_external_router'.format(self.case_name)), + self.uuid) self.__logger.info("Creating full network ...") subnet_settings = SubnetConfig( name=private_subnet_name, cidr=private_subnet_cidr) -- cgit 1.2.3-korg