From d4216dd28019256fd6363ed4269d540ef64ec23c Mon Sep 17 00:00:00 2001
From: Luc Provoost <luc.provoost@intel.com>
Date: Fri, 12 Apr 2019 11:20:58 +0200
Subject: Improved image building & new PROX

Bug fixes for the script for building an image via the packer tool. This
also installs a newer version of PROX with some bug fixes in PROX. The
*.test files have been simplified. Also introduced a new file
MachineMap.cfg to map test machines on actual VMs.

Change-Id: I69445327ef0a907bc8c1566aaa60c733418c541e
Signed-off-by: Luc Provoost <luc.provoost@intel.com>
---
 .../helper-scripts/openstackrapid/basicrapid.test  | 52 ++++++++++++----------
 1 file changed, 28 insertions(+), 24 deletions(-)

(limited to 'VNFs/DPPD-PROX/helper-scripts/openstackrapid/basicrapid.test')

diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/basicrapid.test b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/basicrapid.test
index 8d73711b..b2f8f230 100644
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/basicrapid.test
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/basicrapid.test
@@ -16,41 +16,45 @@
 
 [DEFAULT]
 name = BasicSwapTesting
-number_of_tests = 3
+number_of_tests = 4
 total_number_of_test_machines = 2
-init_code=init_test()
-dest_vm = not_used
-gw_vm = not_used
-script_control = false
-group1cores = not_used
-group2cores = not_used
-group3cores = not_used
-drop_rate_treshold = 0.1
-lat_avg_treshold = 200
-lat_max_treshold = 1000
-accuracy = 0.1
-startspeed = 10
-
+prox_socket = true
+prox_launch_exit = true
 
 [TestM1]
 name = Generator
-machine_index = 1
 config_file = gen.cfg
 dest_vm = 2
-script_control = true
-group1cores = [1]
-group2cores = [3]
-group3cores = [1,3]
+gencores = [1]
+latcores = [3]
+startspeed = 10
 
 [TestM2]
 name = Swap
-machine_index = 2
 config_file = swap.cfg
-group1cores = [1]
+swapcores = [1]
+
+[BinarySearchParams]
+drop_rate_threshold = 0.1
+lat_avg_threshold = 500
+lat_max_threshold = 1000
+accuracy = 0.1
 
 [test1]
-cmd=run_speedtest(socks[0],socks[1])
+test=inittest
+
 [test2]
-cmd=run_sizetest(socks[0],socks[1])
+test=speedtest
+packetsize=64
+
 [test3]
-cmd=run_flowtest(socks[0],socks[1])
+test=sizetest
+flow=1
+packetsizes=[64,256,1024]
+
+[test4]
+test=flowtest
+packetsize=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, 65535, 131072, 262144, 524280, 1048576
+flows=[1,512,1024]
-- 
cgit 1.2.3-korg