From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 5 Sep 2018 23:04:50 +0000 (-0400)
Subject: Make network name unique to the job
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=fea157bb95da2b421bff006b912d7c6b7872b6e2

Make network name unique to the job

Use the passed in variables to create a unique network name.

Change-Id: Icebf8e0567f9ad11bd6e529bf3779ca472ad080a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/openstack-hot/csit-apex-3-instance-type.yaml b/openstack-hot/csit-apex-3-instance-type.yaml
index 8dedd74d6..facdcdb08 100644
--- a/openstack-hot/csit-apex-3-instance-type.yaml
+++ b/openstack-hot/csit-apex-3-instance-type.yaml
@@ -39,17 +39,28 @@ parameters:
         type: string
 
 resources:
-
     192_network:
         type: OS::Neutron::Net
         properties:
-            name: APEX_192_network
+            name:
+                str_replace:
+                    template: SILO-JOB_NAME-NET
+                    params:
+                        "SILO": {get_param: silo}
+                        "JOB_NAME": {get_param: job_name}
+                        "NET": 'APEX_192_network'
             port_security_enabled: false
 
     192_subnet:
         type: OS::Neutron::Subnet
         properties:
-            name: APEX_192_subnet
+            name:
+                str_replace:
+                    template: SILO-JOB_NAME-SUBNET
+                    params:
+                        "SILO": {get_param: silo}
+                        "JOB_NAME": {get_param: job_name}
+                        "SUBNET": 'APEX_192_subnet'
             network_id: {get_resource: 192_network}
             cidr: 192.0.2.0/24
             allocation_pools: