Unify CGNAPT 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: Iab61828f6e80c65330ee133b7f674457c091de94
Signed-off-by: Orest Voznyy <orestx.voznyy@intel.com>

diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_template.yaml
index deb28dc..e01b5e7 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_template.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_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: cgnapt-tg-topology-multi-port-ixia-{{ 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/cgnapt/tc_baremetal_cgnapt_rfc2544_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_template.yaml
index f52b41b..0a1a376 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_template.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_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: cgnapt-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/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_template.yaml
index 198c847..7a9caf1 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_template.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_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: cgnapt-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/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_scale_out_template.yaml
index c093608..41675e5 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_scale_out_template.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_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: cgnapt-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/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 6008520..7b94fef 100644 (file)
--- 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__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/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_ixia_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_ixia_scale_up.yaml
index ad20ccb..cc3757f 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_ixia_scale_up.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_ixia_scale_up.yaml
@@ -20,8 +20,8 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ixia_ipv4_latency_cgnapt.yaml"
   topology: cgnapt_vnf_topology_ixia.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/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex.yaml
index 93325a8..dc507ab 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-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/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex_correlated_traffic.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex_correlated_traffic.yaml
index 27ce7a7..7d79259 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex_correlated_traffic.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex_correlated_traffic.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-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/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex_scale_up.yaml
index 9f95ec8..13eac28 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex_scale_up.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_trex_scale_up.yaml
@@ -20,8 +20,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-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/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 fc2f684..95ed671 100644 (file)
--- 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,9 +19,9 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ixia_ipv4_latency.yaml"
   topology: cgnapt-vnf-topology-ixia-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/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_trex.yaml
index 27686ff..a3a54a5 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_trex.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-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/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_10.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_10.yaml
index 4f519ef..d91a4cf 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_10.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_10.yaml
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt-10.yaml
     topology: cgnapt-vnf-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/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_2.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_2.yaml
index c7df6f7..873c1a2 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_2.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_2.yaml
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt-2.yaml
     topology: cgnapt-vnf-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/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_4.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_4.yaml
index 0658c91..fede379 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_4.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_4.yaml
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt-4.yaml
     topology: cgnapt-vnf-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/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_out.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_out.yaml
index 18d0e22..d6a6702 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_out.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_trex_correlated_scale_out.yaml
@@ -19,8 +19,8 @@ scenarios:
     traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt-{{ num_vnfs }}.yaml
     topology: cgnapt-vnf-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/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_template.yaml
index 72d19fc..922eb93 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_template.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_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: cgnapt-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/cgnapt/tc_ovs_cgnapt_udp_ixia_scale_out_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_scale_out_template.yaml
index ffd06d5..9b45862 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_scale_out_template.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_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-cgnapt-ixia-{{ num_vnfs }}.yaml
     topology: cgnapt-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/cgnapt/tc_ovs_cgnapt_udp_scale_out.yaml b/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_scale_out.yaml
index 1a2f57f..ab51e17 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_scale_out.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_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-cgnapt-{{ num_vnfs }}.yaml
     topology: cgnapt-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/cgnapt/tc_ovs_rfc2544_ipv4_1rule_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_trex.yaml
index 0145dbd..577d86f 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_trex.yaml
@@ -19,8 +19,8 @@ scenarios:
   traffic_profile: ../../traffic_profiles/ipv4_throughput_cgnapt.yaml
   topology: cgnapt-vnf-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 }}
@@ -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/cgnapt/tc_sriov_cgnapt_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_ixia_correlated_scale_out_template.yaml
index 618d018..c49df90 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_ixia_correlated_scale_out_template.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_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: cgnapt-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/cgnapt/tc_sriov_cgnapt_udp_ixia_scale_out_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_ixia_scale_out_template.yaml
index 9131749..43ec182 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_ixia_scale_out_template.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_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-cgnapt-ixia-{{ num_vnfs }}.yaml
     topology: cgnapt-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/cgnapt/tc_sriov_cgnapt_udp_scale_out.yaml b/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_scale_out.yaml
index cb1f5eb..309171b 100644 (file)
--- a/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_scale_out.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_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-cgnapt-{{ num_vnfs }}.yaml
     topology: cgnapt-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 %}