X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=VNFs%2FDPPD-PROX%2Fhelper-scripts%2Frapid%2Fl3framerate.test;h=1d890d13fe4207920cea700dcaf72fca2bf5257a;hb=refs%2Fchanges%2F22%2F71722%2F1;hp=2095da4c95f3308386630ac2ebfeeaf938ef2509;hpb=d55e457cfc09e84c0a3fb8c32a21517c4388a131;p=samplevnf.git

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/l3framerate.test b/VNFs/DPPD-PROX/helper-scripts/rapid/l3framerate.test
index 2095da4c..1d890d13 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/l3framerate.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/l3framerate.test
@@ -1,5 +1,5 @@
 ##
-## Copyright (c) 2010-2019 Intel Corporation
+## Copyright (c) 2010-2020 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,13 +14,10 @@
 ## limitations under the License.
 ##
 
-[DEFAULT]
+[TestParameters]
 name = L3FrameRateTesting
-number_of_tests = 1
+number_of_tests = 2
 total_number_of_test_machines = 2
-prox_socket = true
-prox_launch_exit = true
-tasks=[0]
 
 [TestM1]
 name = Generator
@@ -32,9 +29,25 @@ latcores = [3]
 [TestM2]
 name = Swap
 config_file = swap.cfg
-swapcores = [1]
+cores = [1]
 
 [test1]
+test=warmuptest
+flowsize=64
+imix=[64]
+warmupspeed=1
+warmuptime=2
+
+[test2]
 test=fixed_rate
-packetsizes=[64]
-speed=10
+# Following parameter defines the success criterium for the test.
+# When this test uses multiple combinations of packet size and flows,
+# all combinations must be meeting the same threshold
+# The threshold is expressed in Mpps
+pass_threshold=0.1
+imixs=[[64],[128]]
+# the number of flows in the list need to be powers of 2, max 2^20
+# If not a power of 2, we will use the lowest power of 2 that is larger than
+# the requested number of flows. e.g. 9 will result in 16 flows
+flows=[1,64]
+startspeed=5