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>

15 files changed, 97 insertions, 97 deletions

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