From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 28 Feb 2018 15:53:01 +0000 (+0000)
Subject: Merge "Add guid in neutron resource names in juju_epc"
X-Git-Tag: opnfv-6.0.0~116
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1622ed33099e1d775ad842468c43e160e7bf79fd;hp=623b67e74799edb251c9434857be0c0565ef7a41;p=functest.git

Merge "Add guid in neutron resource names in juju_epc"
---

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)