Unify PROX testcases TG and VNF names

[yardstick.git] / samples / vnf_samples / nsut / prox / tc_prox_baremetal_l2fwd-4.yaml

diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml
index e6bcac4..ec675c1 100644 (file)
--- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.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,30 +22,43 @@ scenarios:
   topology: prox-tg-topology-4.yaml
 
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
+    tg__0: trafficgen_0.yardstick
+    vnf__0: vnf_0.yardstick
 
   options:
-    vnf__1:
-      prox_path: /root/dppd-PROX-v037/build/prox
+    interface_speed_gbps: 10
+
+    vnf__0:
+      collectd:
+        interval: 1
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/handle_l2fwd-4.cfg"
       prox_args:
         "-t": ""
 
-    tg__1:
-      prox_path: /root/dppd-PROX-v037/build/prox
+    tg__0:
+      collectd:
+        interval: 1
+      prox_path: /opt/nsb_bin/prox
       prox_config: "configs/gen_l2fwd-4.cfg"
       prox_args:
         "-e": ""
         "-t": ""
 
+
   runner:
-    type: Duration
+    type: ProxDuration
+    # sampling interval
+    interval: 1
+    # sampled : yes OR sampled: no (DEFAULT yes)
+    sampled: yes
     # we kill after duration, independent of test duration, so set this high
-    duration: 100
+    duration: 3100
+    # Confirmation attempts
+    confirmation: 1
 
 context:
   type: Node
   name: yardstick
   nfvi_type: baremetal
-  file: /etc/yardstick/nodes/prox-baremetal-4.yml
+  file: prox-baremetal-4.yaml