Unify TG and VNF names in infrastructure files

Update naming in related files, i.e. pod, docs, docstrings.
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: I7596b915939f242349a99721b6088ae738dd277f
Signed-off-by: Orest Voznyy <orestx.voznyy@intel.com>

9 files changed, 17 insertions, 19 deletions

diff --git a/etc/yardstick/nodes/standalone/baremetal_trex.yaml b/etc/yardstick/nodes/standalone/baremetal_trex.yaml
index d41b8989f..b3b57d066 100644
--- a/etc/yardstick/nodes/standalone/baremetal_trex.yaml
+++ b/etc/yardstick/nodes/standalone/baremetal_trex.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.
@@ -14,7 +14,7 @@
 
 nodes:
 -
-    name: tg__0
+    name: trafficgen_0
     role: tg__0
     ip: {{gen.ip.mgmt[0]| ipaddr('address')}}
     user: {{gen.user}}
diff --git a/etc/yardstick/nodes/standalone/ixia_correlated_template.yaml b/etc/yardstick/nodes/standalone/ixia_correlated_template.yaml
index ef63ea04c..8fdaf9f6d 100644
--- a/etc/yardstick/nodes/standalone/ixia_correlated_template.yaml
+++ b/etc/yardstick/nodes/standalone/ixia_correlated_template.yaml
@@ -20,7 +20,7 @@
 
 nodes:
 -
-    name: tg__0
+    name: trafficgen_0
     role: IxNet
     ip: {{gen.ip.mgmt[0]| ipaddr('address')}}
     user: {{gen.user}}
@@ -53,7 +53,7 @@ nodes:
 {% endfor %}
 
 -
-    name: tg__1
+    name: trafficgen_1
     role: tg__1
     ip: {{gen_1.ip.mgmt[0]| ipaddr('address')}}
     user: {{gen_1.user}}
diff --git a/etc/yardstick/nodes/standalone/ixia_template.yaml b/etc/yardstick/nodes/standalone/ixia_template.yaml
index 98ed8c5c2..97749aa1f 100644
--- a/etc/yardstick/nodes/standalone/ixia_template.yaml
+++ b/etc/yardstick/nodes/standalone/ixia_template.yaml
@@ -20,7 +20,7 @@
 
 nodes:
 -
-    name: tg__0
+    name: trafficgen_0
     role: IxNet
     ip: {{gen.ip.mgmt[0]| ipaddr('address')}}
     user: {{gen.user}}
diff --git a/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml b/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml
index b724cb09b..bf8c45f25 100644
--- a/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml
+++ b/etc/yardstick/nodes/standalone/pod_bm_vnf.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.
@@ -14,7 +14,7 @@
 
 nodes:
 -
-    name: vnf__0
+    name: vnf_0
     role: vnf__0
     ip: {{vnf.ip.mgmt[0]| ipaddr('address')}}
     user: {{vnf.user}}
diff --git a/etc/yardstick/nodes/standalone/pod_bm_vnf_scale_out.yaml b/etc/yardstick/nodes/standalone/pod_bm_vnf_scale_out.yaml
index b48a04911..3fd9db26e 100644
--- a/etc/yardstick/nodes/standalone/pod_bm_vnf_scale_out.yaml
+++ b/etc/yardstick/nodes/standalone/pod_bm_vnf_scale_out.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.
@@ -15,7 +15,7 @@
 nodes:
 {% for num in range(num_vnfs|int) %}
 -
-    name: vnf__{{ num }}
+    name: vnf_{{ num }}
     role: vnf__{{ num }}
     ip: {{vnf.ip.mgmt[num] | ipaddr('address')}}
     user: {{vnf.user}}
diff --git a/etc/yardstick/nodes/standalone/pod_landslide.yaml b/etc/yardstick/nodes/standalone/pod_landslide.yaml
index c84aed142..32e9a336e 100644
--- a/etc/yardstick/nodes/standalone/pod_landslide.yaml
+++ b/etc/yardstick/nodes/standalone/pod_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.
@@ -15,7 +15,7 @@
 
 nodes:
 -
-    name: "tg__0"
+    name: "trafficgen_0"
     role: tg__0
     tas_manager:
         ip: 192.168.122.100
diff --git a/etc/yardstick/nodes/standalone/pod_landslide_network_dedicated.yaml b/etc/yardstick/nodes/standalone/pod_landslide_network_dedicated.yaml
index 6b8db54c2..e416ec351 100644
--- a/etc/yardstick/nodes/standalone/pod_landslide_network_dedicated.yaml
+++ b/etc/yardstick/nodes/standalone/pod_landslide_network_dedicated.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.
@@ -15,7 +15,7 @@
 
 nodes:
 -
-    name: "tg__0"
+    name: "trafficgen_0"
     role: tg__0
     tas_manager:
         ip: 192.168.122.100
@@ -161,4 +161,3 @@ nodes:
         phy: *ts2_port1
         ip: 10.42.32.95
         nextHop: ''
-
diff --git a/etc/yardstick/nodes/standalone/pod_vepc_sut.yaml b/etc/yardstick/nodes/standalone/pod_vepc_sut.yaml
index 8467303e9..5d5ff379b 100644
--- a/etc/yardstick/nodes/standalone/pod_vepc_sut.yaml
+++ b/etc/yardstick/nodes/standalone/pod_vepc_sut.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.
@@ -17,7 +17,7 @@
 
 nodes:
 -
-    name: "vnf__0"
+    name: "vnf_0"
     role: vnf__0
     ip: 192.168.122.200
     user: user
diff --git a/etc/yardstick/nodes/standalone/trex_bm.yaml.sample b/etc/yardstick/nodes/standalone/trex_bm.yaml.sample
index 55a359ce1..1f46caaf0 100644
--- a/etc/yardstick/nodes/standalone/trex_bm.yaml.sample
+++ b/etc/yardstick/nodes/standalone/trex_bm.yaml.sample
@@ -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.
@@ -15,7 +15,7 @@
 
 nodes:
 -
-    name: tg__0
+    name: trafficgen_0
     role: tg__0
     ip: 1.1.1.1
     user: root
@@ -35,4 +35,3 @@ nodes:
             local_ip: "152.16.40.20"
             netmask:   "255.255.255.0"
             local_mac: "00:00.00:00:00:02"
-