summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-02-28 15:53:01 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-28 15:53:01 +0000
commit1622ed33099e1d775ad842468c43e160e7bf79fd (patch)
tree5d993ad1f256dd91339da1bda0d1d56da360b5cc
parent623b67e74799edb251c9434857be0c0565ef7a41 (diff)
parent1bd43d4e5bdd609ad2441aa084a53115716f062d (diff)
Merge "Add guid in neutron resource names in juju_epc"
-rw-r--r--functest/opnfv_tests/vnf/epc/juju_epc.py13
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)