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 3b62a9a..adf2b6d 100644 (file)
--- 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)