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>

diff --git a/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.yaml b/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.yaml
index d96236e..050c8cc 100644 (file)
--- a/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.yaml
+++ b/samples/vnf_samples/nsut/2trex/tc_trex_baremetal_context.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.
@@ -22,14 +22,14 @@ scenarios:
   topology: trex_tg_topology.yaml  # TODO: look in relative path where the tc.yaml is found
 
   nodes:  # This section is copied from pod.xml or resolved via Heat
-    trexgen__1: trafficgen_1.yardstick
-    trexvnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   vnf_options:
-    trexgen__1:
-      target_ip: trexvnf__0.xe0.local_ip  # TODO: resolve to config vars
-    trexvnf__0:
-      target_ip: trexgen__1.xe1.local_ip  # TODO: resolve to config vars
+    tg__0:
+      target_ip: vnf__0.xe0.local_ip  # TODO: resolve to config vars
+    vnf__0:
+      target_ip: tg__0.xe1.local_ip  # TODO: resolve to config vars
   runner:
     type: Duration
     duration: 10

diff --git a/samples/vnf_samples/nsut/2trex/trex_tg_topology.yaml b/samples/vnf_samples/nsut/2trex/trex_tg_topology.yaml
index 822cf5e..ab95bb9 100644 (file)
--- a/samples/vnf_samples/nsut/2trex/trex_tg_topology.yaml
+++ b/samples/vnf_samples/nsut/2trex/trex_tg_topology.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.
@@ -20,31 +20,31 @@ nsd:nsd-catalog:
         description: trex-tg-topology
         constituent-vnfd:
         -   member-vnf-index: '1'
-            vnfd-id-ref: trexgen__0
+            vnfd-id-ref: tg__0
             VNF model: ../../vnf_descriptors/tg_trex_tpl.yaml      #VNF type
         -   member-vnf-index: '2'
-            vnfd-id-ref: trexvnf__0
+            vnfd-id-ref: vnf__0
             VNF model: ../../vnf_descriptors/tg_trex_tpl.yaml      #VNF type
 
         vld:
         -   id: uplink
-            name: trexgen__0 to trexvnf__0 link 1
+            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: trexgen
+                vnfd-id-ref: tg__0
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe0
-                vnfd-id-ref: trexgen
+                vnfd-id-ref: vnf__0
 
         -   id: downlink
-            name: trexvnf__0 to trexgen__0 link 2
+            name: vnf__0 to tg__0 link 2
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: trexgen
+                vnfd-id-ref: vnf__0
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe1
-                vnfd-id-ref: trexgen
+                vnfd-id-ref: tg__0

diff --git a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_8ports_1port_congested_IMIX.yaml b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_8ports_1port_congested_IMIX.yaml
index 4418862..aea981d 100644 (file)
--- a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_8ports_1port_congested_IMIX.yaml
+++ b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_8ports_1port_congested_IMIX.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.
@@ -31,7 +31,7 @@ scenarios:
   topology: "../agnostic/agnostic_vnf_topology_ixia_8ports.yaml"
   ixia_config: IxiaPppoeClient
   nodes:
-    tg__0: tg_0.yardstick
+    tg__0: trafficgen_0.yardstick
     vnf__0: vnf_0.yardstick
   options:
     duration: {{ duration }}

diff --git a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX_scale_up.yaml b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX_scale_up.yaml
index afd60cc..882d3e2 100644 (file)
--- a/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX_scale_up.yaml
+++ b/samples/vnf_samples/nsut/bng/tc_bng_pppoe_rfc2544_ixia_IMIX_scale_up.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.
@@ -32,7 +32,7 @@ scenarios:
   extra_args:
     access_vports_num: {{ vports|int / 2 }}
   nodes:
-    tg__0: tg_0.yardstick
+    tg__0: trafficgen_0.yardstick
     vnf__0: vnf_0.yardstick
   options:
     duration: {{ duration }}

diff --git a/samples/vnf_samples/nsut/cmts/tc_k8s_pktgen_01.yaml b/samples/vnf_samples/nsut/cmts/tc_k8s_pktgen_01.yaml
index cab8bb8..bb82e7a 100644 (file)
--- a/samples/vnf_samples/nsut/cmts/tc_k8s_pktgen_01.yaml
+++ b/samples/vnf_samples/nsut/cmts/tc_k8s_pktgen_01.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.
@@ -31,7 +31,7 @@ context:
   type: Kubernetes
 
   servers:
-    vnf:
+    vnf_0:
       containers:
         - image: si-docker.ir.intel.com/vcmts-ubuntu/vcmts-pktgen-uepi
           args: ["/opt/bin/cmk isolate --conf-dir=/etc/cmk --socket-id=0 --pool=dataplane /vcmts/setup.sh anga_mac_1_ds.pcap ds"]

diff --git a/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml b/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml
index 6e3dd32..47d1dc3 100644 (file)
--- a/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_external_ping_heat_context.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.
@@ -22,8 +22,8 @@ scenarios:
   topology: ping_tg_topology.yaml
 
   nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.baremetal
+    vnf__0: vnf_0.yardstick
 
   runner:
     type: Duration
@@ -40,7 +40,7 @@ contexts:
         policy: "availability"
 
     servers:
-      vnf:
+      vnf_0:
         floating_ip: true
         placement: "pgrp1"
 

diff --git a/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml b/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml
index 63f2524..bd7d6fd 100644 (file)
--- a/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_ping_baremetal_context.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.
@@ -22,8 +22,8 @@ scenarios:
   topology: ping_tg_topology.yaml  # TODO: look in relative path where the tc.yaml is found
 
   nodes:  # This section is copied from pod.xml or resolved via Heat
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   vnf_options:
     tg__0:

diff --git a/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml b/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml
index a3a11f6..55b9309 100644 (file)
--- a/samples/vnf_samples/nsut/ping/tc_ping_heat_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_ping_heat_context.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.
@@ -22,8 +22,8 @@ scenarios:
   topology: ping_tg_topology.yaml
 
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   runner:
     type: Duration
@@ -40,10 +40,10 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    trafficgen_0:
       floating_ip: true
       placement: "pgrp1"
 

diff --git a/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml b/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml
index 5733f0d..9a425f5 100644 (file)
--- a/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.yaml
+++ b/samples/vnf_samples/nsut/ping/tc_ping_ovs_dpdk_context.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.
@@ -22,8 +22,8 @@ scenarios:
   topology: ping_tg_topology.yaml  # TODO: look in relative path where the tc.yaml is found
 
   nodes:  # This section is copied from pod.xml or resolved via Heat
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   vnf_options:
     tg__0:

diff --git a/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
index 90e04f9..7047e49 100644 (file)
--- a/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/udp_replay/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 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.yaml
   topology: udp_replay-vnf-topology.yaml
   nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     packetsize: 64
     traffic_type: 4
@@ -55,10 +55,10 @@ context:
       policy: "availability"
 
   servers:
-    vnf:
+    vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    trafficgen_1:
+    trafficgen_0:
       floating_ip: true
       placement: "pgrp1"
 

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 ee17df1..5c05bf3 100644 (file)
--- 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 7656706..ba24241 100644 (file)
--- 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 65f58bd..e2dc1c7 100644 (file)
--- 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 55a96f4..7b298b7 100644 (file)
--- 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 cece2a7..7ba1520 100644 (file)
--- 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 81a4149..c9b215a 100644 (file)
--- 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 eaf4ae9..72efa19 100644 (file)
--- 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

diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml
index cbe6cf1..32eb21d 100644 (file)
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.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,8 +19,8 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
   topology: vpe_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: {64B: 100}

diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml
index 1587680..3048a1d 100644 (file)
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.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,8 +19,8 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
   topology: vpe_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: {1518B: 100}

diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml
index b7d209e..f683ff9 100644 (file)
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.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,8 +19,8 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
   topology: vpe_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: {64B: 100}

diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
index 399de9c..e7095b8 100644 (file)
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.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/ixia_ipv4_latency_vpe.yaml"
   topology: vpe_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: {64B: 100}

diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
index b687164..cd98714 100644 (file)
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.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,9 +19,9 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
   topology: vpe_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: {64B: 100}

diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml
index 421697f..f81392e 100644 (file)
--- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.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,8 +19,8 @@ scenarios:
   traffic_profile: "../../traffic_profiles/ipv4_throughput_vpe.yaml"
   topology: vpe_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: {64B: 5, 128B: 11, 256B: 16, 373B: 10, 570B: 35, 1400B: 10, 1500B: 13}

diff --git a/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
index 39aea13..726754f 100644 (file)
--- a/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.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_vpe.yaml
   topology: vpe_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: {64B: 100}
@@ -70,7 +70,7 @@ contexts:
        user: ""
        password: ""
      servers:
-       vnf__0:
+       vnf_0:
          network_ports:
            mgmt:
              cidr: '1.1.1.7/24'

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc094.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc094.yaml
index afeb443..69b222b 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc094.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc094.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.
@@ -29,7 +29,7 @@ scenarios:
   topology: {{ topology }}
 
   nodes:
-    tg__0: tg_0.yardstick
+    tg__0: trafficgen_1.yardstick
     vnf__0: vnf_0.yardstick
 
   options:
@@ -74,7 +74,7 @@ context:
     vnf_0:
       floating_ip: true
       placement: "pgrp1"
-    tg_0:
+    trafficgen_1:
       floating_ip: true
       placement: "pgrp1"
 
@@ -91,4 +91,3 @@ context:
       gateway_ip: 'null'
       port_security_enabled: False
       enable_dhcp: 'false'
-