diff --git a/src/SiriClient.java b/SiriClient.java similarity index 100% rename from src/SiriClient.java rename to SiriClient.java diff --git a/src/conf/https/topo b/config/simple/topo similarity index 63% rename from src/conf/https/topo rename to config/simple/topo index 1e5f37d..a56ea41 100644 --- a/src/conf/https/topo +++ b/config/simple/topo @@ -1,5 +1,5 @@ leftSubnet:10.0. rightSubnet:10.1. -path_0:100,20,4 -path_1:1,20,4 +path_0:10,10,4 +path_1:40,30,4 topoType:MultiIf diff --git a/config/simple/xp b/config/simple/xp new file mode 100644 index 0000000..302a934 --- /dev/null +++ b/config/simple/xp @@ -0,0 +1 @@ +xpType:none diff --git a/src/http.py b/http.py similarity index 100% rename from src/http.py rename to http.py diff --git a/src/https.py b/https.py similarity index 100% rename from src/https.py rename to https.py diff --git a/src/mpConfig.py b/mpConfig.py similarity index 100% rename from src/mpConfig.py rename to mpConfig.py diff --git a/src/mpECMPSingleInterfaceConfig.py b/mpECMPSingleInterfaceConfig.py similarity index 100% rename from src/mpECMPSingleInterfaceConfig.py rename to mpECMPSingleInterfaceConfig.py diff --git a/src/mpECMPSingleInterfaceTopo.py b/mpECMPSingleInterfaceTopo.py similarity index 100% rename from src/mpECMPSingleInterfaceTopo.py rename to mpECMPSingleInterfaceTopo.py diff --git a/src/mpExperience.py b/mpExperience.py similarity index 100% rename from src/mpExperience.py rename to mpExperience.py diff --git a/src/mpExperienceAb.py b/mpExperienceAb.py similarity index 100% rename from src/mpExperienceAb.py rename to mpExperienceAb.py diff --git a/src/mpExperienceDITG.py b/mpExperienceDITG.py similarity index 100% rename from src/mpExperienceDITG.py rename to mpExperienceDITG.py diff --git a/src/mpExperienceEpload.py b/mpExperienceEpload.py similarity index 100% rename from src/mpExperienceEpload.py rename to mpExperienceEpload.py diff --git a/src/mpExperienceHTTP.py b/mpExperienceHTTP.py similarity index 100% rename from src/mpExperienceHTTP.py rename to mpExperienceHTTP.py diff --git a/src/mpExperienceHTTPS.py b/mpExperienceHTTPS.py similarity index 100% rename from src/mpExperienceHTTPS.py rename to mpExperienceHTTPS.py diff --git a/src/mpExperienceIperf.py b/mpExperienceIperf.py similarity index 100% rename from src/mpExperienceIperf.py rename to mpExperienceIperf.py diff --git a/src/mpExperienceMsg.py b/mpExperienceMsg.py similarity index 100% rename from src/mpExperienceMsg.py rename to mpExperienceMsg.py diff --git a/src/mpExperienceNC.py b/mpExperienceNC.py similarity index 100% rename from src/mpExperienceNC.py rename to mpExperienceNC.py diff --git a/src/mpExperienceNCPV.py b/mpExperienceNCPV.py similarity index 100% rename from src/mpExperienceNCPV.py rename to mpExperienceNCPV.py diff --git a/src/mpExperienceNetperf.py b/mpExperienceNetperf.py similarity index 100% rename from src/mpExperienceNetperf.py rename to mpExperienceNetperf.py diff --git a/src/mpExperienceNone.py b/mpExperienceNone.py similarity index 100% rename from src/mpExperienceNone.py rename to mpExperienceNone.py diff --git a/src/mpExperiencePing.py b/mpExperiencePing.py similarity index 100% rename from src/mpExperiencePing.py rename to mpExperiencePing.py diff --git a/src/mpExperienceQUIC.py b/mpExperienceQUIC.py similarity index 100% rename from src/mpExperienceQUIC.py rename to mpExperienceQUIC.py diff --git a/src/mpExperienceQUICSiri.py b/mpExperienceQUICSiri.py similarity index 100% rename from src/mpExperienceQUICSiri.py rename to mpExperienceQUICSiri.py diff --git a/src/mpExperienceSendFile.py b/mpExperienceSendFile.py similarity index 100% rename from src/mpExperienceSendFile.py rename to mpExperienceSendFile.py diff --git a/src/mpExperienceSiri.py b/mpExperienceSiri.py similarity index 100% rename from src/mpExperienceSiri.py rename to mpExperienceSiri.py diff --git a/src/mpExperienceSiriHTTP.py b/mpExperienceSiriHTTP.py similarity index 100% rename from src/mpExperienceSiriHTTP.py rename to mpExperienceSiriHTTP.py diff --git a/src/mpExperienceSiriMsg.py b/mpExperienceSiriMsg.py similarity index 100% rename from src/mpExperienceSiriMsg.py rename to mpExperienceSiriMsg.py diff --git a/src/mpExperienceVLC.py b/mpExperienceVLC.py similarity index 100% rename from src/mpExperienceVLC.py rename to mpExperienceVLC.py diff --git a/src/mpLinkCharacteristics.py b/mpLinkCharacteristics.py similarity index 100% rename from src/mpLinkCharacteristics.py rename to mpLinkCharacteristics.py diff --git a/src/mpMininetBuilder.py b/mpMininetBuilder.py similarity index 100% rename from src/mpMininetBuilder.py rename to mpMininetBuilder.py diff --git a/src/mpMultiInterfaceConfig.py b/mpMultiInterfaceConfig.py similarity index 100% rename from src/mpMultiInterfaceConfig.py rename to mpMultiInterfaceConfig.py diff --git a/src/mpMultiInterfaceCongConfig.py b/mpMultiInterfaceCongConfig.py similarity index 100% rename from src/mpMultiInterfaceCongConfig.py rename to mpMultiInterfaceCongConfig.py diff --git a/src/mpMultiInterfaceCongTopo.py b/mpMultiInterfaceCongTopo.py similarity index 100% rename from src/mpMultiInterfaceCongTopo.py rename to mpMultiInterfaceCongTopo.py diff --git a/src/mpMultiInterfaceTopo.py b/mpMultiInterfaceTopo.py similarity index 100% rename from src/mpMultiInterfaceTopo.py rename to mpMultiInterfaceTopo.py diff --git a/src/mpNetemAt.py b/mpNetemAt.py similarity index 100% rename from src/mpNetemAt.py rename to mpNetemAt.py diff --git a/src/mpParam.py b/mpParam.py similarity index 100% rename from src/mpParam.py rename to mpParam.py diff --git a/src/mpParamTopo.py b/mpParamTopo.py similarity index 100% rename from src/mpParamTopo.py rename to mpParamTopo.py diff --git a/src/mpParamXp.py b/mpParamXp.py similarity index 100% rename from src/mpParamXp.py rename to mpParamXp.py diff --git a/src/mpPerf.py b/mpPerf.py similarity index 100% rename from src/mpPerf.py rename to mpPerf.py diff --git a/src/mpPvAt.py b/mpPvAt.py similarity index 100% rename from src/mpPvAt.py rename to mpPvAt.py diff --git a/src/mpTopo.py b/mpTopo.py similarity index 100% rename from src/mpTopo.py rename to mpTopo.py diff --git a/src/mpTwoInterfaceCongestionConfig.py b/mpTwoInterfaceCongestionConfig.py similarity index 100% rename from src/mpTwoInterfaceCongestionConfig.py rename to mpTwoInterfaceCongestionConfig.py diff --git a/src/mpTwoInterfaceCongestionTopo.py b/mpTwoInterfaceCongestionTopo.py similarity index 100% rename from src/mpTwoInterfaceCongestionTopo.py rename to mpTwoInterfaceCongestionTopo.py diff --git a/src/mpXpRunner.py b/mpXpRunner.py similarity index 100% rename from src/mpXpRunner.py rename to mpXpRunner.py diff --git a/src/msg_client.py b/msg_client.py similarity index 100% rename from src/msg_client.py rename to msg_client.py diff --git a/src/msg_server.py b/msg_server.py similarity index 100% rename from src/msg_server.py rename to msg_server.py diff --git a/src/server.pem b/server.pem similarity index 100% rename from src/server.pem rename to server.pem diff --git a/src/siriClient.jar b/siriClient.jar similarity index 100% rename from src/siriClient.jar rename to siriClient.jar diff --git a/src/siri_server.py b/siri_server.py similarity index 100% rename from src/siri_server.py rename to siri_server.py diff --git a/src/bup_tests/kernelspace/topo b/src/bup_tests/kernelspace/topo deleted file mode 100644 index 795f96f..0000000 --- a/src/bup_tests/kernelspace/topo +++ /dev/null @@ -1,10 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,10,4,True -path_1:40,30,4,False -topoType:MultiIf -#changeNetem:yes -#netem_{path_id}:at,cmd -#netemAt_0:5,delay 100ms limit 10 loss 10% -#netemAt_0:15,delay 10ms limit 10 -#netemAt_1:15,delay 100ms limit 10 diff --git a/src/bup_tests/kernelspace/validation.yml b/src/bup_tests/kernelspace/validation.yml deleted file mode 100644 index 0f98ede..0000000 --- a/src/bup_tests/kernelspace/validation.yml +++ /dev/null @@ -1,9 +0,0 @@ -checkers: - tshark: - # applies provided filter to tcpdump trace and returns number of packets matching - - test: "filter" - filter: "tcp.options.mptcp.subtype==5" - validations: - - name: "exact_value" - target: 1 - desc: "When the default interface is a backup, MPRIO should be sent" diff --git a/src/bup_tests/kernelspace/xp b/src/bup_tests/kernelspace/xp deleted file mode 100644 index 9c0e589..0000000 --- a/src/bup_tests/kernelspace/xp +++ /dev/null @@ -1,10 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:5000 -kpmc:fullmesh -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 diff --git a/src/bup_tests/userspace/topo b/src/bup_tests/userspace/topo deleted file mode 100644 index 795f96f..0000000 --- a/src/bup_tests/userspace/topo +++ /dev/null @@ -1,10 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,10,4,True -path_1:40,30,4,False -topoType:MultiIf -#changeNetem:yes -#netem_{path_id}:at,cmd -#netemAt_0:5,delay 100ms limit 10 loss 10% -#netemAt_0:15,delay 10ms limit 10 -#netemAt_1:15,delay 100ms limit 10 diff --git a/src/bup_tests/userspace/validation.yml b/src/bup_tests/userspace/validation.yml deleted file mode 100644 index 0f98ede..0000000 --- a/src/bup_tests/userspace/validation.yml +++ /dev/null @@ -1,9 +0,0 @@ -checkers: - tshark: - # applies provided filter to tcpdump trace and returns number of packets matching - - test: "filter" - filter: "tcp.options.mptcp.subtype==5" - validations: - - name: "exact_value" - target: 1 - desc: "When the default interface is a backup, MPRIO should be sent" diff --git a/src/bup_tests/userspace/xp b/src/bup_tests/userspace/xp deleted file mode 100644 index 158dc11..0000000 --- a/src/bup_tests/userspace/xp +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:5000 -kpmc:netlink -upmc:fullmesh -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 diff --git a/src/burst_tests/first/topo b/src/burst_tests/first/topo deleted file mode 100644 index be0ac21..0000000 --- a/src/burst_tests/first/topo +++ /dev/null @@ -1,7 +0,0 @@ -desc:Simple configuration with two para link -topoType:MultiIf -leftSubnet:10.0. -rightSubnet:10.1. -#path_x:delay,queueSize(may be calc),bw -path_0:10,10,5 -path_1:1000,40,5 diff --git a/src/burst_tests/first/validation.yml b/src/burst_tests/first/validation.yml deleted file mode 100644 index 893c105..0000000 --- a/src/burst_tests/first/validation.yml +++ /dev/null @@ -1,5 +0,0 @@ -checkers: - mptcptrace: - tcptrace: -aggregators: - - burst_blocks diff --git a/src/burst_tests/first/xp b/src/burst_tests/first/xp deleted file mode 100644 index ec29c38..0000000 --- a/src/burst_tests/first/xp +++ /dev/null @@ -1,14 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:64k -ddCount:1000 -kpmc:fullmesh - -#kpmc:netlink -#upmc:fullmeshIfNeededRate -#upmc_args: -c 500 -i 1000 -t 60000 - -kpms:fullmesh -pvG:1000000 -pvZ:1000000 diff --git a/src/conf/bb/topo_1 b/src/conf/bb/topo_1 deleted file mode 100644 index d54fa43..0000000 --- a/src/conf/bb/topo_1 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -#path_0:10,10,3 -path_1:100,70,4 -topoType:MultiIf diff --git a/src/conf/bb/xp_1 b/src/conf/bb/xp_1 deleted file mode 100644 index a4bce63..0000000 --- a/src/conf/bb/xp_1 +++ /dev/null @@ -1,10 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -rmem:8388608 8388608 8388608 diff --git a/src/conf/blogPost/topo_1 b/src/conf/blogPost/topo_1 deleted file mode 100644 index 4daf266..0000000 --- a/src/conf/blogPost/topo_1 +++ /dev/null @@ -1,10 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,10,4 -path_1:40,30,4 -topoType:MultiIf -#changeNetem:yes -#netem_{path_id}:at,cmd -#netemAt_0:5,delay 100ms limit 10 loss 10% -#netemAt_0:15,delay 10ms limit 10 -#netemAt_1:15,delay 100ms limit 10 diff --git a/src/conf/blogPost/topo_2 b/src/conf/blogPost/topo_2 deleted file mode 100644 index fea1dc6..0000000 --- a/src/conf/blogPost/topo_2 +++ /dev/null @@ -1,10 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,10,4 -path_1:40,30,4 -topoType:MultiIf -changeNetem:yes -#netem_{path_id}:at,cmd -netemAt_0:5,delay 100ms limit 10 loss 10% -#netemAt_0:15,delay 10ms limit 10 -#netemAt_1:15,delay 100ms limit 10 diff --git a/src/conf/blogPost/topo_3 b/src/conf/blogPost/topo_3 deleted file mode 100644 index 1ac26bd..0000000 --- a/src/conf/blogPost/topo_3 +++ /dev/null @@ -1,10 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,10,4 -path_1:40,30,4 -topoType:MultiIf -changeNetem:yes -#netem_{path_id}:at,cmd -netemAt_0:5,delay 100ms limit 10 loss 10% -netemAt_0:15,delay 10ms limit 10 -#netemAt_1:15,delay 100ms limit 10 diff --git a/src/conf/blogPost/topo_4 b/src/conf/blogPost/topo_4 deleted file mode 100644 index cc8b986..0000000 --- a/src/conf/blogPost/topo_4 +++ /dev/null @@ -1,10 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,10,4 -path_1:40,30,4 -topoType:MultiIf -changeNetem:yes -#netem_{path_id}:at,cmd -netemAt_0:5,delay 100ms limit 10 loss 10% -netemAt_0:15,delay 10ms limit 10 -netemAt_1:15,delay 40ms limit 10 loss 1% diff --git a/src/conf/blogPost/topo_5 b/src/conf/blogPost/topo_5 deleted file mode 100644 index e97649e..0000000 --- a/src/conf/blogPost/topo_5 +++ /dev/null @@ -1,10 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,10,4 -path_1:40,30,4 -topoType:MultiIf -changeNetem:yes -#netem_{path_id}:at,cmd -netemAt_0:5,delay 100ms limit 10 loss 10% -netemAt_0:15,delay 10ms limit 10 -#netemAt_1:15,delay 40ms limit 10 loss 1% diff --git a/src/conf/blogPost/xp_1 b/src/conf/blogPost/xp_1 deleted file mode 100644 index 391d8ed..0000000 --- a/src/conf/blogPost/xp_1 +++ /dev/null @@ -1,9 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 diff --git a/src/conf/blogPost/xp_2 b/src/conf/blogPost/xp_2 deleted file mode 100644 index 391d8ed..0000000 --- a/src/conf/blogPost/xp_2 +++ /dev/null @@ -1,9 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 diff --git a/src/conf/blogPost/xp_3 b/src/conf/blogPost/xp_3 deleted file mode 100644 index 391d8ed..0000000 --- a/src/conf/blogPost/xp_3 +++ /dev/null @@ -1,9 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 diff --git a/src/conf/blogPost/xp_4 b/src/conf/blogPost/xp_4 deleted file mode 100644 index 391d8ed..0000000 --- a/src/conf/blogPost/xp_4 +++ /dev/null @@ -1,9 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 diff --git a/src/conf/blogPost/xp_5 b/src/conf/blogPost/xp_5 deleted file mode 100644 index 3da1f80..0000000 --- a/src/conf/blogPost/xp_5 +++ /dev/null @@ -1,9 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 diff --git a/src/conf/bo/topo_1 b/src/conf/bo/topo_1 deleted file mode 100644 index fbbe756..0000000 --- a/src/conf/bo/topo_1 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:100,70,4 -path_1:100,70,4 -topoType:MultiIf -changeNetem:yes -netemAt_0:5,delay 100ms limit 10 loss 95% -netemAt_1:0,delay 200ms limit 10 -netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/bo/topo_2 b/src/conf/bo/topo_2 deleted file mode 100644 index 512e15b..0000000 --- a/src/conf/bo/topo_2 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:100,70,4 -path_1:100,70,4 -topoType:MultiIf -changeNetem:yes -#netemAt_0:5,delay 100ms limit 10 loss 95% -netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/bo/topo_3 b/src/conf/bo/topo_3 deleted file mode 100644 index 204406d..0000000 --- a/src/conf/bo/topo_3 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:100,70,4 -#path_1:100,70,4 -topoType:MultiIf -changeNetem:yes -#netemAt_0:5,delay 100ms limit 10 loss 95% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/bo/topo_4 b/src/conf/bo/topo_4 deleted file mode 100644 index 715103d..0000000 --- a/src/conf/bo/topo_4 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:100,70,4 -#path_1:100,70,4 -topoType:MultiIf -changeNetem:yes -netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/bo/topo_5 b/src/conf/bo/topo_5 deleted file mode 100644 index a3cf5dd..0000000 --- a/src/conf/bo/topo_5 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,7,4 -#path_1:400,70,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/bo/xp_1 b/src/conf/bo/xp_1 deleted file mode 100644 index 5d957ed..0000000 --- a/src/conf/bo/xp_1 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/bo/xp_2 b/src/conf/bo/xp_2 deleted file mode 100644 index 5d957ed..0000000 --- a/src/conf/bo/xp_2 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/bo/xp_3 b/src/conf/bo/xp_3 deleted file mode 100644 index 5d957ed..0000000 --- a/src/conf/bo/xp_3 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/bo/xp_4 b/src/conf/bo/xp_4 deleted file mode 100644 index 161ef2b..0000000 --- a/src/conf/bo/xp_4 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:250000 250000 250000 diff --git a/src/conf/bo/xp_5 b/src/conf/bo/xp_5 deleted file mode 100644 index 5d957ed..0000000 --- a/src/conf/bo/xp_5 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/bwVar/topo_1 b/src/conf/bwVar/topo_1 deleted file mode 100644 index 0d1c632..0000000 --- a/src/conf/bwVar/topo_1 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/bwVar/topo_2 b/src/conf/bwVar/topo_2 deleted file mode 100644 index 982b88e..0000000 --- a/src/conf/bwVar/topo_2 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -#path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/bwVar/xp_1 b/src/conf/bwVar/xp_1 deleted file mode 100644 index 9dd063f..0000000 --- a/src/conf/bwVar/xp_1 +++ /dev/null @@ -1,13 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -changePv:yes -changePvAt:10,-L 600k -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:50000 50000 50000 diff --git a/src/conf/bwVar/xp_2 b/src/conf/bwVar/xp_2 deleted file mode 100644 index 9dd063f..0000000 --- a/src/conf/bwVar/xp_2 +++ /dev/null @@ -1,13 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -changePv:yes -changePvAt:10,-L 600k -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:50000 50000 50000 diff --git a/src/conf/bwvar2/topo_1 b/src/conf/bwvar2/topo_1 deleted file mode 100644 index 982b88e..0000000 --- a/src/conf/bwvar2/topo_1 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -#path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/bwvar2/topo_2 b/src/conf/bwvar2/topo_2 deleted file mode 100644 index 0d1c632..0000000 --- a/src/conf/bwvar2/topo_2 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/bwvar2/topo_3 b/src/conf/bwvar2/topo_3 deleted file mode 100644 index 0d1c632..0000000 --- a/src/conf/bwvar2/topo_3 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/bwvar2/xp_1 b/src/conf/bwvar2/xp_1 deleted file mode 100644 index 9dd063f..0000000 --- a/src/conf/bwvar2/xp_1 +++ /dev/null @@ -1,13 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -changePv:yes -changePvAt:10,-L 600k -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:50000 50000 50000 diff --git a/src/conf/bwvar2/xp_2 b/src/conf/bwvar2/xp_2 deleted file mode 100644 index 6a18224..0000000 --- a/src/conf/bwvar2/xp_2 +++ /dev/null @@ -1,13 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -changePv:yes -changePvAt:10,-L 600k -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:300000 300000 300000 diff --git a/src/conf/bwvar2/xp_3 b/src/conf/bwvar2/xp_3 deleted file mode 100644 index 9dd063f..0000000 --- a/src/conf/bwvar2/xp_3 +++ /dev/null @@ -1,13 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -changePv:yes -changePvAt:10,-L 600k -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:50000 50000 50000 diff --git a/src/conf/dd/topo_1 b/src/conf/dd/topo_1 deleted file mode 100644 index b9187d5..0000000 --- a/src/conf/dd/topo_1 +++ /dev/null @@ -1,8 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd/topo_2 b/src/conf/dd/topo_2 deleted file mode 100644 index 64073e7..0000000 --- a/src/conf/dd/topo_2 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:10,6,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd/topo_3 b/src/conf/dd/topo_3 deleted file mode 100644 index 21479e7..0000000 --- a/src/conf/dd/topo_3 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:20,12,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd/topo_4 b/src/conf/dd/topo_4 deleted file mode 100644 index 695649f..0000000 --- a/src/conf/dd/topo_4 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:50,30,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd/topo_5 b/src/conf/dd/topo_5 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/dd/topo_5 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd/topo_6 b/src/conf/dd/topo_6 deleted file mode 100644 index 4e0a5a4..0000000 --- a/src/conf/dd/topo_6 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:200,120,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd/topo_7 b/src/conf/dd/topo_7 deleted file mode 100644 index a66b163..0000000 --- a/src/conf/dd/topo_7 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:400,240,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd/xp_1 b/src/conf/dd/xp_1 deleted file mode 100644 index 5d957ed..0000000 --- a/src/conf/dd/xp_1 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd/xp_2 b/src/conf/dd/xp_2 deleted file mode 100644 index 5d957ed..0000000 --- a/src/conf/dd/xp_2 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd/xp_3 b/src/conf/dd/xp_3 deleted file mode 100644 index 5d957ed..0000000 --- a/src/conf/dd/xp_3 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd/xp_4 b/src/conf/dd/xp_4 deleted file mode 100644 index 5d957ed..0000000 --- a/src/conf/dd/xp_4 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd/xp_5 b/src/conf/dd/xp_5 deleted file mode 100644 index 5d957ed..0000000 --- a/src/conf/dd/xp_5 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd/xp_6 b/src/conf/dd/xp_6 deleted file mode 100644 index 5d957ed..0000000 --- a/src/conf/dd/xp_6 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd/xp_7 b/src/conf/dd/xp_7 deleted file mode 100644 index 5d957ed..0000000 --- a/src/conf/dd/xp_7 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd2/topo_1 b/src/conf/dd2/topo_1 deleted file mode 100644 index b9187d5..0000000 --- a/src/conf/dd2/topo_1 +++ /dev/null @@ -1,8 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd2/topo_2 b/src/conf/dd2/topo_2 deleted file mode 100644 index 64073e7..0000000 --- a/src/conf/dd2/topo_2 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:10,6,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd2/topo_3 b/src/conf/dd2/topo_3 deleted file mode 100644 index 21479e7..0000000 --- a/src/conf/dd2/topo_3 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:20,12,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd2/topo_4 b/src/conf/dd2/topo_4 deleted file mode 100644 index 695649f..0000000 --- a/src/conf/dd2/topo_4 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:50,30,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd2/topo_5 b/src/conf/dd2/topo_5 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/dd2/topo_5 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd2/topo_6 b/src/conf/dd2/topo_6 deleted file mode 100644 index 4e0a5a4..0000000 --- a/src/conf/dd2/topo_6 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:200,120,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd2/topo_7 b/src/conf/dd2/topo_7 deleted file mode 100644 index a66b163..0000000 --- a/src/conf/dd2/topo_7 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:400,240,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd2/topo_8 b/src/conf/dd2/topo_8 deleted file mode 100644 index 7dea5f2..0000000 --- a/src/conf/dd2/topo_8 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -#path_0:10,6,4 -path_1:200,120,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd2/topo_9 b/src/conf/dd2/topo_9 deleted file mode 100644 index d9fb550..0000000 --- a/src/conf/dd2/topo_9 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -#path_0:10,6,4 -path_1:400,240,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/dd2/xp_1 b/src/conf/dd2/xp_1 deleted file mode 100644 index 944aff8..0000000 --- a/src/conf/dd2/xp_1 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd2/xp_2 b/src/conf/dd2/xp_2 deleted file mode 100644 index 944aff8..0000000 --- a/src/conf/dd2/xp_2 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd2/xp_3 b/src/conf/dd2/xp_3 deleted file mode 100644 index 944aff8..0000000 --- a/src/conf/dd2/xp_3 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd2/xp_4 b/src/conf/dd2/xp_4 deleted file mode 100644 index 944aff8..0000000 --- a/src/conf/dd2/xp_4 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd2/xp_5 b/src/conf/dd2/xp_5 deleted file mode 100644 index 944aff8..0000000 --- a/src/conf/dd2/xp_5 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd2/xp_6 b/src/conf/dd2/xp_6 deleted file mode 100644 index 944aff8..0000000 --- a/src/conf/dd2/xp_6 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd2/xp_7 b/src/conf/dd2/xp_7 deleted file mode 100644 index 944aff8..0000000 --- a/src/conf/dd2/xp_7 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd2/xp_8 b/src/conf/dd2/xp_8 deleted file mode 100644 index 944aff8..0000000 --- a/src/conf/dd2/xp_8 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/dd2/xp_9 b/src/conf/dd2/xp_9 deleted file mode 100644 index 944aff8..0000000 --- a/src/conf/dd2/xp_9 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:180000 180000 180000 diff --git a/src/conf/epload/topo b/src/conf/epload/topo deleted file mode 100644 index 4daf266..0000000 --- a/src/conf/epload/topo +++ /dev/null @@ -1,10 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,10,4 -path_1:40,30,4 -topoType:MultiIf -#changeNetem:yes -#netem_{path_id}:at,cmd -#netemAt_0:5,delay 100ms limit 10 loss 10% -#netemAt_0:15,delay 10ms limit 10 -#netemAt_1:15,delay 100ms limit 10 diff --git a/src/conf/epload/xp b/src/conf/epload/xp deleted file mode 100644 index 5bf959e..0000000 --- a/src/conf/epload/xp +++ /dev/null @@ -1,9 +0,0 @@ -xpType:epload -ncClientPort_0:33400 -clientPcap:yes -ddCount:15000 -epload_test_dir:/home/mininet/epload/epload/emulator/localtests -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 diff --git a/src/conf/fullif/topo_1 b/src/conf/fullif/topo_1 deleted file mode 100644 index 003ff03..0000000 --- a/src/conf/fullif/topo_1 +++ /dev/null @@ -1,17 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,0.5 -path_1:10,20,0.5 -path_2:10,20,0.5 -path_3:10,20,0.5 -path_4:10,20,0.5 -path_5:10,20,0.5 -path_6:10,20,0.5 -path_7:10,20,0.5 -path_8:10,20,0.5 -path_9:10,20,0.5 -path_10:10,20,0.5 -path_11:10,20,0.5 -path_12:10,20,0.5 -path_13:10,20,0.5 -topoType:MultiIf diff --git a/src/conf/fullif/xp_1 b/src/conf/fullif/xp_1 deleted file mode 100644 index ad42e2a..0000000 --- a/src/conf/fullif/xp_1 +++ /dev/null @@ -1,9 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -kpmc:fullmesh -kpms:fullmesh -pvRateLimit:600k -ddCount:15000 -#rmem:300000 300000 300000 -rmem:1800000 1800000 1800000 diff --git a/src/conf/fullif/xp_2 b/src/conf/fullif/xp_2 deleted file mode 100644 index 5883bd8..0000000 --- a/src/conf/fullif/xp_2 +++ /dev/null @@ -1,10 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -kpmc:netlink -upmc:fullmesh -kpms:fullmesh -pvRateLimit:600k -ddCount:15000 -#rmem:300000 300000 300000 -rmem:1800000 1800000 1800000 diff --git a/src/conf/gg/topo_1 b/src/conf/gg/topo_1 deleted file mode 100644 index e322863..0000000 --- a/src/conf/gg/topo_1 +++ /dev/null @@ -1,11 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:10,6,4 -#path_1:200,120,4 -topoType:MultiIf -changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -netemAt_1:5,delay 10ms limit 6 loss 10% -#netemAt_1:5,delay 200ms limit 120 loss 10% diff --git a/src/conf/gg/xp_1 b/src/conf/gg/xp_1 deleted file mode 100644 index dc2675b..0000000 --- a/src/conf/gg/xp_1 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:3000000 3000000 3000000 diff --git a/src/conf/https/xp b/src/conf/https/xp deleted file mode 100644 index c09aff7..0000000 --- a/src/conf/https/xp +++ /dev/null @@ -1,5 +0,0 @@ -xpType:https -clientPcap:yes -kpms:fullmesh -kpmc:fullmesh -rmem:300000 300000 300000 diff --git a/src/conf/initCase/topo_1 b/src/conf/initCase/topo_1 deleted file mode 100644 index 982b88e..0000000 --- a/src/conf/initCase/topo_1 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -#path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/initCase/topo_2 b/src/conf/initCase/topo_2 deleted file mode 100644 index 9c65270..0000000 --- a/src/conf/initCase/topo_2 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -path_1:100,600,4 -topoType:MultiIf diff --git a/src/conf/initCase/xp_1 b/src/conf/initCase/xp_1 deleted file mode 100644 index cfaf008..0000000 --- a/src/conf/initCase/xp_1 +++ /dev/null @@ -1,6 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -rmem:300000 300000 300000 diff --git a/src/conf/initCase/xp_2 b/src/conf/initCase/xp_2 deleted file mode 100644 index 57d4cf8..0000000 --- a/src/conf/initCase/xp_2 +++ /dev/null @@ -1,7 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#rmem:300000 300000 300000 -rmem:1800000 1800000 1800000 diff --git a/src/conf/lq/topo_1 b/src/conf/lq/topo_1 deleted file mode 100644 index 8aba5ad..0000000 --- a/src/conf/lq/topo_1 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,2000,4 -path_1:15,2000,4 -topoType:MultiIf diff --git a/src/conf/lq/topo_2 b/src/conf/lq/topo_2 deleted file mode 100644 index 8aba5ad..0000000 --- a/src/conf/lq/topo_2 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,2000,4 -path_1:15,2000,4 -topoType:MultiIf diff --git a/src/conf/lq/topo_3 b/src/conf/lq/topo_3 deleted file mode 100644 index 8aba5ad..0000000 --- a/src/conf/lq/topo_3 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,2000,4 -path_1:15,2000,4 -topoType:MultiIf diff --git a/src/conf/lq/topo_4 b/src/conf/lq/topo_4 deleted file mode 100644 index 8aba5ad..0000000 --- a/src/conf/lq/topo_4 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,2000,4 -path_1:15,2000,4 -topoType:MultiIf diff --git a/src/conf/lq/xp_1 b/src/conf/lq/xp_1 deleted file mode 100644 index e963eea..0000000 --- a/src/conf/lq/xp_1 +++ /dev/null @@ -1,7 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#rmem:300000 300000 300000 -rmem:8000000 8000000 8000000 diff --git a/src/conf/lq/xp_2 b/src/conf/lq/xp_2 deleted file mode 100644 index 20d8e59..0000000 --- a/src/conf/lq/xp_2 +++ /dev/null @@ -1,8 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -sched:roundrobin -#rmem:300000 300000 300000 -rmem:8000000 8000000 8000000 diff --git a/src/conf/lq/xp_3 b/src/conf/lq/xp_3 deleted file mode 100644 index 9dcb30e..0000000 --- a/src/conf/lq/xp_3 +++ /dev/null @@ -1,7 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:45000 -#rmem:300000 300000 300000 -rmem:8000000 8000000 8000000 diff --git a/src/conf/lq/xp_4 b/src/conf/lq/xp_4 deleted file mode 100644 index e963eea..0000000 --- a/src/conf/lq/xp_4 +++ /dev/null @@ -1,7 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#rmem:300000 300000 300000 -rmem:8000000 8000000 8000000 diff --git a/src/conf/nc/topo_1 b/src/conf/nc/topo_1 deleted file mode 100644 index 0d1c632..0000000 --- a/src/conf/nc/topo_1 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/nc/xp_1 b/src/conf/nc/xp_1 deleted file mode 100644 index eefa83b..0000000 --- a/src/conf/nc/xp_1 +++ /dev/null @@ -1,7 +0,0 @@ -xpType:nc -ncClientPort_0:33400 -clientPcap:yes -ddCount:15000 -kpms:fullmesh -kpmc:fullmesh -rmem:300000 300000 300000 diff --git a/src/conf/rbuff/topo_1 b/src/conf/rbuff/topo_1 deleted file mode 100644 index ba43fa1..0000000 --- a/src/conf/rbuff/topo_1 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -#path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/rbuff/topo_2 b/src/conf/rbuff/topo_2 deleted file mode 100644 index 0d1c632..0000000 --- a/src/conf/rbuff/topo_2 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/rbuff/topo_3 b/src/conf/rbuff/topo_3 deleted file mode 100644 index 75540b1..0000000 --- a/src/conf/rbuff/topo_3 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/rbuff/xp_1 b/src/conf/rbuff/xp_1 deleted file mode 100644 index 2418ae1..0000000 --- a/src/conf/rbuff/xp_1 +++ /dev/null @@ -1,6 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -rmem:50000 50000 50000 diff --git a/src/conf/rbuff/xp_2 b/src/conf/rbuff/xp_2 deleted file mode 100644 index 2418ae1..0000000 --- a/src/conf/rbuff/xp_2 +++ /dev/null @@ -1,6 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -rmem:50000 50000 50000 diff --git a/src/conf/rbuff/xp_3 b/src/conf/rbuff/xp_3 deleted file mode 100644 index 2418ae1..0000000 --- a/src/conf/rbuff/xp_3 +++ /dev/null @@ -1,6 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -rmem:50000 50000 50000 diff --git a/src/conf/rmem/topo_0 b/src/conf/rmem/topo_0 deleted file mode 100644 index c8b0b91..0000000 --- a/src/conf/rmem/topo_0 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -#path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_00 b/src/conf/rmem/topo_00 deleted file mode 100644 index c8b0b91..0000000 --- a/src/conf/rmem/topo_00 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -#path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_1 b/src/conf/rmem/topo_1 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/rmem/topo_1 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_10 b/src/conf/rmem/topo_10 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/rmem/topo_10 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_11 b/src/conf/rmem/topo_11 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/rmem/topo_11 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_2 b/src/conf/rmem/topo_2 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/rmem/topo_2 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_3 b/src/conf/rmem/topo_3 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/rmem/topo_3 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_4 b/src/conf/rmem/topo_4 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/rmem/topo_4 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_5 b/src/conf/rmem/topo_5 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/rmem/topo_5 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_6 b/src/conf/rmem/topo_6 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/rmem/topo_6 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_7 b/src/conf/rmem/topo_7 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/rmem/topo_7 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_8 b/src/conf/rmem/topo_8 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/rmem/topo_8 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/topo_9 b/src/conf/rmem/topo_9 deleted file mode 100644 index c33648a..0000000 --- a/src/conf/rmem/topo_9 +++ /dev/null @@ -1,9 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,6,4 -path_1:100,60,4 -topoType:MultiIf -#changeNetem:yes -#netemAt_0:0,delay 100ms limit 70 loss 0.1% -#netemAt_1:0,delay 200ms limit 10 -#netemAt_1:5,delay 100ms limit 70 diff --git a/src/conf/rmem/xp_0 b/src/conf/rmem/xp_0 deleted file mode 100644 index 07ceb77..0000000 --- a/src/conf/rmem/xp_0 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:50000 50000 50000 diff --git a/src/conf/rmem/xp_00 b/src/conf/rmem/xp_00 deleted file mode 100644 index 0c07d55..0000000 --- a/src/conf/rmem/xp_00 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:25000 25000 25000 diff --git a/src/conf/rmem/xp_1 b/src/conf/rmem/xp_1 deleted file mode 100644 index 9f5a8fc..0000000 --- a/src/conf/rmem/xp_1 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:300000 300000 300000 diff --git a/src/conf/rmem/xp_10 b/src/conf/rmem/xp_10 deleted file mode 100644 index 0bd7cc0..0000000 --- a/src/conf/rmem/xp_10 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:75000 75000 75000 diff --git a/src/conf/rmem/xp_11 b/src/conf/rmem/xp_11 deleted file mode 100644 index 07ceb77..0000000 --- a/src/conf/rmem/xp_11 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:50000 50000 50000 diff --git a/src/conf/rmem/xp_2 b/src/conf/rmem/xp_2 deleted file mode 100644 index edc205c..0000000 --- a/src/conf/rmem/xp_2 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:275000 275000 275000 diff --git a/src/conf/rmem/xp_3 b/src/conf/rmem/xp_3 deleted file mode 100644 index 4c6b80b..0000000 --- a/src/conf/rmem/xp_3 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:252000 252000 252000 diff --git a/src/conf/rmem/xp_4 b/src/conf/rmem/xp_4 deleted file mode 100644 index c8bf365..0000000 --- a/src/conf/rmem/xp_4 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:225000 225000 225000 diff --git a/src/conf/rmem/xp_5 b/src/conf/rmem/xp_5 deleted file mode 100644 index 0f8e144..0000000 --- a/src/conf/rmem/xp_5 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:200000 200000 200000 diff --git a/src/conf/rmem/xp_6 b/src/conf/rmem/xp_6 deleted file mode 100644 index c3822b8..0000000 --- a/src/conf/rmem/xp_6 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:175000 175000 175000 diff --git a/src/conf/rmem/xp_7 b/src/conf/rmem/xp_7 deleted file mode 100644 index 1e49871..0000000 --- a/src/conf/rmem/xp_7 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:150000 150000 150000 diff --git a/src/conf/rmem/xp_8 b/src/conf/rmem/xp_8 deleted file mode 100644 index 5c6798c..0000000 --- a/src/conf/rmem/xp_8 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:125000 125000 125000 diff --git a/src/conf/rmem/xp_9 b/src/conf/rmem/xp_9 deleted file mode 100644 index 72b4e8f..0000000 --- a/src/conf/rmem/xp_9 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -#sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 -#rmem:8388608 8388608 8388608 -rmem:100000 100000 100000 diff --git a/src/conf/rt/topo_1 b/src/conf/rt/topo_1 deleted file mode 100644 index aa9a895..0000000 --- a/src/conf/rt/topo_1 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -path_1:20,40,4 -topoType:MultiIf diff --git a/src/conf/rt/topo_2 b/src/conf/rt/topo_2 deleted file mode 100644 index 45bc33b..0000000 --- a/src/conf/rt/topo_2 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,8 -path_1:20,40,4 -topoType:MultiIf diff --git a/src/conf/rt/xp_1 b/src/conf/rt/xp_1 deleted file mode 100644 index ccb8f43..0000000 --- a/src/conf/rt/xp_1 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:nc -ncClientPort_0:33400 -clientPcap:yes -ddCount:15000 -kpm:fullmesh -kpms:netlink -kpmc:netlink -upmc:fullmeshIfNeededClient -upms:fullmeshIfNeededServer -upms_args: -S 15360000 -L 27 -C 4 -rmem:300000 300000 300000 diff --git a/src/conf/rt/xp_2 b/src/conf/rt/xp_2 deleted file mode 100644 index ccb8f43..0000000 --- a/src/conf/rt/xp_2 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:nc -ncClientPort_0:33400 -clientPcap:yes -ddCount:15000 -kpm:fullmesh -kpms:netlink -kpmc:netlink -upmc:fullmeshIfNeededClient -upms:fullmeshIfNeededServer -upms_args: -S 15360000 -L 27 -C 4 -rmem:300000 300000 300000 diff --git a/src/conf/sendfile/topo b/src/conf/sendfile/topo deleted file mode 100644 index a789977..0000000 --- a/src/conf/sendfile/topo +++ /dev/null @@ -1,8 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,30,10 -path_1:40,40,16 -changeNetem:yes -netemAt_0:2,delay 10ms limit 30 loss 20% -netemAt_0:5,delay 10ms limit 30 -topoType:MultiIf diff --git a/src/conf/sendfile/xp b/src/conf/sendfile/xp deleted file mode 100644 index 93223fa..0000000 --- a/src/conf/sendfile/xp +++ /dev/null @@ -1,6 +0,0 @@ -xpType:sendfile -clientPcap:yes -kpms:fullmesh -kpmc:fullmesh -sched:metric -rmem:300000 300000 300000 diff --git a/src/conf/t/topo_1 b/src/conf/t/topo_1 deleted file mode 100644 index 7d65e36..0000000 --- a/src/conf/t/topo_1 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,8 -path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/t/topo_2 b/src/conf/t/topo_2 deleted file mode 100644 index aa9a895..0000000 --- a/src/conf/t/topo_2 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -path_1:20,40,4 -topoType:MultiIf diff --git a/src/conf/t/xp_1 b/src/conf/t/xp_1 deleted file mode 100644 index d82fa7a..0000000 --- a/src/conf/t/xp_1 +++ /dev/null @@ -1,10 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:10000 -kpm:fullmesh -kpms:fullmesh -kpmc:netlink -upmc:fullmeshIfNeeded -rmem:300000 300000 300000 diff --git a/src/conf/t/xp_2 b/src/conf/t/xp_2 deleted file mode 100644 index d82fa7a..0000000 --- a/src/conf/t/xp_2 +++ /dev/null @@ -1,10 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:10000 -kpm:fullmesh -kpms:fullmesh -kpmc:netlink -upmc:fullmeshIfNeeded -rmem:300000 300000 300000 diff --git a/src/conf/t2/topo_1 b/src/conf/t2/topo_1 deleted file mode 100644 index 7d65e36..0000000 --- a/src/conf/t2/topo_1 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,8 -path_1:100,60,4 -topoType:MultiIf diff --git a/src/conf/t2/topo_2 b/src/conf/t2/topo_2 deleted file mode 100644 index aa9a895..0000000 --- a/src/conf/t2/topo_2 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -path_1:20,40,4 -topoType:MultiIf diff --git a/src/conf/t2/xp_1 b/src/conf/t2/xp_1 deleted file mode 100644 index ee005cf..0000000 --- a/src/conf/t2/xp_1 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -kpm:fullmesh -kpms:fullmesh -kpmc:netlink -upmc:fullmeshIfNeeded -upmc_args: -S 15360000 -L 27 -C 4 -rmem:300000 300000 300000 diff --git a/src/conf/t2/xp_2 b/src/conf/t2/xp_2 deleted file mode 100644 index ee005cf..0000000 --- a/src/conf/t2/xp_2 +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:15000 -kpm:fullmesh -kpms:fullmesh -kpmc:netlink -upmc:fullmeshIfNeeded -upmc_args: -S 15360000 -L 27 -C 4 -rmem:300000 300000 300000 diff --git a/src/conf/topo/0_para_2 b/src/conf/topo/0_para_2 deleted file mode 100644 index b7d475e..0000000 --- a/src/conf/topo/0_para_2 +++ /dev/null @@ -1,13 +0,0 @@ -desc:Simple configuration with two para link -leftSubnet:10.0. -rightSubnet:10.1. -midSubnet:zzz -#path_x:delay,queueSize(may be calc),bw -error -path_0:10,15,5 -path_1:40,10,5 -topoType:MultiIf -changeNetem:yes -#netem_{path_id}:at,cmd -netemAt_0:2,delay 100ms limit 15 -netemAt_0:5,delay 2ms limit 15 loss 10% diff --git a/src/conf/topo/1_para_3 b/src/conf/topo/1_para_3 deleted file mode 100644 index 8927f90..0000000 --- a/src/conf/topo/1_para_3 +++ /dev/null @@ -1,10 +0,0 @@ -desc:Simple configuration with two para link -leftSubnet:5.5. -rightSubnet:6.6. -midSubnet:zzz -#path_x:delay,queueSize(may be calc),bw -error -path_0:10,15,5 -path_1:40,10,5 -path_2:40,10,5 -topoType:MultiIf diff --git a/src/conf/topo/2_ecmp_1 b/src/conf/topo/2_ecmp_1 deleted file mode 100644 index f6e5150..0000000 --- a/src/conf/topo/2_ecmp_1 +++ /dev/null @@ -1,11 +0,0 @@ -desc:Simple configuration with two para link -leftSubnet:5.5. -rightSubnet:6.6. -midSubnet:zzz -#path_x:delay,queueSize(may be calc),bw -error -path_0:10,15,5 -path_1:20,10,5 -path_2:30,10,5 -path_3:40,10,5 -topoType:ECMPLike diff --git a/src/conf/topo/3_ecmp_2 b/src/conf/topo/3_ecmp_2 deleted file mode 100644 index ca2b504..0000000 --- a/src/conf/topo/3_ecmp_2 +++ /dev/null @@ -1,15 +0,0 @@ -desc:Simple configuration with two para link -leftSubnet:5.5. -rightSubnet:6.6. -midSubnet:zzz -#path_x:delay,queueSize(may be calc),bw -error -path_0:10,10,5 -path_1:100,20,5 -topoType:ECMPLike -# change tc during an experiment -changeNetem:yes -#netem_{path_id}:at,cmd -netemAt_0:2,delay 100ms -netemAt_0:5,delay 2ms - diff --git a/src/conf/topo/simple_para b/src/conf/topo/simple_para deleted file mode 100644 index 06cece4..0000000 --- a/src/conf/topo/simple_para +++ /dev/null @@ -1,9 +0,0 @@ -desc:Simple configuration with two para link -topoType:MultiIf -leftSubnet:10.0. -rightSubnet:10.1. -#path_x:delay,queueSize(may be calc),bw -path_0:10,10,5 -path_1:40,40,5 -path_2:30,30,2 -path_3:20,20,1 diff --git a/src/conf/topo/xp0/t0 b/src/conf/topo/xp0/t0 deleted file mode 100644 index cf33a12..0000000 --- a/src/conf/topo/xp0/t0 +++ /dev/null @@ -1,9 +0,0 @@ -desc:Simple configuration with two para link -leftSubnet:5.5. -rightSubnet:6.6. -midSubnet:zzz -#path_x:delay,queueSize(may be calc),bw -error -path_0:10,5,3.2 -path_1:100,5,4.0 -topoType:MultiIf diff --git a/src/conf/topo/xp0/t1 b/src/conf/topo/xp0/t1 deleted file mode 100644 index f39007d..0000000 --- a/src/conf/topo/xp0/t1 +++ /dev/null @@ -1,9 +0,0 @@ -desc:Simple configuration with two para link -leftSubnet:5.5. -rightSubnet:6.6. -midSubnet:zzz -#path_x:delay,queueSize(may be calc),bw -error -path_0:10,5,3.2 -#path_1:100,5,4.0 -topoType:MultiIf diff --git a/src/conf/topo/xp0/t2 b/src/conf/topo/xp0/t2 deleted file mode 100644 index 401133e..0000000 --- a/src/conf/topo/xp0/t2 +++ /dev/null @@ -1,9 +0,0 @@ -desc:Simple configuration with two para link -leftSubnet:5.5. -rightSubnet:6.6. -midSubnet:zzz -#path_x:delay,queueSize(may be calc),bw -error -#path_0:10,5,3.2 -path_1:100,5,4.0 -topoType:MultiIf diff --git a/src/conf/tt/topo_1 b/src/conf/tt/topo_1 deleted file mode 100644 index aa9a895..0000000 --- a/src/conf/tt/topo_1 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,4 -path_1:20,40,4 -topoType:MultiIf diff --git a/src/conf/tt/topo_2 b/src/conf/tt/topo_2 deleted file mode 100644 index 2ab0551..0000000 --- a/src/conf/tt/topo_2 +++ /dev/null @@ -1,5 +0,0 @@ -leftSubnet:10.0. -rightSubnet:10.1. -path_0:10,20,5.5 -path_1:20,40,4 -topoType:MultiIf diff --git a/src/conf/tt/xp_1 b/src/conf/tt/xp_1 deleted file mode 100644 index 9a9a887..0000000 --- a/src/conf/tt/xp_1 +++ /dev/null @@ -1,12 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -#max push ! -pvRateLimit:0 -ddCount:15000 -kpm:fullmesh -kpms:fullmesh -kpmc:netlink -upmc:fullmeshIfNeeded -upmc_args: -S 15360000 -L 25 -C 4 -rmem:300000 300000 300000 diff --git a/src/conf/tt/xp_2 b/src/conf/tt/xp_2 deleted file mode 100644 index 9a9a887..0000000 --- a/src/conf/tt/xp_2 +++ /dev/null @@ -1,12 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -#max push ! -pvRateLimit:0 -ddCount:15000 -kpm:fullmesh -kpms:fullmesh -kpmc:netlink -upmc:fullmeshIfNeeded -upmc_args: -S 15360000 -L 25 -C 4 -rmem:300000 300000 300000 diff --git a/src/conf/vlc/topo b/src/conf/vlc/topo deleted file mode 100644 index 9897e71..0000000 --- a/src/conf/vlc/topo +++ /dev/null @@ -1,11 +0,0 @@ -desc:Simple configuration with two para link -leftSubnet:10.0. -rightSubnet:10.1. -#path_x:delay,queueSize(may be calc),bw -path_0:10,20,2 -path_1:40,5,1,True -topoType:MultiIf -changeNetem:yes -#netem_{path_id}:at,cmd -netemAt_0:10,delay 10ms limit 1 -#netemAt_0:5,delay 2ms limit 15 loss 10% diff --git a/src/conf/vlc/xp b/src/conf/vlc/xp deleted file mode 100644 index c5d84b8..0000000 --- a/src/conf/vlc/xp +++ /dev/null @@ -1,6 +0,0 @@ -xpType:vlc -clientPcap:yes -kpms:fullmesh -kpmc:fullmesh -vlctime:20 -sched:metric diff --git a/src/conf/xp/0_iperf_1 b/src/conf/xp/0_iperf_1 deleted file mode 100644 index 291e197..0000000 --- a/src/conf/xp/0_iperf_1 +++ /dev/null @@ -1,9 +0,0 @@ -#option to dvlp are commented but already there. -#kCommit:aaaa -#pmCommit:bbb -#sysctl:mem,x y z -#sysctl:rmem,x y z -#sysctl:wmem,x y z -xpType:iperf -size:10M - diff --git a/src/conf/xp/1_ping b/src/conf/xp/1_ping deleted file mode 100644 index 79a7eb9..0000000 --- a/src/conf/xp/1_ping +++ /dev/null @@ -1,3 +0,0 @@ -xpType:ping -pingCount:16 -rmem:87380 87380 87380 diff --git a/src/conf/xp/2_ncpv b/src/conf/xp/2_ncpv deleted file mode 100644 index 9eab628..0000000 --- a/src/conf/xp/2_ncpv +++ /dev/null @@ -1,5 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -ncClientPort_1:33401 -ncClientPort_2:33402 -ncClientPort_3:33403 diff --git a/src/conf/xp/3_ncpv b/src/conf/xp/3_ncpv deleted file mode 100644 index ad4951f..0000000 --- a/src/conf/xp/3_ncpv +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -ddCount:100 -clientPcap:yes -ddCount:15000 -pvRateLimit:100k -changePv:yes -changePvAt:5,-L 200k -changePvAt:10,-L 100k -changePvAt:15,-L 600k -#sched:roundrobin diff --git a/src/conf/xp/4_nc b/src/conf/xp/4_nc deleted file mode 100644 index f2cffd1..0000000 --- a/src/conf/xp/4_nc +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -rmem:300000 300000 300000 -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:10000 -kpm:fullmesh -kpms:netlink -kpmc:netlink -upmc:fullmesh -#upmc_args: -n 5 diff --git a/src/conf/xp/xp0/pv b/src/conf/xp/xp0/pv deleted file mode 100644 index 78f24bd..0000000 --- a/src/conf/xp/xp0/pv +++ /dev/null @@ -1,7 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -rmem:300000 300000 300000 diff --git a/src/conf/xp1/pv b/src/conf/xp1/pv deleted file mode 100644 index 3da1f80..0000000 --- a/src/conf/xp1/pv +++ /dev/null @@ -1,9 +0,0 @@ -xpType:ncpv -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:400k -ddCount:15000 -sched:roundrobin -#rmem:87380 87380 87380 -#rmem:150000 150000 150000 -#rmem:300000 300000 300000 diff --git a/src/conf/xp1/topo b/src/conf/xp1/topo deleted file mode 100644 index 11def67..0000000 --- a/src/conf/xp1/topo +++ /dev/null @@ -1,14 +0,0 @@ -desc:Simple configuration with two para link -leftSubnet:10.0. -rightSubnet:10.1. -midSubnet:zzz -#path_x:delay,queueSize(may be calc),bw -error -path_0:10,10,4 -path_1:40,30,4 -topoType:MultiIf -changeNetem:yes -#netem_{path_id}:at,cmd -netemAt_0:5,delay 100ms limit 10 loss 10% -netemAt_0:15,delay 10ms limit 10 -#netemAt_1:15,delay 100ms limit 10 diff --git a/src/mpBurstBlocks.py b/src/mpBurstBlocks.py deleted file mode 100644 index 11a4e7f..0000000 --- a/src/mpBurstBlocks.py +++ /dev/null @@ -1,194 +0,0 @@ -import numpy as np -import os as os -import matplotlib.pyplot as plt - -class BurstBlocksAggregator: - def __init__(self, yml, test_name, dest_dir): - # csv_file="c2s_seq_1.csv" - # minimum delay to observe to identify the beginning of a block - self.min_block_sep = 0.3 - self.headers = [ "ts", "map_begin", "subflow", "is_seq", "map_end", "is_reinject" ] - self.log = open(dest_dir+"/burst_block_aggregator.log","w") - self.csv_file=dest_dir+"/"+"c2s_seq_1.csv" - self.a = np.genfromtxt (self.csv_file, delimiter=",") - self.blocks=[] - self.times=[] - self.packets_per_flow=[] - self.flows_ratios = [] - self.subflows=[] - self.flows_ratios=[] - self.extract_blocks() - self.extract_times() - self.extract_flows_packets() - self.extract_flows_ratios() - - def c(self,column): - """Return column index corresponding to name passed as argument""" - return self.headers.index(column) -# def extract_blocks(self): -# # beginning of block. First block starts at packet 0 -# b=0 -# # iteration, we can start at packet 1 -# i=1 -# previous=0 -# while i>self.log, "previous seq packet:", "{:10.8f}".format(self.a[previous][self.c("ts")]), "seq:", self.a[previous][self.c("map_begin")] -# print >>self.log, "found block starting at ", "{:10.8f}".format(self.a[i][self.c("ts")]), "seq:", self.a[i][self.c("map_begin")] -# # we know the start of the block and look for its last packet -# elif self.a[i][self.c("ts")]-self.a[previous][self.c("ts")]>self.min_block_sep: -# print >>self.log, "next block:", "{:10.8f}".format(self.a[i+1][self.c("ts")]), "seq:", self.a[i+1][self.c("map_begin")] -# print >>self.log,"--------------------------------------" -# # the ranges we use here are inclusive, ie the range contains both elements. -# self.blocks.append((b,previous)) -# b=i -# # keep track of previous seq packet -# previous=i -# i=i+1 -# self.blocks.append((b,previous)) -# print >>self.log, "# blocks: ", len(self.blocks) -# detect blocks based on number of bytes sent - -#!!!!!!!!!!!!!!!!!!!!!!!!!!! -# buggy code !!!!!!!!!!!!!!! -#!!!!!!!!!!!!!!!!!!!!!!!!!!! - def extract_blocks(self): - # beginning of block. First block starts at packet 0 - b=0 - # iteration, we can start at packet 1 - i=1 - previous_mod=0 - first_seq=self.a[i][self.c("map_begin")] - previous_seq=None - while iself.a[previous_seq][self.c("map_begin")]: - print >>self.log, "found block beginning at ", "{:10.8f}".format(self.a[i][self.c("ts")]), "end seq:", self.a[i][self.c("map_end")] - print >>self.log,"--------------------------------------" - self.blocks.append((b,previous_seq)) - b = i - # keep track of previous seq packet - #print >>self.log, "recording previous seq at time ", "{:10.8f}".format(self.a[i][self.c("ts")]), "and end_seq:", self.a[i][self.c("map_end")] - if self.a[i][self.c("map_begin")]>self.a[previous_seq][self.c("map_begin")]: - previous_mod=(self.a[i][self.c("map_end")]-self.a[0][self.c("map_begin")])%65536 - previous_seq=i - i=i+1 - print "last block previous_seq = " + str(previous_seq) - print >>self.log, "Rcording last block end at time ", "{:10.8f}".format(self.a[previous_seq][self.c("ts")]), "and end_seq:", self.a[previous_seq][self.c("map_end")] - self.blocks.append((b,previous_seq)) - print self.blocks - print >>self.log, "# blocks: ", len(self.blocks) - def extract_times(self): - for i in range(len(self.blocks)): - print >>self.log, "Block " + str(i) - print >>self.log, "---------------------" - first,last = self.blocks[i] - print >>self.log, "first packet[" + str(first) +"] at:", "{:10.6f}".format(self.a[first][self.c("ts")]), "seq:", self.a[first][self.c("map_begin")] - print >>self.log, "last packet [" + str(last) +"] at :", "{:10.6f}".format(self.a[last][self.c("ts")]), "seq:", self.a[last][self.c("map_begin")] - t1 = self.a[first][self.c("ts")] - # +1 because our ranges are inclusive - packets = self.a[first:last+1] - biggest_seq_index=self.find_biggest_seq_in_block(packets) - biggest_seq = packets[biggest_seq_index][self.c("map_end")] - print >>self.log, "biggest_seq = " + str(biggest_seq) - ack_index, ack_packet=self.find_ack_for_seq(biggest_seq, biggest_seq_index) - print >>self.log, "ack time = " + "{:10.6f}".format(self.a[ack_index][self.c("ts")]) - print >>self.log, "ack index = " + str(ack_index) - print >>self.log, "block time = " + "{:10.6f}".format(ack_packet[self.c("ts")] - packets[0][self.c("ts")]) - self.times.append([first, ack_index, ack_packet[self.c("ts")] - packets[0][self.c("ts")] , packets[0][self.c("ts")], ack_packet[self.c("ts")] ]) - print >>self.log, "############################" - print >>self.log, "---------------------------------------------" - print >>self.log, "block times = " + str(self.times) - self.times = np.array(self.times) - np.set_printoptions(precision=6) - block_times= self.times[:,2] - self.block_times=block_times - # this was to drop the smallest and biggest values from the mean - # block_times.sort() - # self.block_times=block_times[1:-2] - def extract_flows_packets(self): - for i in range(len(self.blocks)): - # will hold number of packets per flow for this block - r={} - print >>self.log, "Block " + str(i) - print >>self.log, "---------------------" - first,last = self.blocks[i] - # +1 because our ranges are inclusive - packets = self.a[first:last+1] - for p in packets: - if p[self.c("is_seq")]==0: - continue - flow = int(p[self.c("subflow")]) - if flow in r.keys(): - r[flow]+=1 - else: - r[flow]=1 - self.packets_per_flow.append(r) - print >>self.log, r - print >>self.log, "############################" - print >>self.log, "---------------------------------------------" - # now set values to 0 as needed for block that didn't send on some subflows - sublist = [ h.keys() for h in self.packets_per_flow] - all_subflows = list( set ( [item for sublist in self.packets_per_flow for item in sublist] )) - self.subflows= all_subflows - for h in self.packets_per_flow: - for f in all_subflows: - if not f in h.keys(): - h[f]=0 - - def extract_flows_ratios(self): - # reset value - self.flows_ratios = [] - # for each block compute the ratio - for count in self.packets_per_flow: - total_packets = sum(count.values()) - h = {} - for s in self.subflows: - h[s]=count[s]/float(total_packets) - self.flows_ratios.append(h) - - - def find_ack_for_seq(self, seq, start_index): - i=start_index - while iseq: - return (i,self.a[i]) - i=i+1 - print "Did not find ack for:" - print "seq : " + str(seq) - return None - - def find_biggest_seq_in_block(self, packets): - biggest_seq=-1 - j=0 - while jpackets[biggest_seq][self.c("map_begin")]: - biggest_seq=j - j=j+1 - print >>self.log, "biggest seq in block: " + str(packets[biggest_seq][self.c("map_end")]) - return biggest_seq - - def __del__(self): - self.log.close() - - def __str__(self): - s = str(self.block_times) + "\nmean:\t" + str(self.block_times.mean()) +"\nstd:\t"+ str(self.block_times.std()) - s+= "\nPackets per flow:\n" - s += str(self.packets_per_flow) - s+= "\nRatio of packets per flow:\n" - s += str(self.flows_ratios) - return s - def plot(self): - ratio1 = plt.plot([ h[1] for h in self.flows_ratios ] , label = "flow 1 ratio") - ratio2 = plt.plot([ h[2] for h in self.flows_ratios ] , label = "flow 2 ratio") - times = plt.plot(self.block_times, label = 'block time' ) - plt.legend(["ratio1", "ratio2", "times"]) - plt.show() diff --git a/src/mpIterator.py b/src/mpIterator.py deleted file mode 100755 index e922225..0000000 --- a/src/mpIterator.py +++ /dev/null @@ -1,149 +0,0 @@ -#!/usr/bin/python - -# apt-get install python-configglue - -import sys, getopt -from mpXpRunner import MpXpRunner -from mpTopo import MpTopo - -from shutil import copy -import os -from subprocess import call - -import datetime -# currently all checkers and validations and defined in this file -from mpValidations import * -from mpBurstBlocks import * -from mpRefreshSetCsv import * - -from yaml import load, dump - -from optparse import OptionParser - - -# Define supported options -parser = OptionParser() -parser.add_option("-t", "--tests", dest="tests_dir", - help="Directory holding tests", metavar="TESTSDIR" , default="./tests") -parser.add_option("-l", "--logs", dest="logs_dir", - help="Directory where to log", metavar="LOGSDIR" , default="./logs") -parser.add_option("-r", "--repeat", dest="repeat", - help="Reuse existing logs", metavar="REPEAT" , default="") -parser.add_option("-c", "--clean-pcap", dest="clean", action="store_true", - help="Delete pcap from logs directory", metavar="CLEAN" , default="false") - -(options, args) = parser.parse_args() - -# initialise flags values -tests_dir=options.tests_dir.rstrip("/") -logs_dir=options.logs_dir.rstrip("/") -repeat = options.repeat -clean = options.clean - -# take timestamp, used as subdirectory in logs_dir -timestamp=datetime.datetime.now().isoformat() - -if repeat!="": - timestamp=repeat -#timestamp = "2015-05-26T15:42:45.419949" - -for test_name in [name for name in os.listdir(tests_dir) if os.path.isdir(os.path.join(tests_dir, name))]: - # initialise files defining the experience and test - test_dir = tests_dir + "/" + test_name - xpFile = test_dir+"/xp" - topoFile = test_dir+"/topo" - validation_file=test_dir+"/validation.yml" - destDir=logs_dir+"/"+timestamp+"/"+test_name - if not os.path.exists(destDir): - os.makedirs(destDir) - - print "Running " + test_dir - # run the experience - if not repeat: - MpXpRunner(MpTopo.mininetBuilder, topoFile, xpFile) - - #copy xp, topo and validation to log - copy(topoFile,destDir) - copy(xpFile,destDir) - copy(validation_file,destDir) - #copy log files - for l in ["client.pcap" ,"command.log" ,"upmc.log" ,"upms.log" ,"netcat_server_0.log" ,"netcat_client_0.log"]: - copy(l,destDir+"/") - - # Run validations - with open(validation_file, 'r') as f: - validations = load(f) - if validations!=None: - if "checkers" in validations and validations["checkers"]!=None: - for k in validations["checkers"]: - # Identify checker class - name = k.title().replace("_","")+"Checker" - klass= globals()[name] - # instantiate checker with validations and test_name - checker = klass(validations["checkers"], test_name, destDir) - if checker.check(): - print checker.logs - else: - print checker.logs - if "aggregators" in validations and validations["aggregators"]!=None: - for k in validations["aggregators"]: - # Identify checker class - name = k.title().replace("_","")+"Aggregator" - klass= globals()[name] - # instantiate checker with validations and test_name - agg = klass(validations, test_name, destDir) - print agg - if clean: - os.remove(destDir+"/client.pcap") - - - - - - -#tcptrace_checker = TcptraceChecker(validations, t ) -#print "WILL VALIDATE" -#tcptrace_checker.check() - -#for v in validations["tcptrace"]: -# print dump(v) - -# /usr/local/bin/mptcptrace -f /tmp/dest/client.pcap -G20 -F3 -r7 -s -S -a - - - -# Here are functions that can be used to generate topo and xp files: -#def write_entry(f, key, val): -# f.write("{}:{}\n".format(key,val)) -# -#def generateTopo(): -# path="/tmp/topo" -# f=open(path,"w") -# # delay, queueSize (in packets), bw -# write_entry(f, "path_0", "10,15,5") -# write_entry(f, "path_1", "10,15,5") -# write_entry(f, "topoType", "MultiIf") -# f.close() -# return path -# -#def generateXp(): -# path="/tmp/xp" -# f=open(path,"w") -# write_entry(f, "xpType", "nc") -# write_entry(f, "kpm", "fullmesh") -# write_entry(f, "kpms", "netlink") -# write_entry(f, "kpmc", "netlink") -# write_entry(f, "upmc", "fullmesh") -## write_entry(f, "upmc_args", "-t 600000 -i 500 -c 7800") -# write_entry(f, "ddCount", "10000") -# write_entry(f, "clientPcap", "yes") -# write_entry(f, "ncClientPort_0", "0:33400") -# write_entry(f, "rmem","300000 300000 300000") -# f.close() -# return path - -#topoFile=generateTopo() -#print(topoFile) -#xpFile=generateXp() -#print(xpFile) - diff --git a/src/mpMptcptraceData.py b/src/mpMptcptraceData.py deleted file mode 100644 index e69eaeb..0000000 --- a/src/mpMptcptraceData.py +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/python - - -from subprocess import check_call -import csv - -from io import StringIO -import re -import os -import numpy as np - - - - -class MptcptraceData: - def __init__(self, pcap_file): - self.pcap_file=pcap_file - self.base_dir = os.path.dirname(pcap_file) - working_dir = os.getcwd() - - # generate CSVs - os.chdir(self.base_dir) - print self.base_dir - print os.getcwd() - check_call(["sudo" , "/usr/local/bin/mptcptrace" , "-f", os.path.basename(pcap_file) , "-G20", "-F3", "-r7", "-s", "-S", "-a", "-w2"]) - os.chdir(working_dir) - # accessing the attribute corresponding to the filename will parse the csv and return its cells - def __getattr__(self, name): - csv_file = self.base_dir+"/"+name+".csv" - print "opening csv file " + csv_file - if os.path.isfile(csv_file): - a = np.genfromtxt (csv_file, delimiter=",") - setattr(self, name, a) - return getattr(self,name) - else: - raise AttributeError("No csv file for unknown attribute "+name) - - - # gets cell corresponding to flow with header column - # flow 0 = first one, from 1=subflows - def get_csv(self, name): - if hasattr(self,name): - return getattr(self,name) - else: - return self.__get_attr__(name) - - diff --git a/src/mpRefreshSetCsv.py b/src/mpRefreshSetCsv.py deleted file mode 100644 index 24b182a..0000000 --- a/src/mpRefreshSetCsv.py +++ /dev/null @@ -1,61 +0,0 @@ - -import numpy as np -import os as os -import matplotlib.pyplot as plt -from subprocess import call, check_call -from subprocess import check_output - -class RefreshSetCsvAggregator: - def __init__(self, yml, test_name, dest_dir): - # csv_file="c2s_seq_1.csv" - # minimum delay to observe to identify the beginning of a block - - self.paths_used=open("paths_used.log", "a") - self.pcap_file=dest_dir+"/client.pcap" - self.base_dir = os.path.dirname(self.pcap_file) - working_dir = os.getcwd() - - os.chdir(self.base_dir) - check_call(["/usr/local/bin/mptcptrace" , "-f", os.path.basename(self.pcap_file) , "-G20", "-F3", "-r7", "-s", "-S", "-a", "-w2"]) - csv_content = check_output(["sudo", "tcptrace", "-l", "--csv", os.path.basename(self.pcap_file)]) - with (open("tcptrace.csv", "w")) as f: - f.write(csv_content) - time=os.system("cat stats_1.csv | grep Time | cut -d \";\" -f 4 >> /home/mininet/minitopo/src/times.log") - os.chdir(working_dir) - - - # for refresh_set: - #self.headers = [ "decision", "port", "metric", "path" ] - #self.log = open(dest_dir+"/refresh_set_aggregator.log","w") - #self.csv_file=dest_dir+"/"+"refresh_set.csv" - #csv_content = check_output(["grep", "csv", dest_dir+"/upmc.log"]) - #with open(self.csv_file,"w") as f: - # f.write(csv_content) - #self.a = np.genfromtxt (self.csv_file, delimiter=",")[:,1:] - #self.a=np.array(self.a, dtype=int) - #self.extract_data() - def __del__(self): - self.paths_used.close() - def extract_data(self): - decisions = np.unique(self.a[:,0]) - print decisions - paths_used = [] - - for decision in decisions: - paths = np.array(filter(lambda row: row[0]==decision, self.a)) - print "paths for decision " + str(decision) - print paths - unique_paths = np.unique(paths[:, 3]) - print "unique paths:" - print unique_paths - print len(unique_paths) - paths_used.append(len(unique_paths)) - print >>self.paths_used, paths_used - print np.array(paths_used).argmax() - - - def __str__(self): - return "Nothing here, change it in mpRefreshSetCsv.py" - #return self.csv_file - def plot(self): - pass diff --git a/src/mpTcptraceData.py b/src/mpTcptraceData.py deleted file mode 100755 index 99fb2da..0000000 --- a/src/mpTcptraceData.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/python - - -from subprocess import check_output -import csv - -from io import StringIO -import re -import numpy as np - - - - -class TcptraceData: - def __init__(self, pcap_file): - self.pcap_file=pcap_file - csv_content = check_output(["tcptrace", "-l", "--csv", pcap_file]) - tcptrace_reader = csv.reader(filter(lambda l: len(l)>0 and l[0]!="#",csv_content.splitlines())) - cells=np.array(list(tcptrace_reader)) - #drop header row - cells= cells[1:] - self.cells = cells - self.headers=cells[0] - self.flows=cells[1:] - self.number_of_flows=len(self.flows) - def get_csv(self, name): - return self.cells diff --git a/src/mpValidations.py b/src/mpValidations.py deleted file mode 100644 index 56170a4..0000000 --- a/src/mpValidations.py +++ /dev/null @@ -1,193 +0,0 @@ - - -from mpTcptraceData import * -from subprocess import check_output - -import numpy as np - - -# to get a REPL: -#import code -#code.interact(local=locals()) - - - -# A checker runs tests, and a test is made of multiple validations - - -# For a validation, the value to compare to is the target value from the yaml -# The validation takes place in the validate method, which takes -# as argument a value from which to extract the value to compare or the value itself -class Validation: - def __init__(self, yml): - if "target" in yml: - self.compared=yml["target"] - else: - self.compared=None - def name(self): - return self.__class__.__name__ - def validate(self,value): - raise Exception("Method not implemented") - def setup(self): - raise Exception("Method not implemented") - - -# checks a value passed is greater or equal (generic) -class MinValueValidation(Validation): - def validate(self, value): - self.value = value - return self.compared<=value -# checks a value passed is greater or equal (generic) -class MaxValueValidation(Validation): - def validate(self, value): - self.value = value - return self.compared>=value -# checks a value passed is greater or equal (generic) -class ExactValueValidation(Validation): - def validate(self, value): - self.value = value - return self.compared==value - - -# the method get_tested_value of the tester returns the value passed to validate. -# the CsvTester returns an array of values -class MinDifferenceValidation(Validation): - def validate(self, value): - v = value.flatten() - if len(v)>2: - raise Exception("MinDifferenceValidation requires 2 values maximum, not "+ str(len(v))) - self.value = float(v[1])-float(v[0]) - return self.compared<=self.value -class MinRowsValidation(Validation): - def validate(self, value): - self.value = len(value) - return self.compared<=self.value -class MaxRowsValidation(Validation): - def validate(self, value): - self.value = len(value) - return self.compared>=self.value -class ExactRowsValidation(Validation): - def validate(self, value): - self.value = len(value) - return self.compared==self.value -class MaxRatioValidation(Validation): - def validate(self, value): - v = value.flatten() - if len(v)>2: - raise Exception("MinDifferenceValidation requires 2 values maximum, not "+ str(len(v))) - self.value = float(v[1])/(float(v[0])+float(v[1])) - return self.compared>=self.value -# validates all values passed have increasing values -# it is the Tester's get_tested_value method that does the work -# to extract the values list from the trace. -class IncreasingValuesValidation(Validation): - def validate(self, values): - previous = 0 - for i,v in enumerate(values.flatten()): - #print i, "{:10.6f}".format(previous), "{:10.6f}".format(v) - if vb on flow 1 compared to flow 0." diff --git a/src/tests/base/xp b/src/tests/base/xp deleted file mode 100644 index 3a15d5a..0000000 --- a/src/tests/base/xp +++ /dev/null @@ -1,11 +0,0 @@ -xpType:ncpv -rmem:300000 300000 300000 -ncClientPort_0:33400 -clientPcap:yes -pvRateLimit:600k -ddCount:10000 -kpm:fullmesh -kpms:netlink -kpmc:netlink -upmc:delayOpen -upmc_args: -c 2000 -d diff --git a/tex/Makefile b/tex/Makefile deleted file mode 100644 index 7a9cb32..0000000 --- a/tex/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -MAINDOC=main.pdf -MAINDOCSRC= $(MAINDOC:.pdf=.tex) -TEX_FILES= main.tex include/why.tex include/goals.tex -PDFLATEX=pdflatex - -all: $(MAINDOC) - -$(MAINDOC): $(TEX_FILES) - $(PDFLATEX) $(MAINDOCSRC) diff --git a/tex/include/goals.tex b/tex/include/goals.tex deleted file mode 100644 index 8c174f6..0000000 --- a/tex/include/goals.tex +++ /dev/null @@ -1,26 +0,0 @@ -\section{Goals} - -\subsection{Glob} -It should be easy to test a specific version of MPTCP. - -By specific version we mean : - -* We should be able to pick a commit -* We should be able to select path manager -* we should be able to express the environment to be tested - - All of them - - a subpart - - just one - - ... - -Results should be easy to access without any modifications. -Results should be reproducible : meaning : even configuration and so one should -be some how saved on the repository. - -Example of execution - -./mpTest --mpCommit xxx --pm yy --pmCommit yyy --conf all -./mpTest --mpCommit xxx --pm yy --pmCommit yyy --conf 42 - - - diff --git a/tex/include/why.tex b/tex/include/why.tex deleted file mode 100644 index 1f90c15..0000000 --- a/tex/include/why.tex +++ /dev/null @@ -1,2 +0,0 @@ -\section{Why are we doing this ?} - diff --git a/tex/main.tex b/tex/main.tex deleted file mode 100644 index 8b2ea5e..0000000 --- a/tex/main.tex +++ /dev/null @@ -1,20 +0,0 @@ -\documentclass[a4paper,10pt]{article} -\usepackage[utf8]{inputenc} - - -\title{Tools documentations for MPTCP experiments} -\author{} - -\begin{document} - -\maketitle - -\begin{abstract} - -\end{abstract} - -\input{include/why} -\input{include/goals} - - -\end{document}