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>

111 files changed, 644 insertions, 636 deletions

diff --git a/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.yaml b/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.yaml
index e0ba6d96f..d96236e17 100644
--- a/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.yaml
+++ b/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.yaml
@@ -23,12 +23,12 @@ scenarios:
 
   nodes:  # This section is copied from pod.xml or resolved via Heat
     trexgen__1: trafficgen_1.yardstick
-    trexvnf__1: vnf.yardstick
+    trexvnf__0: vnf.yardstick
 
   vnf_options:
     trexgen__1:
-      target_ip: trexvnf__1.xe0.local_ip  # TODO: resolve to config vars
-    trexvnf__1:
+      target_ip: trexvnf__0.xe0.local_ip  # TODO: resolve to config vars
+    trexvnf__0:
       target_ip: trexgen__1.xe1.local_ip  # TODO: resolve to config vars
   runner:
     type: Duration
diff --git a/samples/vnf_samples/nsut/2trex/trex_tg_topology.yaml b/samples/vnf_samples/nsut/2trex/trex_tg_topology.yaml
index 1a9b50c84..822cf5eba 100644
--- a/samples/vnf_samples/nsut/2trex/trex_tg_topology.yaml
+++ b/samples/vnf_samples/nsut/2trex/trex_tg_topology.yaml
@@ -20,15 +20,15 @@ nsd:nsd-catalog:
         description: trex-tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: trexgen__1
+            vnfd-id-ref: trexgen__0
             VNF model: ../../vnf_descriptors/tg_trex_tpl.yaml      #VNF type
         -   member-vnf-index: '2'
-            vnfd-id-ref: trexvnf__1
+            vnfd-id-ref: trexvnf__0
             VNF model: ../../vnf_descriptors/tg_trex_tpl.yaml      #VNF type
 
         vld:
-        -   id: private
-            name: trexgen__1 to trexvnf__1 link 1
+        -   id: uplink
+            name: trexgen__0 to trexvnf__0 link 1
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
@@ -38,8 +38,8 @@ nsd:nsd-catalog:
                 vnfd-connection-point-ref: xe0
                 vnfd-id-ref: trexgen
 
-        -   id: public
-            name: trexvnf__1 to trexgen__1 link 2
+        -   id: downlink
+            name: trexvnf__0 to trexgen__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml
index 36cb2e88b..b51f3eb04 100644
--- a/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml
+++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node.yaml
@@ -20,43 +20,43 @@ nsd:nsd-catalog:
         description: 3tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/acl_vnf.yaml      #VNF type
         -   member-vnf-index: '3'
-            vnfd-id-ref: tg__2
+            vnfd-id-ref: tg__1
             VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml      #VNF type
 
         vld:
-        -   id: private_1
-            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
-        -   id: private_2
-            name: tg__1 to vnf__1 link 2
+                vnfd-id-ref: vnf__0
+        -   id: uplink_1
+            name: tg__0 to vnf__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
-        -   id: public_1
-            name: vnf__1 to tg__2 link 2
+                vnfd-id-ref: tg__0
+        -   id: downlink_0
+            name: vnf__0 to tg__1 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '3'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: tg__2
+                vnfd-id-ref: tg__1
diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml
index 9bc3e8559..00666092f 100644
--- a/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml
+++ b/samples/vnf_samples/nsut/acl/acl-tg-topology.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: 3tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/acl_vnf.yaml      #VNF type
 
         vld:
-        -   id: private_1
-            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_1
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml
index 606d557e9..e6932acbd 100644
--- a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml
+++ b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixia.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: scenario with VACL,L3fwd and VNF
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/acl_vnf.yaml
 
         vld:
-        -   id: private_1
-            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                  #TREX
+                vnfd-id-ref: tg__0                  #TREX
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1                  #VNF
+                vnfd-id-ref: vnf__0                  #VNF
 
-        -   id: public_1
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1                  #L3fwd
+                vnfd-id-ref: vnf__0                  #L3fwd
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1                  #VACL VNF
+                vnfd-id-ref: tg__0                  #VACL VNF
diff --git a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml
index 2fc173aed..97a316625 100644
--- a/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml
+++ b/samples/vnf_samples/nsut/acl/acl_vnf_topology_ixload.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: scenario with HTTP and vACL VNF
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_ixload.yaml
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/acl_vnf.yaml
 
         vld:
-        -   id: private_1
-            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                   # HTTP Client
+                vnfd-id-ref: tg__0                   # HTTP Client
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1                  # VNF
+                vnfd-id-ref: vnf__0                  # VNF
 
-        -   id: public_1
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1                  # HTTP Server
+                vnfd-id-ref: vnf__0                  # HTTP Server
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1                   # VACL VNF
+                vnfd-id-ref: tg__0                   # VACL VNF
diff --git a/samples/vnf_samples/nsut/acl/ixia_traffic.cfg b/samples/vnf_samples/nsut/acl/ixia_traffic.cfg
index f749865c5..3f7e33471 100644
--- a/samples/vnf_samples/nsut/acl/ixia_traffic.cfg
+++ b/samples/vnf_samples/nsut/acl/ixia_traffic.cfg
@@ -1,5 +1,5 @@
 {
-    "private_1": {
+    "uplink_0": {
         "id": 1,
         "bidir": "False",
         "duration": 60,
@@ -23,7 +23,7 @@
         },
         "traffic_type": "continuous"
     },
-    "public_1": {
+    "downlink_0": {
         "id": 2,
         "bidir": "False",
         "duration": 60,
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
index 1220cae73..31ee32b7b 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
@@ -19,18 +19,18 @@ scenarios:
   traffic_profile: "../../traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml"
   topology: acl_vnf_topology_ixload.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
index 7359c6257..2da7d6675 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
   topology: acl_vnf_topology_ixia.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
index 2503add5e..088ef5474 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index eb0dcb63d..3e1345a17 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
index 1261aa0c8..9753812ac 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
@@ -19,22 +19,22 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology-3node.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:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
+      src_ip: [{'tg__0': 'xe0'}]
       dst_ip: [{'tg__1': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
       correlated_traffic: true
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
index ce9ada745..5bd0f175b 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
@@ -20,20 +20,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'HW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{worker_thread}}}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml
index eb0dcb63d..3e1345a17 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
index e06ab8f2d..1cf37ca26 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index f39d1be9e..c335c263a 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
   runner:
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
index 982c0371d..f0869ecf8 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.baremetal
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.baremetal
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node.yaml
index 7b681b52a..e4c0fc9ee 100644
--- a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node.yaml
@@ -20,43 +20,43 @@ nsd:nsd-catalog:
         description: 3tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml      #VNF type
         -   member-vnf-index: '3'
-            vnfd-id-ref: tg__2
+            vnfd-id-ref: tg__1
             VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type
 
         vld:
-        -   id: private_1
-            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
-        -   id: private_2
-            name: tg__1 to vnf__1 link 2
+                vnfd-id-ref: vnf__0
+        -   id: uplink_1
+            name: tg__0 to vnf__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
-        -   id: public_1
-            name: vnf__1 to tg__2 link 2
+                vnfd-id-ref: tg__0
+        -   id: downlink_0
+            name: vnf__0 to tg__1 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '3'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: tg__2
+                vnfd-id-ref: tg__1
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology.yaml
index e668c2eb9..d67f38a4f 100644
--- a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: 3tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml      #VNF type
 
         vld:
-        -   id: private_1
-            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_1
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixia.yaml
index a13a64fd5..fbc9ab95c 100644
--- a/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixia.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixia.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: scenario with vCGNAPT VNF
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml
 
         vld:
-        -   id: private_1
-            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_1
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixload.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixload.yaml
index b4feaf03d..71535dfb7 100644
--- a/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixload.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/cgnapt_vnf_topology_ixload.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: scenario with HTTP and vCGNAPT VNF
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_ixload.yaml
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml
 
         vld:
-        -   id: private_1
-            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                   # HTTP Client
+                vnfd-id-ref: tg__0                   # HTTP Client
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1                  # VNF
+                vnfd-id-ref: vnf__0                  # VNF
 
-        -   id: public_1
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1                  # HTTP Server
+                vnfd-id-ref: vnf__0                  # HTTP Server
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1                   # VCGNAPT VNF
+                vnfd-id-ref: tg__0                   # VCGNAPT VNF
diff --git a/samples/vnf_samples/nsut/cgnapt/ixia_traffic.cfg b/samples/vnf_samples/nsut/cgnapt/ixia_traffic.cfg
index f749865c5..3f7e33471 100644
--- a/samples/vnf_samples/nsut/cgnapt/ixia_traffic.cfg
+++ b/samples/vnf_samples/nsut/cgnapt/ixia_traffic.cfg
@@ -1,5 +1,5 @@
 {
-    "private_1": {
+    "uplink_0": {
         "id": 1,
         "bidir": "False",
         "duration": 60,
@@ -23,7 +23,7 @@
         },
         "traffic_type": "continuous"
     },
-    "public_1": {
+    "downlink_0": {
         "id": 2,
         "bidir": "False",
         "duration": 60,
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
index 6d769d4f4..d5fda5804 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: "../../traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml"
   topology: cgnapt_vnf_topology_ixload.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
@@ -28,7 +28,7 @@ scenarios:
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
   runner:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
index 6160ca090..7d6203c0c 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
@@ -19,21 +19,21 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
   topology: cgnapt_vnf_topology_ixia.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       publicip: ["152.16.40.10"]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
   runner:
     type: Iteration
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml
index 1dd2a6e91..cd74655d5 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml
@@ -20,21 +20,21 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ixia_ipv4_latency_cgnapt.yaml"
   topology: cgnapt_vnf_topology_ixia.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       publicip: ["152.16.40.10"]
       count: 1000
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{worker_thread}}}
       nfvi_enable: True
   runner:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
index f93176dde..3390cf022 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -19,21 +19,21 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       publicip: ["152.16.40.10"]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
   runner:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
index f110ab233..424422dd2 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
@@ -19,22 +19,22 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-topology-3node.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:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__2': 'xe0'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__1': 'xe0'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
       correlated_traffic: true
-    vnf__1:
+    vnf__0:
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       napt: 'dynamic'
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml
index dcc6c502b..3736715ac 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml
@@ -20,21 +20,21 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       publicip: ["152.16.40.10"]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       vnf_config: {lb_config: 'HW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{worker_thread}}}
       nfvi_enable: True
   runner:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml
index f55278523..0fbd402ac 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml
@@ -19,22 +19,22 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       publicip: ["152.16.40.10"]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
       latency: true
-    vnf__1:
+    vnf__0:
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
   runner:
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml
index 55292a371..e400b1750 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml
@@ -19,16 +19,16 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
   topology: cgnapt-vnf-topology-ixia-3node.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:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__2': 'xe0'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__1': 'xe0'}]
       count: 1
     traffic_type: 4
     rfc2544:
@@ -36,7 +36,7 @@ scenarios:
       correlated_traffic: true
       latency: true
       fec_port_mode: '10G'
-    vnf__1:
+    vnf__0:
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       napt: 'dynamic'
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
index c62e89f40..b3061a385 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-topology.yaml
   nodes:
-    tg__1: trafficgen_1.baremetal
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.baremetal
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
   runner:
     type: Iteration
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
index 8e8424891..50398b15e 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
   runner:
     type: Iteration
diff --git a/samples/vnf_samples/nsut/ping/ping_tg_topology.yaml b/samples/vnf_samples/nsut/ping/ping_tg_topology.yaml
index b2b852a79..244d0b6d6 100644
--- a/samples/vnf_samples/nsut/ping/ping_tg_topology.yaml
+++ b/samples/vnf_samples/nsut/ping/ping_tg_topology.yaml
@@ -20,15 +20,15 @@ nsd:nsd-catalog:
         description: ping-tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_ping_tpl.yaml      #VNF type
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/tg_ping_tpl.yaml      #VNF type
 
         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'
@@ -38,8 +38,8 @@ nsd:nsd-catalog:
                 vnfd-connection-point-ref: xe0
                 vnfd-id-ref: trexgen
 
-        -   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'
diff --git a/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml b/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml
index c5a52f27e..6e3dd3280 100644
--- a/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: ping_tg_topology.yaml
 
   nodes:
-    tg__1: trafficgen_1.baremetal
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.baremetal
+    vnf__0: vnf.yardstick
 
   runner:
     type: Duration
@@ -50,7 +50,6 @@ contexts:
         external_network: "yardstick-public"
       xe0:
         cidr: '10.0.2.0/24'
-
       xe1:
         cidr: '10.0.3.0/24'
 
diff --git a/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml b/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml
index 5f2c55b81..63f252484 100644
--- a/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml
@@ -22,13 +22,13 @@ scenarios:
   topology: ping_tg_topology.yaml  # TODO: look in relative path where the tc.yaml is found
 
   nodes:  # This section is copied from pod.xml or resolved via Heat
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   vnf_options:
-    tg__1:
-      target_ip: pingvnf__1.xe0.local_ip  # TODO: resolve to config vars
-    vnf__1:
+    tg__0:
+      target_ip: pingvnf__0.xe0.local_ip  # TODO: resolve to config vars
+    vnf__0:
       target_ip: pinggen__1.xe1.local_ip  # TODO: resolve to config vars
   runner:
     type: Duration
diff --git a/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml b/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml
index e6bf44311..a3a11f670 100644
--- a/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml
@@ -22,8 +22,8 @@ scenarios:
   topology: ping_tg_topology.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   runner:
     type: Duration
diff --git a/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml b/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml
index 7654b0f96..5733f0df8 100644
--- a/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml
@@ -22,13 +22,13 @@ scenarios:
   topology: ping_tg_topology.yaml  # TODO: look in relative path where the tc.yaml is found
 
   nodes:  # This section is copied from pod.xml or resolved via Heat
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
 
   vnf_options:
-    tg__1:
-      target_ip: pingvnf__1.xe0.local_ip  # TODO: resolve to config vars
-    vnf__1:
+    tg__0:
+      target_ip: pingvnf__0.xe0.local_ip  # TODO: resolve to config vars
+    vnf__0:
       target_ip: pinggen__1.xe1.local_ip  # TODO: resolve to config vars
   runner:
     type: Duration
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'
diff --git a/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
index 8640df9a0..78e92ce74 100644
--- a/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: udp_replay-vnf-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       nfvi_enable: True
   runner:
     type: Iteration
diff --git a/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
index 09a20c33d..c8654a5a2 100644
--- a/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -19,14 +19,14 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: udp_replay-vnf-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     packetsize: 64
     traffic_type: 4
-    vnf__1:
+    vnf__0:
        hw_csum: false
-    tg__1:
+    tg__0:
        hw_csum: false
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
@@ -67,13 +67,13 @@ context:
       cidr: '10.0.1.0/24'
     xe0:
       cidr: '10.0.2.0/24'
-      vld_id: public
+      vld_id: downlink
       enable_dhcp: False
       gateway_ip: null
       port_security_enabled: False
     xe1:
       cidr: '10.0.3.0/24'
-      vld_id: private
+      vld_id: uplink
       enable_dhcp: False
       gateway_ip: null
       port_security_enabled: False
diff --git a/samples/vnf_samples/nsut/udp_replay/udp_replay-vnf-topology.yaml b/samples/vnf_samples/nsut/udp_replay/udp_replay-vnf-topology.yaml
index b13de7e90..b76f90b49 100644
--- a/samples/vnf_samples/nsut/udp_replay/udp_replay-vnf-topology.yaml
+++ b/samples/vnf_samples/nsut/udp_replay/udp_replay-vnf-topology.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: 3tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml      #VNF type
 
         vld:
-        -   id: private_1
-            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_1
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/vfw/ixia_traffic.cfg b/samples/vnf_samples/nsut/vfw/ixia_traffic.cfg
index f749865c5..3f7e33471 100644
--- a/samples/vnf_samples/nsut/vfw/ixia_traffic.cfg
+++ b/samples/vnf_samples/nsut/vfw/ixia_traffic.cfg
@@ -1,5 +1,5 @@
 {
-    "private_1": {
+    "uplink_0": {
         "id": 1,
         "bidir": "False",
         "duration": 60,
@@ -23,7 +23,7 @@
         },
         "traffic_type": "continuous"
     },
-    "public_1": {
+    "downlink_0": {
         "id": 2,
         "bidir": "False",
         "duration": 60,
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
index 0897fed18..5b2dae20f 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: "../../traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml"
   topology: vfw_vnf_topology_ixload.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
@@ -28,7 +28,7 @@ scenarios:
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
index 9808398f2..b6eb5c191 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
   topology: vfw_vnf_topology_ixia.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml
index 5a90acdf9..161a27678 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml
@@ -20,20 +20,20 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
   topology: vfw_vnf_topology_ixia.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1000
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       nfvi_enable: True
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{worker_thread}}}
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index b0150d851..249511418 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: vfw-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
index 6a55bfb77..e58130ab6 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml
@@ -19,22 +19,22 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: vfw-tg-topology-3node.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:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__2': 'xe0'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__1': 'xe0'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
       correlated_traffic: true
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
index 9773c3adb..8b21c27f0 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml
@@ -20,20 +20,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: vfw-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'HW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{worker_thread}}}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml
index 4656cc85f..1e2c8e53f 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml
@@ -19,21 +19,21 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
   topology: vfw_vnf_topology_ixia.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
       latency: true
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
index d11f097c5..38ed9282a 100644
--- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,21 +19,21 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: vfw-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
       latency: true
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
       nfvi_enable: True
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
index 06b19ebad..d00b443d5 100644
--- a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ixia_ipv4_latency.yaml
   topology: vfw_vnf_topology_ixia.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick1
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick1
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
   runner:
@@ -68,14 +68,14 @@ contexts:
         cidr: '10.0.1.0/24'
       xe0:
         cidr: '10.0.2.0/24'
-        vld_id: public_1
+        vld_id: downlink_0
         gateway_ip: 'null'
         provider: true
         physical_network: phystenant1
         port_security_enabled: False
       xe1:
         cidr: '10.0.3.0/24'
-        vld_id: private_1
+        vld_id: uplink_0
         gateway_ip: 'null'
         provider: true
         physical_network: phystenant2
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index cab0b9a14..86974d270 100644
--- a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: vfw-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.baremetal
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.baremetal
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
   runner:
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 13fb850ab..16815bf45 100644
--- a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: vfw-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       rules: acl_1rule.yaml
       vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
   runner:
diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-3node.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-3node.yaml
index e1496efad..c1b439a03 100644
--- a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-3node.yaml
+++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-3node.yaml
@@ -20,34 +20,43 @@ nsd:nsd-catalog:
         description: 3tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/vfw_vnf.yaml      #VNF type
         -   member-vnf-index: '3'
-            vnfd-id-ref: tg__2
+            vnfd-id-ref: tg__1
             VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml      #VNF type
 
         vld:
-        -   id: private_1
-            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
-
-        -   id: public_1
-            name: vnf__1 to tg__2 link 2
+                vnfd-id-ref: vnf__0
+        -   id: uplink_1
+            name: tg__0 to vnf__0 link 2
+            type: ELAN
+            vnfd-connection-point-ref:
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe1
+                vnfd-id-ref: tg__0
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe1
+                vnfd-id-ref: tg__0
+        -   id: downlink_0
+            name: vnf__0 to tg__1 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '3'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: tg__2
+                vnfd-id-ref: tg__1
diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-4port.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-4port.yaml
index 7babb820a..93e5bf7a1 100644
--- a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-4port.yaml
+++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-4port.yaml
@@ -27,7 +27,7 @@ nsd:nsd-catalog:
             VNF model: ../../vnf_descriptors/vfw_vnf.yaml      #VNF type
 
         vld:
-        -   id: private_0
+        -   id: uplink_0
             name: tg__0 to vnf__0 link 1
             type: ELAN
             vnfd-connection-point-ref:
@@ -37,7 +37,7 @@ nsd:nsd-catalog:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
                 vnfd-id-ref: vnf__0
-        -   id: public_0
+        -   id: downlink_0
             name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
@@ -48,7 +48,7 @@ nsd:nsd-catalog:
                 vnfd-connection-point-ref: xe1
                 vnfd-id-ref: tg__0
 
-        -   id: private_1
+        -   id: uplink_1
             name: tg__0 to vnf__0 link 3
             type: ELAN
             vnfd-connection-point-ref:
@@ -58,7 +58,7 @@ nsd:nsd-catalog:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe2
                 vnfd-id-ref: vnf__0
-        -   id: public_1
+        -   id: downlink_1
             name: vnf__0 to tg__0 link 4
             type: ELAN
             vnfd-connection-point-ref:
diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology.yaml
index b224ec14d..2a76df5c5 100644
--- a/samples/vnf_samples/nsut/vfw/vfw-tg-topology.yaml
+++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: 3tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/vfw_vnf.yaml      #VNF type
 
         vld:
-        -   id: private_1
-            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_1
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixia.yaml b/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixia.yaml
index 3585ba6d9..6c722d63b 100644
--- a/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixia.yaml
+++ b/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixia.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: scenario with vFW VNF
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/vfw_vnf.yaml
 
         vld:
-        -   id: private_1
-            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_1
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1
+                vnfd-id-ref: tg__0
diff --git a/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixload.yaml b/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixload.yaml
index 9e7062321..f14de0a74 100644
--- a/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixload.yaml
+++ b/samples/vnf_samples/nsut/vfw/vfw_vnf_topology_ixload.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: scenario with HTTP and vFW VNF
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_ixload.yaml
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/vfw_vnf.yaml
 
         vld:
-        -   id: private_1
-            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                   # HTTP Client
+                vnfd-id-ref: tg__0                   # HTTP Client
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1                  # VNF
+                vnfd-id-ref: vnf__0                  # VNF
 
-        -   id: public_1
-            name: vnf__1 to tg__1 link 2
+        -   id: downlink_0
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1                  # HTTP Server
+                vnfd-id-ref: vnf__0                  # HTTP Server
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1                   # VFW VNF
+                vnfd-id-ref: tg__0                   # VFW VNF
diff --git a/samples/vnf_samples/nsut/vpe/ixia_traffic.cfg b/samples/vnf_samples/nsut/vpe/ixia_traffic.cfg
index cdeee6e35..a0cf372cf 100644
--- a/samples/vnf_samples/nsut/vpe/ixia_traffic.cfg
+++ b/samples/vnf_samples/nsut/vpe/ixia_traffic.cfg
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 {
-    "private_1": {
+    "uplink_0": {
         "id": 1,
         "bidir": "False",
         "duration": 60,
@@ -36,7 +36,7 @@
         },
         "traffic_type": "continuous"
     },
-    "public_1": {
+    "downlink_0": {
         "id": 2,
         "bidir": "False",
         "duration": 60,
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml
index a40179390..1914f1a09 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml
@@ -19,18 +19,18 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
   topology: vpe_vnf_topology_ixload.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
-    vnf__1:
+    vnf__0:
       nfvi_enable: True
       vnf_config: vpe_config
   runner:
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml
index bff9743e0..42c0de85a 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
   topology: vpe_vnf_topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {1518B: 100}
       public: {1518B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       nfvi_enable: True
       vnf_config: vpe_config
   runner:
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml
index 50874ac5c..ffb2b41ac 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
   topology: vpe_vnf_topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       nfvi_enable: True
       vnf_config: vpe_config
   runner:
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
index 394d07861..0d732a8de 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
@@ -19,20 +19,20 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ixia_ipv4_latency_vpe.yaml"
   topology: vpe_vnf_topology_ixia.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       nfvi_enable: True
       vnf_config: vpe_config
   runner:
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
index 972d58bdf..b04f6aa97 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
@@ -19,22 +19,22 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
   topology: vpe_vnf_topology-3node.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:
     framesize:
       private: {64B: 100}
       public: {64B: 100}
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__2': 'xe0'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__1': 'xe0'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
       correlated_traffic: true
-    vnf__1:
+    vnf__0:
       nfvi_enable: True
       vnf_config: vpe_config
   runner:
diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml
index 092f068c9..8bdf39e38 100644
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml
@@ -19,21 +19,21 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
   topology: vpe_vnf_topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
   options:
     framesize:
       private: {64B: 5, 128B: 11, 256B: 16, 373B: 10, 570B: 35, 1400B: 10, 1500B: 13}
       public: {64B: 5, 128B: 3, 256B: 4, 373B: 6, 570B: 8, 1400B: 36, 1500B: 38}
 
     flow:
-      src_ip: [{'tg__1': 'xe0'}]
-      dst_ip: [{'tg__1': 'xe1'}]
+      src_ip: [{'tg__0': 'xe0'}]
+      dst_ip: [{'tg__0': 'xe1'}]
       count: 1
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
-    vnf__1:
+    vnf__0:
       nfvi_enable: True
       vnf_config: vpe_config
   runner:
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml
index c56a7e173..8a1d335de 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology-3node.yaml
@@ -20,34 +20,34 @@ nsd:nsd-catalog:
         description: scenario with VPE,L3fwd and VNF
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml       #tg_vpe_upstream.yaml   #VPE VNF
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/vpe_vnf.yaml    #tg_l3fwd.yaml #tg_trex_tpl.yaml       #TREX
         -   member-vnf-index: '3'
-            vnfd-id-ref: tg__2
+            vnfd-id-ref: tg__1
             VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml       #tg_vpe_upstream.yaml   #VPE VNF
 
         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                  #TREX
+                vnfd-id-ref: tg__0                  #TREX
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1                  #VNF
+                vnfd-id-ref: vnf__0                  #VNF
 
-        -   id: public
-            name: vnf__1 to tg__2 link 2
+        -   id: downlink
+            name: vnf__0 to tg__1 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1                  #L3fwd
+                vnfd-id-ref: vnf__0                  #L3fwd
             -   member-vnf-index-ref: '3'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: tg__2                  #VPE VNF
+                vnfd-id-ref: tg__1                  #VPE VNF
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml
index 0de4b6e79..5ad45028a 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: scenario with VPE,L3fwd and VNF
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml       #tg_vpe_upstream.yaml   #VPE VNF
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/vpe_vnf.yaml    #tg_l3fwd.yaml #tg_trex_tpl.yaml       #TREX
 
         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                  #TREX
+                vnfd-id-ref: tg__0                  #TREX
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1                  #VNF
+                vnfd-id-ref: vnf__0                  #VNF
 
-        -   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: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1                  #L3fwd
+                vnfd-id-ref: vnf__0                  #L3fwd
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1                  #VPE VNF
+                vnfd-id-ref: tg__0                  #VPE VNF
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml
index 610805d3b..315a30845 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixia.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: scenario with VPE,L3fwd and VNF
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/vpe_vnf.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                  #TREX
+                vnfd-id-ref: tg__0                  #TREX
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1                  #VNF
+                vnfd-id-ref: vnf__0                  #VNF
 
-        -   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: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1                  #L3fwd
+                vnfd-id-ref: vnf__0                  #L3fwd
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1                  #VPE VNF
+                vnfd-id-ref: tg__0                  #VPE VNF
diff --git a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml
index 5505a832b..aa1dc0d4f 100644
--- a/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml
+++ b/samples/vnf_samples/nsut/vpe/vpe_vnf_topology_ixload.yaml
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: scenario with VPE,L3fwd and VNF
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: tg__1
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_ixload.yaml
         -   member-vnf-index: '2'
-            vnfd-id-ref: vnf__1
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/vpe_vnf.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                  #TREX
+                vnfd-id-ref: tg__0                  #TREX
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: vnf__1                  #VNF
+                vnfd-id-ref: vnf__0                  #VNF
 
-        -   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: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: vnf__1                  #L3fwd
+                vnfd-id-ref: vnf__0                  #L3fwd
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: tg__1                  #VPE VNF
+                vnfd-id-ref: tg__0                  #VPE VNF