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

7 files changed, 21 insertions, 21 deletions

diff --git a/samples/vnf_samples/nsut/vepc/tc_epc_default_bearer_create_landslide.yaml b/samples/vnf_samples/nsut/vepc/tc_epc_default_bearer_create_landslide.yaml
index ee17df138..5c05bf356 100644
--- a/samples/vnf_samples/nsut/vepc/tc_epc_default_bearer_create_landslide.yaml
+++ b/samples/vnf_samples/nsut/vepc/tc_epc_default_bearer_create_landslide.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.
@@ -24,8 +24,8 @@ scenarios:
   session_profile: "../../traffic_profiles/landslide/landslide_session_default_bearer.yaml"
   topology: "vepc_vnf_topology_landslide.yaml"
   nodes:
-    tg__0: tg__0.traffic_gen
-    vnf__0: vnf__0.vnf_epc
+    tg__0: trafficgen_0.traffic_gen
+    vnf__0: vnf.vnf_epc
   options:
     traffic_duration: 70
     dmf:
diff --git a/samples/vnf_samples/nsut/vepc/tc_epc_default_bearer_create_landslide_multi_dmf.yaml b/samples/vnf_samples/nsut/vepc/tc_epc_default_bearer_create_landslide_multi_dmf.yaml
index 76567062a..ba242416b 100644
--- a/samples/vnf_samples/nsut/vepc/tc_epc_default_bearer_create_landslide_multi_dmf.yaml
+++ b/samples/vnf_samples/nsut/vepc/tc_epc_default_bearer_create_landslide_multi_dmf.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.
@@ -24,8 +24,8 @@ scenarios:
   session_profile: "../../traffic_profiles/landslide/landslide_session_default_bearer_multi_dmf.yaml"
   topology: "vepc_vnf_topology_landslide.yaml"
   nodes:
-    tg__0: tg__0.traffic_gen
-    vnf__0: vnf__0.vnf_epc
+    tg__0: trafficgen_0.traffic_gen
+    vnf__0: vnf.vnf_epc
   options:
     dmf:
       - transactionRate: 5
diff --git a/samples/vnf_samples/nsut/vepc/tc_epc_network_dedicated_bearer_create_landslide.yaml b/samples/vnf_samples/nsut/vepc/tc_epc_network_dedicated_bearer_create_landslide.yaml
index 65f58bd0d..e2dc1c798 100644
--- a/samples/vnf_samples/nsut/vepc/tc_epc_network_dedicated_bearer_create_landslide.yaml
+++ b/samples/vnf_samples/nsut/vepc/tc_epc_network_dedicated_bearer_create_landslide.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.
@@ -24,8 +24,8 @@ scenarios:
   session_profile: "../../traffic_profiles/landslide/landslide_session_network_dedicated_bearer.yaml"
   topology: "vepc_vnf_topology_landslide.yaml"
   nodes:
-    tg__0: tg__0.traffic_gen
-    vnf__0: vnf__0.vnf_epc
+    tg__0: trafficgen_0.traffic_gen
+    vnf__0: vnf.vnf_epc
   options:
     dmf:
       transactionRate: 5
diff --git a/samples/vnf_samples/nsut/vepc/tc_epc_network_service_request_landslide.yaml b/samples/vnf_samples/nsut/vepc/tc_epc_network_service_request_landslide.yaml
index 55a96f4e4..7b298b7ba 100644
--- a/samples/vnf_samples/nsut/vepc/tc_epc_network_service_request_landslide.yaml
+++ b/samples/vnf_samples/nsut/vepc/tc_epc_network_service_request_landslide.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.
@@ -23,8 +23,8 @@ scenarios:
   session_profile: "../../traffic_profiles/landslide/landslide_session_network_service_request.yaml"
   topology: "vepc_vnf_topology_landslide.yaml"
   nodes:
-    tg__0: tg__0.traffic_gen
-    vnf__0: vnf__0.vnf_epc
+    tg__0: trafficgen_0.traffic_gen
+    vnf__0: vnf.vnf_epc
   options:
     dmf:
       transactionRate: 0.1
diff --git a/samples/vnf_samples/nsut/vepc/tc_epc_saegw_tput_relocation_landslide.yaml b/samples/vnf_samples/nsut/vepc/tc_epc_saegw_tput_relocation_landslide.yaml
index cece2a747..7ba15207a 100644
--- a/samples/vnf_samples/nsut/vepc/tc_epc_saegw_tput_relocation_landslide.yaml
+++ b/samples/vnf_samples/nsut/vepc/tc_epc_saegw_tput_relocation_landslide.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.
@@ -23,8 +23,8 @@ scenarios:
   session_profile: "../../traffic_profiles/landslide/landslide_session_saegw_relocation.yaml"
   topology: "vepc_vnf_topology_landslide.yaml"
   nodes:
-    tg__0: tg__0.traffic_gen
-    vnf__0: vnf__0.vnf_epc
+    tg__0: trafficgen_0.traffic_gen
+    vnf__0: vnf.vnf_epc
   options:
     dmf:
       transactionRate: 5
diff --git a/samples/vnf_samples/nsut/vepc/tc_epc_ue_dedicated_bearer_create_landslide.yaml b/samples/vnf_samples/nsut/vepc/tc_epc_ue_dedicated_bearer_create_landslide.yaml
index 81a4149f8..c9b215a64 100644
--- a/samples/vnf_samples/nsut/vepc/tc_epc_ue_dedicated_bearer_create_landslide.yaml
+++ b/samples/vnf_samples/nsut/vepc/tc_epc_ue_dedicated_bearer_create_landslide.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.
@@ -24,8 +24,8 @@ scenarios:
   session_profile: "../../traffic_profiles/landslide/landslide_session_ue_dedicated_bearer.yaml"
   topology: "vepc_vnf_topology_landslide.yaml"
   nodes:
-    tg__0: tg__0.traffic_gen
-    vnf__0: vnf__0.vnf_epc
+    tg__0: trafficgen_0.traffic_gen
+    vnf__0: vnf.vnf_epc
   options:
     dmf:
       transactionRate: 5
diff --git a/samples/vnf_samples/nsut/vepc/tc_epc_ue_service_request_landslide.yaml b/samples/vnf_samples/nsut/vepc/tc_epc_ue_service_request_landslide.yaml
index eaf4ae99f..72efa1943 100644
--- a/samples/vnf_samples/nsut/vepc/tc_epc_ue_service_request_landslide.yaml
+++ b/samples/vnf_samples/nsut/vepc/tc_epc_ue_service_request_landslide.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.
@@ -23,8 +23,8 @@ scenarios:
   session_profile: "../../traffic_profiles/landslide/landslide_session_ue_service_request.yaml"
   topology: "vepc_vnf_topology_landslide.yaml"
   nodes:
-    tg__0: tg__0.traffic_gen
-    vnf__0: vnf__0.vnf_epc
+    tg__0: trafficgen_0.traffic_gen
+    vnf__0: vnf.vnf_epc
   options:
     dmf:
       transactionRate: 5