file cleaning to prepare the project rearchitecturing

2020-07-13 09:49:25 +02:00 · 2020-07-13 09:49:25 +02:00 · d0fd689d49
commit d0fd689d49
parent ff926a339b
225 changed files with 3 additions and 2270 deletions
--- a/src/SiriClient.java
+++ b/src/SiriClient.java
--- a/src/conf/https/topo
+++ b/src/conf/https/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
--- a/config/simple/xp
+++ b/config/simple/xp
@ -0,0 +1 @@
+xpType:none
--- a/src/http.py
+++ b/src/http.py
--- a/src/https.py
+++ b/src/https.py
--- a/src/mpConfig.py
+++ b/src/mpConfig.py
--- a/src/mpECMPSingleInterfaceConfig.py
+++ b/src/mpECMPSingleInterfaceConfig.py
--- a/src/mpECMPSingleInterfaceTopo.py
+++ b/src/mpECMPSingleInterfaceTopo.py
--- a/src/mpExperience.py
+++ b/src/mpExperience.py
--- a/src/mpExperienceAb.py
+++ b/src/mpExperienceAb.py
--- a/src/mpExperienceDITG.py
+++ b/src/mpExperienceDITG.py
--- a/src/mpExperienceEpload.py
+++ b/src/mpExperienceEpload.py
--- a/src/mpExperienceHTTP.py
+++ b/src/mpExperienceHTTP.py
--- a/src/mpExperienceHTTPS.py
+++ b/src/mpExperienceHTTPS.py
--- a/src/mpExperienceIperf.py
+++ b/src/mpExperienceIperf.py
--- a/src/mpExperienceMsg.py
+++ b/src/mpExperienceMsg.py
--- a/src/mpExperienceNC.py
+++ b/src/mpExperienceNC.py
--- a/src/mpExperienceNCPV.py
+++ b/src/mpExperienceNCPV.py
--- a/src/mpExperienceNetperf.py
+++ b/src/mpExperienceNetperf.py
--- a/src/mpExperienceNone.py
+++ b/src/mpExperienceNone.py
--- a/src/mpExperiencePing.py
+++ b/src/mpExperiencePing.py
--- a/src/mpExperienceQUIC.py
+++ b/src/mpExperienceQUIC.py
--- a/src/mpExperienceQUICSiri.py
+++ b/src/mpExperienceQUICSiri.py
--- a/src/mpExperienceSendFile.py
+++ b/src/mpExperienceSendFile.py
--- a/src/mpExperienceSiri.py
+++ b/src/mpExperienceSiri.py
--- a/src/mpExperienceSiriHTTP.py
+++ b/src/mpExperienceSiriHTTP.py
--- a/src/mpExperienceSiriMsg.py
+++ b/src/mpExperienceSiriMsg.py
--- a/src/mpExperienceVLC.py
+++ b/src/mpExperienceVLC.py
--- a/src/mpLinkCharacteristics.py
+++ b/src/mpLinkCharacteristics.py
--- a/src/mpMininetBuilder.py
+++ b/src/mpMininetBuilder.py
--- a/src/mpMultiInterfaceConfig.py
+++ b/src/mpMultiInterfaceConfig.py
--- a/src/mpMultiInterfaceCongConfig.py
+++ b/src/mpMultiInterfaceCongConfig.py
--- a/src/mpMultiInterfaceCongTopo.py
+++ b/src/mpMultiInterfaceCongTopo.py
--- a/src/mpMultiInterfaceTopo.py
+++ b/src/mpMultiInterfaceTopo.py
--- a/src/mpNetemAt.py
+++ b/src/mpNetemAt.py
--- a/src/mpParam.py
+++ b/src/mpParam.py
--- a/src/mpParamTopo.py
+++ b/src/mpParamTopo.py
--- a/src/mpParamXp.py
+++ b/src/mpParamXp.py
--- a/src/mpPerf.py
+++ b/src/mpPerf.py
--- a/src/mpPvAt.py
+++ b/src/mpPvAt.py
--- a/src/mpTopo.py
+++ b/src/mpTopo.py
--- a/src/mpTwoInterfaceCongestionConfig.py
+++ b/src/mpTwoInterfaceCongestionConfig.py
--- a/src/mpTwoInterfaceCongestionTopo.py
+++ b/src/mpTwoInterfaceCongestionTopo.py
--- a/src/mpXpRunner.py
+++ b/src/mpXpRunner.py
--- a/src/msg_client.py
+++ b/src/msg_client.py
--- a/src/msg_server.py
+++ b/src/msg_server.py
--- a/src/server.pem
+++ b/src/server.pem
--- a/src/siriClient.jar
+++ b/src/siriClient.jar
--- a/src/siri_server.py
+++ b/src/siri_server.py
--- a/src/bup_tests/kernelspace/topo
+++ b/src/bup_tests/kernelspace/topo
@ -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
--- a/src/bup_tests/kernelspace/validation.yml
+++ b/src/bup_tests/kernelspace/validation.yml
@ -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"
--- a/src/bup_tests/kernelspace/xp
+++ b/src/bup_tests/kernelspace/xp
@ -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
--- a/src/bup_tests/userspace/topo
+++ b/src/bup_tests/userspace/topo
@ -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
--- a/src/bup_tests/userspace/validation.yml
+++ b/src/bup_tests/userspace/validation.yml
@ -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"
--- a/src/bup_tests/userspace/xp
+++ b/src/bup_tests/userspace/xp
@ -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
--- a/src/burst_tests/first/topo
+++ b/src/burst_tests/first/topo
@ -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
--- a/src/burst_tests/first/validation.yml
+++ b/src/burst_tests/first/validation.yml
@ -1,5 +0,0 @@
-checkers:
-  mptcptrace:
-  tcptrace:
-aggregators:
-  - burst_blocks
--- a/src/burst_tests/first/xp
+++ b/src/burst_tests/first/xp
@ -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
--- a/src/conf/bb/topo_1
+++ b/src/conf/bb/topo_1
@ -1,5 +0,0 @@
-leftSubnet:10.0.
-rightSubnet:10.1.
-#path_0:10,10,3
-path_1:100,70,4
-topoType:MultiIf
--- a/src/conf/bb/xp_1
+++ b/src/conf/bb/xp_1
@ -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
--- a/src/conf/blogPost/topo_1
+++ b/src/conf/blogPost/topo_1
@ -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
--- a/src/conf/blogPost/topo_2
+++ b/src/conf/blogPost/topo_2
@ -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
--- a/src/conf/blogPost/topo_3
+++ b/src/conf/blogPost/topo_3
@ -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
--- a/src/conf/blogPost/topo_4
+++ b/src/conf/blogPost/topo_4
@ -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%
--- a/src/conf/blogPost/topo_5
+++ b/src/conf/blogPost/topo_5
@ -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%
--- a/src/conf/blogPost/xp_1
+++ b/src/conf/blogPost/xp_1
@ -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
--- a/src/conf/blogPost/xp_2
+++ b/src/conf/blogPost/xp_2
@ -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
--- a/src/conf/blogPost/xp_3
+++ b/src/conf/blogPost/xp_3
@ -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
--- a/src/conf/blogPost/xp_4
+++ b/src/conf/blogPost/xp_4
@ -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
--- a/src/conf/blogPost/xp_5
+++ b/src/conf/blogPost/xp_5
@ -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
--- a/src/conf/bo/topo_1
+++ b/src/conf/bo/topo_1
@ -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
--- a/src/conf/bo/topo_2
+++ b/src/conf/bo/topo_2
@ -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
--- a/src/conf/bo/topo_3
+++ b/src/conf/bo/topo_3
@ -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
--- a/src/conf/bo/topo_4
+++ b/src/conf/bo/topo_4
@ -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
--- a/src/conf/bo/topo_5
+++ b/src/conf/bo/topo_5
@ -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
--- a/src/conf/bo/xp_1
+++ b/src/conf/bo/xp_1
@ -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
--- a/src/conf/bo/xp_2
+++ b/src/conf/bo/xp_2
@ -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
--- a/src/conf/bo/xp_3
+++ b/src/conf/bo/xp_3
@ -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
--- a/src/conf/bo/xp_4
+++ b/src/conf/bo/xp_4
@ -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
--- a/src/conf/bo/xp_5
+++ b/src/conf/bo/xp_5
@ -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
--- a/src/conf/bwVar/topo_1
+++ b/src/conf/bwVar/topo_1
@ -1,5 +0,0 @@
-leftSubnet:10.0.
-rightSubnet:10.1.
-path_0:10,20,4
-path_1:100,60,4
-topoType:MultiIf
--- a/src/conf/bwVar/topo_2
+++ b/src/conf/bwVar/topo_2
@ -1,5 +0,0 @@
-leftSubnet:10.0.
-rightSubnet:10.1.
-path_0:10,20,4
-#path_1:100,60,4
-topoType:MultiIf
--- a/src/conf/bwVar/xp_1
+++ b/src/conf/bwVar/xp_1
@ -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
--- a/src/conf/bwVar/xp_2
+++ b/src/conf/bwVar/xp_2
@ -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
--- a/src/conf/bwvar2/topo_1
+++ b/src/conf/bwvar2/topo_1
@ -1,5 +0,0 @@
-leftSubnet:10.0.
-rightSubnet:10.1.
-path_0:10,20,4
-#path_1:100,60,4
-topoType:MultiIf
--- a/src/conf/bwvar2/topo_2
+++ b/src/conf/bwvar2/topo_2
@ -1,5 +0,0 @@
-leftSubnet:10.0.
-rightSubnet:10.1.
-path_0:10,20,4
-path_1:100,60,4
-topoType:MultiIf
--- a/src/conf/bwvar2/topo_3
+++ b/src/conf/bwvar2/topo_3
@ -1,5 +0,0 @@
-leftSubnet:10.0.
-rightSubnet:10.1.
-path_0:10,20,4
-path_1:100,60,4
-topoType:MultiIf
--- a/src/conf/bwvar2/xp_1
+++ b/src/conf/bwvar2/xp_1
@ -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
--- a/src/conf/bwvar2/xp_2
+++ b/src/conf/bwvar2/xp_2
@ -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
--- a/src/conf/bwvar2/xp_3
+++ b/src/conf/bwvar2/xp_3
@ -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
--- a/src/conf/dd/topo_1
+++ b/src/conf/dd/topo_1
@ -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
--- a/src/conf/dd/topo_2
+++ b/src/conf/dd/topo_2
@ -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
--- a/src/conf/dd/topo_3
+++ b/src/conf/dd/topo_3
@ -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
--- a/src/conf/dd/topo_4
+++ b/src/conf/dd/topo_4
@ -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
--- a/src/conf/dd/topo_5
+++ b/src/conf/dd/topo_5
@ -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
--- a/src/conf/dd/topo_6
+++ b/src/conf/dd/topo_6
@ -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
--- a/src/conf/dd/topo_7
+++ b/src/conf/dd/topo_7
@ -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
--- a/src/conf/dd/xp_1
+++ b/src/conf/dd/xp_1
@ -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
--- a/src/conf/dd/xp_2
+++ b/src/conf/dd/xp_2
@ -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
--- a/src/conf/dd/xp_3
+++ b/src/conf/dd/xp_3
@ -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
--- a/Show More
+++ b/Show More