From b1cfe607cf04071e217f670b200b56d379b7b975 Mon Sep 17 00:00:00 2001 From: Luc Provoost Date: Thu, 15 Apr 2021 11:49:42 +0200 Subject: Rework of statistics reporting - Cleanup of the format.yaml file. - Adding of the packet mis-ordering statistics - Added a warmup phase to get the correct mis-ordering statistics since ARP messages need to be dealt with before we can collect correct misordering stats - Code cleanup avoiding some long lines - Removing background traffic control from rapid_flowsizetest.py since this is already done in the iteration code in rapid_test.py Change-Id: I4c60a90353f27b8e2d0b62505e8f1cd886a17f0a Signed-off-by: Luc Provoost --- .../helper-scripts/rapid/tests/TST009_Throughput.test | 11 ++++------- .../rapid/tests/TST009_Throughput_64B_64F.test | 4 ++++ .../rapid/tests/TST009_Throughput_acaeab_16384F.test | 4 ++++ VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009ipV6.test | 12 +++++------- VNFs/DPPD-PROX/helper-scripts/rapid/tests/bare.test | 11 ++++------- VNFs/DPPD-PROX/helper-scripts/rapid/tests/basicrapid.test | 11 ++++------- VNFs/DPPD-PROX/helper-scripts/rapid/tests/cgnat.test | 11 ++++------- VNFs/DPPD-PROX/helper-scripts/rapid/tests/corestats.test | 2 +- VNFs/DPPD-PROX/helper-scripts/rapid/tests/impair.test | 7 ++++--- .../helper-scripts/rapid/tests/increment_till_fail.test | 11 ++++------- VNFs/DPPD-PROX/helper-scripts/rapid/tests/ipv6.test | 11 ++++------- VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2zeroloss.test | 11 ++++------- VNFs/DPPD-PROX/helper-scripts/rapid/tests/l3framerate.test | 11 ++++------- VNFs/DPPD-PROX/helper-scripts/rapid/tests/portstats.test | 2 +- VNFs/DPPD-PROX/helper-scripts/rapid/tests/secgw.test | 11 ++++------- 15 files changed, 55 insertions(+), 75 deletions(-) (limited to 'VNFs/DPPD-PROX/helper-scripts/rapid/tests') diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput.test index 19d62fac..d51d3047 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput.test @@ -16,7 +16,7 @@ [TestParameters] name = Rapid_ETSINFV_TST009 -number_of_tests = 2 +number_of_tests = 1 total_number_of_test_machines = 2 lat_percentile = 99 @@ -36,14 +36,11 @@ mcore = [0] cores = [1] [test1] -test=warmuptest -flowsize=512 -imix=[64] +test=TST009test +warmupflowsize=512 +warmupimix=[64] warmupspeed=1 warmuptime=2 - -[test2] -test=TST009test imixs=[[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, 65536, 131072, 262144, 524288, 1048576 diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_64B_64F.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_64B_64F.test index 66767a09..2b0d3861 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_64B_64F.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_64B_64F.test @@ -37,6 +37,10 @@ cores = [1] [test1] test=TST009test +warmupflowsize=512 +warmupimix=[64] +warmupspeed=1 +warmuptime=2 imixs=[[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 diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_acaeab_16384F.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_acaeab_16384F.test index 31d19bf7..22f194bf 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_acaeab_16384F.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009_Throughput_acaeab_16384F.test @@ -37,6 +37,10 @@ cores = [1] [test1] test=TST009test +warmupflowsize=512 +warmupimix=[64] +warmupspeed=1 +warmuptime=2 imixs=[[64,256,64,1024,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, 65536, 131072, 262144, 524288, 1048576 diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009ipV6.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009ipV6.test index a19289f3..4b8a5e96 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009ipV6.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/TST009ipV6.test @@ -16,9 +16,10 @@ [TestParameters] name = BasicSwapTesting -number_of_tests = 2 +number_of_tests = 1 total_number_of_test_machines = 2 lat_percentile = 99 +ipv6 = True [TestM1] name = Generator @@ -38,14 +39,11 @@ cores = [1] #prox_launch_exit = true [test1] -test=warmuptest -flowsize=512 -imix=[64] +test=TST009test +warmupflowsize=512 +warmupimix=[64] warmupspeed=1 warmuptime=2 - -[test2] -test=TST009test # DO NOT USE IMIX FOR IPV6 TESTING. THE LIST OF IMIXS CAN ONLY CONTAIN LISTS # WITH ONE ELEMENT!!! # PACKET SIZE NEEDS TO BE AT LEAST 84 (66 + 18) FOR IPV6 diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/bare.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/bare.test index 9aab3fd0..803c65e7 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/bare.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/bare.test @@ -16,7 +16,7 @@ [TestParameters] name = BareTesting -number_of_tests = 2 +number_of_tests = 1 total_number_of_test_machines = 2 [TestM1] @@ -34,14 +34,11 @@ mcore = [0] cores = [1] [test1] -test=warmuptest -flowsize=512 -imix=[64] +test=flowsizetest +warmupflowsize=512 +warmupimix=[64] warmupspeed=10 warmuptime=2 - -[test2] -test=flowsizetest imixs=[[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, 65536, 131072, 262144, 524288, 1048576 diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/basicrapid.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/basicrapid.test index 76c1fa07..752e783f 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/basicrapid.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/basicrapid.test @@ -16,7 +16,7 @@ [TestParameters] name = BasicSwapTesting -number_of_tests = 2 +number_of_tests = 1 total_number_of_test_machines = 2 lat_percentile = 99 @@ -38,14 +38,11 @@ cores = [1] #prox_launch_exit = true [test1] -test=warmuptest -flowsize=512 -imix=[64] +test=flowsizetest +warmupflowsize=512 +warmupimix=[64] warmupspeed=1 warmuptime=2 - -[test2] -test=flowsizetest # Each element in the imix list will result in a separate test. Each element # is on its turn a list of packet sizes which will be used during one test # execution. If you only want to test 1 size, define a list with only one diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/cgnat.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/cgnat.test index 9136d038..c3453703 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/cgnat.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/cgnat.test @@ -16,7 +16,7 @@ [TestParameters] name = CGNATTesting -number_of_tests = 2 +number_of_tests = 1 total_number_of_test_machines = 3 [TestM1] @@ -45,14 +45,11 @@ mcore = [0] cores = [1] [test1] -test=warmuptest -flowsize=512 -imix=[64] +test=flowsizetest +warmupflowsize=512 +warmupimix=[64] warmupspeed=1 warmuptime=2 - -[test2] -test=flowsizetest imixs=[[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 diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/corestats.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/corestats.test index 1873c386..2ba4a1a9 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/corestats.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/corestats.test @@ -26,4 +26,4 @@ mcore = [0] cores = [1] [test1] -test=corestats +test=corestatstest diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/impair.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/impair.test index 865394fb..08616f43 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/impair.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/impair.test @@ -43,17 +43,18 @@ cores = [1] [test1] test=warmuptest -flowsize=1024 -imix=[64] +warmupflowsize=1024 +warmupimix=[64] warmupspeed=10 warmuptime=2 [test2] test=impairtest +steps=5 imix=[64] flowsize=64 drop_rate_threshold = 0.1 lat_avg_threshold = 500 lat_max_threshold = 1000 accuracy = 0.1 -startspeed = 10 +startspeed = 5 diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/increment_till_fail.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/increment_till_fail.test index 7cee0a30..b69bb491 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/increment_till_fail.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/increment_till_fail.test @@ -16,7 +16,7 @@ [TestParameters] name = IncrementTillFailTesting -number_of_tests = 2 +number_of_tests = 1 total_number_of_test_machines = 2 lat_percentile = 99 @@ -38,14 +38,11 @@ cores = [1] #prox_launch_exit = true [test1] -test=warmuptest -flowsize=512 -imix=[64] +test=increment_till_fail +warmupflowsize=512 +warmupimix=[64] warmupspeed=1 warmuptime=2 - -[test2] -test=increment_till_fail # Each element in the imix list will result in a separate test. Each element # is on its turn a list of packet sizes which will be used during one test # execution. If you only want to test 1 size, define a list with only one diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/ipv6.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/ipv6.test index e973bc9f..9f9e40a5 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/ipv6.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/ipv6.test @@ -16,7 +16,7 @@ [TestParameters] name = BasicSwapTesting -number_of_tests = 2 +number_of_tests = 1 total_number_of_test_machines = 2 lat_percentile = 99 ipv6 = True @@ -39,14 +39,11 @@ cores = [1] #prox_launch_exit = true [test1] -test=warmuptest -flowsize=512 -imix=[84] +test=flowsizetest +warmupflowsize=512 +warmupimix=[84] warmupspeed=1 warmuptime=2 - -[test2] -test=flowsizetest # DO NOT USE IMIX FOR IPV6 TESTING. THE LIST OF IMIXS CAN ONLY CONTAIN LISTS # WITH ONE ELEMENT!!! # PACKET SIZE NEEDS TO BE AT LEAST 84 (66 + 18) FOR IPV6 diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2zeroloss.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2zeroloss.test index 30b807f2..0e7b2563 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2zeroloss.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l2zeroloss.test @@ -16,7 +16,7 @@ [TestParameters] name = L2BasicSwapTesting -number_of_tests = 2 +number_of_tests = 1 total_number_of_test_machines = 2 [TestM1] @@ -34,14 +34,11 @@ mcore = [0] cores = [1] [test1] -test=warmuptest -flowsize=512 -imix=[64] +test=flowsizetest +warmupflowsize=512 +warmupimix=[64] warmupspeed=1 warmuptime=2 - -[test2] -test=flowsizetest # Each element in the imix list will result in a separate test. Each element # is on its turn a list of packet sizes which will be used during one test # execution. If you only want to test 1 size, define a list with only one diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l3framerate.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l3framerate.test index 04aa4732..3ffd9d2d 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l3framerate.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/l3framerate.test @@ -16,7 +16,7 @@ [TestParameters] name = L3FrameRateTesting -number_of_tests = 2 +number_of_tests = 1 total_number_of_test_machines = 2 [TestM1] @@ -34,14 +34,11 @@ mcore = [0] cores = [1] [test1] -test=warmuptest -flowsize=64 -imix=[64] +test=fixed_rate +warmupflowsize=64 +warmupimix=[64] warmupspeed=1 warmuptime=2 - -[test2] -test=fixed_rate 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 diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/portstats.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/portstats.test index fd2e1789..347b43e0 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/portstats.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/portstats.test @@ -27,4 +27,4 @@ cores = [1] ports = [0] [test1] -test=portstats +test=portstatstest diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/secgw.test b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/secgw.test index 509727ad..f6e8025b 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/tests/secgw.test +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/tests/secgw.test @@ -16,7 +16,7 @@ [TestParameters] name = GWTesting -number_of_tests = 2 +number_of_tests = 1 total_number_of_test_machines = 3 [TestM1] @@ -42,14 +42,11 @@ mcore = [0] cores = [1] [test1] -test=warmuptest -flowsize=512 -imix=[64] +test=flowsizetest +warmupflowsize=512 +warmupimix=[64] warmupspeed=1 warmuptime=2 - -[test2] -test=flowsizetest imixs=[[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 -- cgit 1.2.3-korg