NSB: count from 0, vnf_0, tg_9, private->uplink, public->downlink

Also rename private to uplink, public to downlink

for scale-out template we need to count from 0
so we can use range() without +1/-1 errors

vnf_0, vnf_1
tg_0, tg_1

also fix Ixia defaults

Change-Id: I6aecfbb95f99af20f012a9df19c19be77d1b5b77
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Edward MacGillivray <edward.s.macgillivray@intel.com>

43 files changed, 213 insertions, 213 deletions

diff --git a/samples/vnf_samples/nsut/prox/baremetal/throughput/tc_ipv4_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/baremetal/throughput/tc_ipv4_1flow_64B_packetsize.yaml
index e8ad24443..1fe2ed943 100644
--- a/samples/vnf_samples/nsut/prox/baremetal/throughput/tc_ipv4_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/baremetal/throughput/tc_ipv4_1flow_64B_packetsize.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: "../../prox-tg-topology.yaml"
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
index 4695f0bfe..73fea8122 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
@@ -22,9 +22,9 @@ scenarios:
   topology: ../../acl-tg-topology-http.yaml
 
   nodes:
-    vnf__1: vnf.yardstick
-    tg__1: trafficgen_1.yardstick
-    tg__2: trafficgen_2.yardstick
+    vnf__0: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    tg__1: trafficgen_2.yardstick
 
   options:
     acl:
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
index f08289de9..0ca0005b2 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
index 92f367855..d51b42f84 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
index bc6ea4d2b..37da8e6c7 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
index 05bf56fb7..cbe3e97ae 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
index d560f56cf..707b46e7f 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
index 68fdf96e4..b1003df3d 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
index b65d9d94b..ee7909b3b 100644
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-1.yaml
@@ -20,30 +20,30 @@ nsd:nsd-catalog:
         description: prox-tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_prox_tpl-1.yaml
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/prox_vnf-1.yaml
         vld:
-        -   id: private
-            name: tg__1 to vnf__1 link 1
+        -   id: uplink
+            name: tg__0 to vnf__0 link 1
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
 
-        -   id: public
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
index dc19136cd..9421935a9 100644
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-2.yaml
@@ -20,30 +20,30 @@ nsd:nsd-catalog:
         description: prox-tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_prox_tpl-2.yaml
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/prox_vnf-2.yaml
         vld:
-        -   id: private
-            name: tg__1 to vnf__1 link 1
+        -   id: uplink
+            name: tg__0 to vnf__0 link 1
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
 
-        -   id: public
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml b/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml
index 17fe403b2..eda239e3b 100644
--- a/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml
+++ b/samples/vnf_samples/nsut/prox/prox-tg-topology-4.yaml
@@ -20,50 +20,50 @@ nsd:nsd-catalog:
         description: prox-tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_prox_tpl-4.yaml
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/prox_vnf-4.yaml
         vld:
-        -   id: private
-            name: tg__1 to vnf__1 link 1
+        -   id: uplink_0
+            name: tg__0 to vnf__0 link 1
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
 
-        -   id: public
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 1
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
-        -   id: public2
-            name: vnf__1 to tg__1 link 3
+                vnfd-id-ref: tg__0
+        -   id: downlink_1
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe2
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe2
-                vnfd-id-ref: tg__1
-        -   id: public3
-            name: vnf__1 to tg__1 link 4
+                vnfd-id-ref: tg__0
+        -   id: downlink_2
+            name: vnf__0 to tg__0 link 3
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe3
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe3
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/prox/sriov/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml b/samples/vnf_samples/nsut/prox/sriov/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
index b98ffc51c..15892b886 100644
--- a/samples/vnf_samples/nsut/prox/sriov/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
@@ -17,9 +17,9 @@ scenarios:
   topology: ../../acl-tg-topology-http.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
 
   options:
     acl:
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
index bc7891e80..1238ed41c 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
index e3a105b0f..059a6502f 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
index 6d89feea0..b6aa48a0e 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
index 571f4f47b..baa4b5997 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
index c70846566..590150602 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
index 026719799..517dd9024 100644
--- a/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/sriov/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
@@ -14,9 +14,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml
index 7ced79c7b..4b51998f4 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml
@@ -22,18 +22,18 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_acl-2.cfg"
       prox_args:
         "-t": ""
       prox_files: "configs/acl_rules-2.lua"
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_acl-2.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml
index e9def4cc7..ef9eaf79b 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml
@@ -22,18 +22,18 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_acl-4.cfg"
       prox_args:
         "-t": ""
       prox_files: "configs/acl_rules-2.lua"
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_acl-4.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml
index 0173fdc3e..4cc383636 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v035/build/prox
       prox_config: "configs/handle_none-2.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v035/build/prox
       prox_config: "configs/gen_all-2.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml
index 6344b415f..7b28a923b 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-1.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_buffering-1.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_buffering-1.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml
index d4672e839..49a079ab8 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_l2fwd-2.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_l2fwd-2.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml
index e6bcac40b..a0aec0160 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_l2fwd-4.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_l2fwd-4.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml
index 9ebfceb73..101fb9dd3 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_l2fwd_pktTouch-2.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_l2fwd_pktTouch-2.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml
index e8ba5ef9a..5bc22874c 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_l2fwd_pktTouch-4.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_l2fwd_pktTouch-4.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml
index f6dc7310e..b3ed8bb58 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml
@@ -22,11 +22,11 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_l3fwd-2.cfg"
       prox_args:
@@ -34,7 +34,7 @@ scenarios:
       prox_files:
         "configs/ipv4.lua" : ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_l3fwd-2.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml
index 4d37f391f..9d50566e7 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml
@@ -22,11 +22,11 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_l3fwd-4.cfg"
       prox_args:
@@ -34,7 +34,7 @@ scenarios:
       prox_files:
         "configs/ipv4.lua" : ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_l3fwd-4.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml
index 59f279529..2994ee378 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_mpls_tag_untag-2.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_mpls_tag_untag-2.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml
index 11db293b7..6ed8aed3a 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_mpls_tag_untag-4.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_mpls_tag_untag-4.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml
index c21266cef..fc28b929a 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v035/build/prox
       prox_config: "configs/handle_none-2.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v035/build/prox
       prox_config: "configs/gen_all-2.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
index 67552ec88..7834a5c9b 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v035/build/prox
       prox_config: "configs/l3-swap-2.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v035/build/prox
       prox_config: "configs/l3-gen-2.cfg"
       prox_args:
@@ -76,7 +76,7 @@ context:
       external_network: "yardstick-public"
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
     xe1:
       cidr: '10.0.3.0/24'
-      vld_id: private
+      vld_id: uplink
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
index 5310a5c8a..123cec976 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-2.yaml
@@ -22,18 +22,18 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_acl-2.cfg"
       prox_args:
         "-t": ""
       prox_files: "configs/acl_rules-2.lua"
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_acl-2.cfg"
       prox_args:
@@ -77,13 +77,13 @@ context:
       external_network: "yardstick-public"
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe1:
       cidr: '10.0.3.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
index 5ed96736c..9ede5a060 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_acl-4.yaml
@@ -22,18 +22,18 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_acl-4.cfg"
       prox_args:
         "-t": ""
       prox_files: "configs/acl_rules-2.lua"
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_acl-4.cfg"
       prox_args:
@@ -77,25 +77,25 @@ context:
       external_network: "yardstick-public"
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe1:
       cidr: '10.0.3.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe2:
       cidr: '10.0.4.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe3:
       cidr: '10.0.5.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
index 43742c383..a62fa5f2c 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_buffering-1.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-1.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_buffering-1.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_buffering-1.cfg"
       prox_args:
@@ -74,7 +74,7 @@ context:
       external_network: "yardstick-public"
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
index 270ff0411..6193fd3fb 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-2.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_l2fwd-2.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_l2fwd-2.cfg"
       prox_args:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
index 0650a0966..881bcfb0e 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd-4.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_l2fwd-4.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_l2fwd-4.cfg"
       prox_args:
@@ -73,25 +73,25 @@ context:
       cidr: '10.0.1.0/24'
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe1:
       cidr: '10.0.3.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe2:
       cidr: '10.0.4.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe3:
       cidr: '10.0.5.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
index 20cf43d70..48a85d4f3 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-2.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_l2fwd_pktTouch-2.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_l2fwd_pktTouch-2.cfg"
       prox_args:
@@ -73,13 +73,13 @@ context:
       cidr: '10.0.1.0/24'
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe1:
       cidr: '10.0.3.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
index 570bdd0fb..5bc06e8c2 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l2fwd_pktTouch-4.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_l2fwd_pktTouch-4.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_l2fwd_pktTouch-4.cfg"
       prox_args:
@@ -73,25 +73,25 @@ context:
       cidr: '10.0.1.0/24'
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe1:
       cidr: '10.0.3.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe2:
       cidr: '10.0.4.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe3:
       cidr: '10.0.5.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
index 068f0a2da..c7a7aa881 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-2.yaml
@@ -22,11 +22,11 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037.1/build/prox
       prox_config: "configs/handle_l3fwd-2.cfg"
       prox_args:
@@ -34,7 +34,7 @@ scenarios:
       prox_files:
         "configs/ipv4.lua" : ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037.1/build/prox
       prox_config: "configs/gen_l3fwd-2.cfg"
       prox_args:
@@ -77,13 +77,13 @@ context:
       external_network: "yardstick-public"
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe1:
       cidr: '10.0.3.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
\ No newline at end of file
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
index d51cd31a7..f5172d545 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_l3fwd-4.yaml
@@ -22,11 +22,11 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037.1/build/prox
       prox_config: "configs/handle_l3fwd-4.cfg"
       prox_args:
@@ -34,7 +34,7 @@ scenarios:
       prox_files:
         "configs/ipv4.lua" : ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037.1/build/prox
       prox_config: "configs/gen_l3fwd-4.cfg"
       prox_args:
@@ -77,25 +77,25 @@ context:
       external_network: "yardstick-public"
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe1:
       cidr: '10.0.3.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe2:
       cidr: '10.0.4.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe3:
       cidr: '10.0.5.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
\ No newline at end of file
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
index 0f7119514..10d0984c0 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-2.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-2.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_mpls_tag_untag-2.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_mpls_tag_untag-2.cfg"
       prox_args:
@@ -75,13 +75,13 @@ context:
       external_network: "yardstick-public"
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe1:
       cidr: '10.0.3.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
index 4b3bd789a..75555ccc6 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_heat_context_mpls_tagging-4.yaml
@@ -22,17 +22,17 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   options:
-    vnf__1:
+    vnf__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/handle_mpls_tag_untag-4.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
+    tg__0:
       prox_path: /root/dppd-PROX-v037/build/prox
       prox_config: "configs/gen_mpls_tag_untag-4.cfg"
       prox_args:
@@ -75,25 +75,25 @@ context:
       external_network: "yardstick-public"
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe1:
       cidr: '10.0.3.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe2:
       cidr: '10.0.4.0/24'
-      vld_id: public
+      vld_id: downlink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'
     xe3:
       cidr: '10.0.5.0/24'
-      vld_id: private
+      vld_id: uplink
       allowed_address_pairs:
         - ip_address:
             '0.0.0.0/0'