Unify ACL testcases TG and VNF names

Rename TGs and VNFs to follow a single naming convention, for all VNFs:
  name: trafficgen_0
  role: tg__0

  name: vnf_0
  role: vnf__0

JIRA: YARDSTICK-1578

Change-Id: Ic5c8121828505dabdedf0b1cf559a5aebff7124c
Signed-off-by: Orest Voznyy <orestx.voznyy@intel.com>

27 files changed, 75 insertions, 78 deletions

diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml
index 91155070a..887e089b1 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2018 Intel Corporation
+# Copyright (c) 2017-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-ixia-multi-port-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg__0.yardstick
-      vnf__0: vnf__0.yardstick
+      tg__0: trafficgen_0.yardstick
+      vnf__0: vnf_0.yardstick
     options:
       framesize:
         uplink: {{ flow.pkt_size.uplink }}
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_template.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_template.yaml
index 8ba836841..824c83c2a 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_template.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_template.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-multi-port-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg__0.yardstick
-      vnf__0: vnf__0.yardstick
+      tg__0: trafficgen_0.yardstick
+      vnf__0: vnf_0.yardstick
     options:
       framesize:
         uplink: {{ flow.pkt_size.uplink }}
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml
index e3558b80e..bd36e6eb4 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2018 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg__0.yardstick
-      tg__1: tg__1.yardstick
-      vnf__0: vnf__0.yardstick
+      tg__0: trafficgen_0.yardstick
+      tg__1: trafficgen_1.yardstick
+      vnf__0: vnf_0.yardstick
     options:
       framesize:
         uplink: {{ flow.pkt_size.uplink }}
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_scale_out_template.yaml
index 55ff62d70..888e1196a 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_scale_out_template.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_scale_out_template.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Intel Corporation
+# Copyright (c) 2018-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg__0.yardstick
-      tg__1: tg__1.yardstick
+      tg__0: trafficgen_0.yardstick
+      tg__1: trafficgen_1.yardstick
 {% for vnf_num in range(num_vnfs|int) %}
       vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
 {% endfor %}
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 e33168723..e5f770bcf 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,8 +19,8 @@ scenarios:
   traffic_profile: "../../traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml"
   topology: acl_vnf_topology_ixload.yaml
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     framesize:
       uplink: {{ framesize }}
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_packetsize.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_packetsize.yaml
index c06a8ef08..23908a6e6 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_packetsize.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_packetsize.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     framesize:
       uplink: {{ framesize }}
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex.yaml
index dd6cf344f..4c183722f 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     framesize:
       uplink: {{ framesize }}
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic.yaml
index 74e04d890..9c3ca9ca2 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology-3node.yaml
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    tg__1: trafficgen_2.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
+    tg__1: trafficgen_1.yardstick
   options:
     framesize:
       uplink: {{ framesize }}
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex_scale_up.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex_scale_up.yaml
index 52f588a10..4f2561ea8 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex_scale_up.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_trex_scale_up.yaml
@@ -20,8 +20,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     framesize:
       uplink: {{ framesize }}
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_trex.yaml
index dd6cf344f..4c183722f 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_trex.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     framesize:
       uplink: {{ framesize }}
diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_trex.yaml
index 7f5a54862..8dd0adf81 100644
--- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_trex.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     framesize:
       uplink: {{ framesize }}
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_bottlenecks_scale_out.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_bottlenecks_scale_out.yaml
index 469f68e77..b44374c48 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_bottlenecks_scale_out.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_bottlenecks_scale_out.yaml
@@ -26,8 +26,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-3node-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg_0.yardstick
-      tg__1: tg_1.yardstick
+      tg__0: trafficgen_0.yardstick
+      tg__1: trafficgen_1.yardstick
 {% for vnf_num in range(num_vnfs|int) %}
       vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
 {% endfor %}
@@ -74,7 +74,7 @@ context:
     pgrp1:
       policy: "availability"
   servers:
-    tg_0:
+    trafficgen_0:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
@@ -84,7 +84,7 @@ context:
         uplink_{{ vnf_num }}:
           - xe{{ vnf_num }}
 {% endfor %}
-    tg_1:
+    trafficgen_1:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex.yaml
index 75159877f..8eba2ab50 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex.yaml
@@ -19,7 +19,7 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__0: tg_0.yardstick
+    tg__0: trafficgen_0.yardstick
     vnf__0: vnf_0.yardstick
   options:
     framesize:
@@ -66,7 +66,7 @@ context:
           - xe0
         downlink_0:
           - xe1
-    tg_0:
+    trafficgen_0:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
@@ -89,4 +89,3 @@ context:
       gateway_ip: 'null'
       port_security_enabled: False
       enable_dhcp: 'false'
-
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_10.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_10.yaml
index 2e11329b4..8c1952b11 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_10.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_10.yaml
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-10.yaml
     topology: acl-tg-topology-3node-10.yaml
     nodes:
-      tg__0: tg_0.yardstick
-      tg__1: tg_1.yardstick
+      tg__0: trafficgen_0.yardstick
+      tg__1: trafficgen_1.yardstick
       vnf__0: vnf_0.yardstick
       vnf__1: vnf_1.yardstick
       vnf__2: vnf_2.yardstick
@@ -113,7 +113,7 @@ context:
     pgrp1:
       policy: "availability"
   servers:
-    tg_0:
+    trafficgen_0:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
@@ -139,7 +139,7 @@ context:
           - xe8
         uplink_9:
           - xe9
-    tg_1:
+    trafficgen_1:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_2.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_2.yaml
index bbad24c43..8b0630327 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_2.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_2.yaml
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-2.yaml
     topology: acl-tg-topology-3node-2.yaml
     nodes:
-      tg__0: tg_0.yardstick
-      tg__1: tg_1.yardstick
+      tg__0: trafficgen_0.yardstick
+      tg__1: trafficgen_1.yardstick
       vnf__0: vnf_0.yardstick
       vnf__1: vnf_1.yardstick
     options:
@@ -65,7 +65,7 @@ context:
     pgrp1:
       policy: "availability"
   servers:
-    tg_0:
+    trafficgen_0:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
@@ -75,7 +75,7 @@ context:
           - xe0
         uplink_1:
           - xe1
-    tg_1:
+    trafficgen_1:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_4.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_4.yaml
index 2b57336a6..4f7b0e325 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_4.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_4.yaml
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-4.yaml
     topology: acl-tg-topology-3node-4.yaml
     nodes:
-      tg__0: tg_0.yardstick
-      tg__1: tg_1.yardstick
+      tg__0: trafficgen_0.yardstick
+      tg__1: trafficgen_1.yardstick
       vnf__0: vnf_0.yardstick
       vnf__1: vnf_1.yardstick
       vnf__2: vnf_2.yardstick
@@ -77,7 +77,7 @@ context:
     pgrp1:
       policy: "availability"
   servers:
-    tg_0:
+    trafficgen_0:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
@@ -91,7 +91,7 @@ context:
           - xe2
         uplink_3:
           - xe3
-    tg_1:
+    trafficgen_1:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_out.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_out.yaml
index 149ba15bb..a01d33960 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_out.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_correlated_traffic_scale_out.yaml
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-3node-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg_0.yardstick
-      tg__1: tg_1.yardstick
+      tg__0: trafficgen_0.yardstick
+      tg__1: trafficgen_1.yardstick
 {% for vnf_num in range(num_vnfs|int) %}
       vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
 {% endfor %}
@@ -67,7 +67,7 @@ context:
     pgrp1:
       policy: "availability"
   servers:
-    tg_0:
+    trafficgen_0:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
@@ -77,7 +77,7 @@ context:
         uplink_{{ vnf_num }}:
           - xe{{ vnf_num }}
 {% endfor %}
-    tg_1:
+    trafficgen_1:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_scale_up.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_scale_up.yaml
index c0758077e..74ca3e741 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_scale_up.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_trex_scale_up.yaml
@@ -23,7 +23,7 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__0: tg_0.yardstick
+    tg__0: trafficgen_0.yardstick
     vnf__0: vnf_0.yardstick
   options:
     framesize:
@@ -71,7 +71,7 @@ context:
           - xe0
         downlink_0:
           - xe1
-    tg_0:
+    trafficgen_0:
       floating_ip: true
       placement: "pgrp1"
       network_ports:
@@ -94,5 +94,3 @@ context:
       gateway_ip: 'null'
       port_security_enabled: False
       enable_dhcp: 'false'
-
-
diff --git a/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml
index 7c035b9b1..c742653b9 100644
--- a/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2018 Intel Corporation
+# Copyright (c) 2017-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg__0.yardstick
-      tg__1: tg__1.yardstick
+      tg__0: trafficgen_0.yardstick
+      tg__1: trafficgen_1.yardstick
 {% for vnf_num in range(num_vnfs|int) %}
       vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
 {% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_scale_out_template.yaml b/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_scale_out_template.yaml
index 9800d280d..3c0e5e45b 100644
--- a/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_scale_out_template.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_scale_out_template.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-scale-out-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg__0.yardstick
+      tg__0: trafficgen_0.yardstick
 {% for vnf_num in range(num_vnfs|int) %}
       vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
 {% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_scale_out.yaml b/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_scale_out.yaml
index 0fbfcdc2e..9fc218912 100644
--- a/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_scale_out.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_scale_out.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation
+# Copyright (c) 2017-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-scale-out-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg__0.yardstick
+      tg__0: trafficgen_0.yardstick
 {% for vnf_num in range(num_vnfs|int) %}
       vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
 {% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_ixia.yaml b/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_ixia.yaml
index 2a0cfe70f..6185ff134 100644
--- a/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_ixia.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_ixia.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ixia_ipv4_latency.yaml
   topology: acl_vnf_topology_ixia.yaml
   nodes:
-    tg__0: tg__0.yardstick
-    vnf__0: vnf__0.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     framesize:
       uplink: {{ framesize }}
@@ -68,7 +68,7 @@ contexts:
        user: ""
        password: ""
      servers:
-       vnf__0:
+       vnf_0:
          network_ports:
            mgmt:
              cidr: '1.1.1.7/24'
diff --git a/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_trex.yaml b/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_trex.yaml
index 474a7b834..46dd73532 100644
--- a/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_trex.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf__0.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     framesize:
       uplink: {{ framesize }}
@@ -70,7 +70,7 @@ contexts:
        user: ""
        password: ""
      servers:
-       vnf__0:
+       vnf_0:
          network_ports:
            mgmt:
              cidr: '1.1.1.7/24'
diff --git a/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml
index c2c11028e..a7299fa7b 100644
--- a/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2018 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg__0.yardstick
-      tg__1: tg__1.yardstick
+      tg__0: trafficgen_0.yardstick
+      tg__1: trafficgen_1.yardstick
 {% for vnf_num in range(num_vnfs|int) %}
       vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
 {% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_scale_out_template.yaml b/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_scale_out_template.yaml
index 888d0c8af..69da3e575 100644
--- a/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_scale_out_template.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_scale_out_template.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2018 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-ixia-scale-out-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg__0.yardstick
+      tg__0: trafficgen_0.yardstick
 {% for vnf_num in range(num_vnfs|int) %}
       vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
 {% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_scale_out.yaml b/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_scale_out.yaml
index 91e47df1d..c81417d0a 100644
--- a/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_scale_out.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_scale_out.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
     topology: acl-tg-topology-scale-out-{{ num_vnfs }}.yaml
     nodes:
-      tg__0: tg__0.yardstick
+      tg__0: trafficgen_0.yardstick
 {% for vnf_num in range(num_vnfs|int) %}
       vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
 {% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_trex.yaml b/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_trex.yaml
index 4c4f3b599..b946eceee 100644
--- a/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_trex.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
   topology: acl-tg-topology.yaml
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf__0.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     framesize:
       uplink: {{ framesize }}
@@ -57,7 +57,7 @@ contexts:
        user: ""
        password: ""
      servers:
-       vnf__0:
+       vnf_0:
          network_ports:
            mgmt:
              cidr: '1.1.1.61/24'