Unify vFW testcases TG and VNF names

[yardstick.git] / samples / vnf_samples / nsut / vfw / tc_heat_external_http_ixload_1b_Requests-65000_Connections.yaml

diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_http_ixload_1b_Requests-65000_Connections.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_http_ixload_1b_Requests-65000_Connections.yaml
index 065143c..8c2cfd3 100644 (file)
--- a/samples/vnf_samples/nsut/vfw/tc_heat_external_http_ixload_1b_Requests-65000_Connections.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_http_ixload_1b_Requests-65000_Connections.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.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% set framesize = framesize or "{64B: 100}" %}
 ---
 schema: yardstick:task:0.1
 scenarios:
@@ -19,12 +19,12 @@ scenarios:
   traffic_profile: "../../traffic_profiles/http_tests/HTTP_1b-requests_65000_concurrency.yaml"
   topology: vfw_vnf_topology_ixload.yaml
   nodes:
-    tg__0: trafficgen_1.yardstick1
-    vnf__0: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
   options:
     framesize:
-      private: {64B: 100}
-      public: {64B: 100}
+      private: {{ framesize }}
+      public: {{ framesize }}
     traffic_type: 4
     rfc2544:
       allowed_drop_rate: 0.0001 - 0.0001
@@ -37,7 +37,7 @@ scenarios:
     duration: 2
   ixia_profile: ../../traffic_profiles/vfw/HTTP-vFW_IPv4_2Ports_Connections.rxf # Need vlan update
 contexts:
-  - name: yardstick1
+  - name: yardstick
     type: Node
     file: /etc/yardstick/nodes/pod_ixia.yaml
   - name: yardstick
@@ -55,7 +55,7 @@ contexts:
       pgrp1:
         policy: "availability"
     servers:
-      vnf:
+      vnf_0:
         floating_ip: true
         placement: "pgrp1"
         network_ports: