Merge changes from topic 'june_release'

* changes:
  Some fixes after code review
  Cosmetic change when printing warnings
  Multiple changes for June release

1 files changed, 15 insertions, 18 deletions

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/basicrapid.test b/VNFs/DPPD-PROX/helper-scripts/rapid/basicrapid.test
index b2f8f230..0a751d8c 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/basicrapid.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/basicrapid.test
@@ -1,5 +1,5 @@
 ##
-## Copyright (c) 2010-2018 Intel Corporation
+## Copyright (c) 2010-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.
@@ -16,10 +16,11 @@
 
 [DEFAULT]
 name = BasicSwapTesting
-number_of_tests = 4
+number_of_tests = 2
 total_number_of_test_machines = 2
 prox_socket = true
 prox_launch_exit = true
+tasks=[0]
 
 [TestM1]
 name = Generator
@@ -27,7 +28,6 @@ config_file = gen.cfg
 dest_vm = 2
 gencores = [1]
 latcores = [3]
-startspeed = 10
 
 [TestM2]
 name = Swap
@@ -36,25 +36,22 @@ swapcores = [1]
 
 [BinarySearchParams]
 drop_rate_threshold = 0.1
-lat_avg_threshold = 500
-lat_max_threshold = 1000
+lat_avg_threshold = 400
+lat_max_threshold = 800
 accuracy = 0.1
+startspeed = 10
 
 [test1]
-test=inittest
-
-[test2]
-test=speedtest
+test=warmuptest
+flowsize=512
 packetsize=64
+warmupspeed=1
+warmuptime=2
 
-[test3]
-test=sizetest
-flow=1
-packetsizes=[64,256,1024]
-
-[test4]
-test=flowtest
-packetsize=64
+[test2]
+test=flowsizetest
+packetsizes=[64,128]
 # the number of flows in the list need to be powers of 2, max 2^20
 # Select from following numbers: 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65535, 131072, 262144, 524280, 1048576
-flows=[1,512,1024]
+flows=[512,1]
+