Code rewrite and Python3 support

The code has been rewritten in multiple classes and files for better
readability and maintainability. You should now also use Python3 to run
the scripts. Some of the variables in the config files have moved to
other sections. The pushgateway parameter moved to the [varia] section
of the rapid environment file.

Change-Id: Ic61a1bc3baa39447d42b21dfcc0f16c28fcdfa6e
Signed-off-by: Luc Provoost <luc.provoost@intel.com>

1 files changed, 23 insertions, 17 deletions

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/basicrapid.test b/VNFs/DPPD-PROX/helper-scripts/rapid/basicrapid.test
index d3213d21..361b0dd7 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/basicrapid.test
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/basicrapid.test
@@ -14,13 +14,10 @@
 ## limitations under the License.
 ##
 
-[DEFAULT]
+[TestParameters]
 name = BasicSwapTesting
 number_of_tests = 2
 total_number_of_test_machines = 2
-prox_socket = true
-prox_launch_exit = true
-#PushGateway=http://192.168.36.1:9091
 lat_percentile = 99
 
 [TestM1]
@@ -29,19 +26,14 @@ config_file = gen.cfg
 dest_vm = 2
 gencores = [1]
 latcores = [3]
+#bucket_size_exp = 12
 
 [TestM2]
 name = Swap
 config_file = swap.cfg
-cores = [1]
-
-[BinarySearchParams]
-drop_rate_threshold = 0.1
-lat_avg_threshold = 50
-lat_perc_threshold = 80
-lat_max_threshold = inf
-accuracy = 0.1
-startspeed = 5
+cores = [1,2]
+#prox_socket = true
+#prox_launch_exit = true
 
 [test1]
 test=warmuptest
@@ -52,7 +44,21 @@ warmuptime=2
 
 [test2]
 test=flowsizetest
-packetsizes=[64]
-# 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, 65536, 131072, 262144, 524288, 1048576
-flows=[64]
+# 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
+packetsizes=[64,128]
+# the number of flows in the list need to be powers of 2, max 2^30
+# 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=[64,500000]
+# Setting one of the following thresholds to infinity (inf)
+# results in the criterion not being evaluated to rate the test as scussesful
+drop_rate_threshold = 0.1
+lat_avg_threshold = 50
+lat_perc_threshold = 80
+lat_max_threshold = inf
+accuracy = 1
+startspeed = 50