diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-26 16:04:44 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-26 22:09:36 +0100 |
| commit | 1bd43d4e5bdd609ad2441aa084a53115716f062d (patch) | |
| tree | 287fe7a58ea11f518e1f0b1dcb579ad8bc0c7b77 /functest/opnfv_tests/vnf/epc/juju_epc.py | |
| parent | ff4817eb5e7e11780353c73a9c7d0f40948863be (diff) | |
Add guid in neutron resource names in juju_epc
JIRA: FUNCTEST-937
Change-Id: Ia0912dfe2cdbecf4c169aecb6ba1b71774e0a02f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/vnf/epc/juju_epc.py')
| -rw-r--r-- | functest/opnfv_tests/vnf/epc/juju_epc.py | 13 |
1 files 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) |