merging configs

diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
index 3eb136e1c864db9c48d26efbb1081168642c2e37..460c01b1308a3df8ad36ba81f5c894cc16b03f40 100644 (file)
--- a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
@@ -35,8 +35,7 @@ NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
 [ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
+AUTOSTART = NO
 
 [core]
 PORT = 12092
@@ -77,4 +76,5 @@ AUTOSTART = NO
 RETURN_LOCAL_ADDRESSES = YES
 
 [gns-helper-service-w32]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
+

diff --git a/src/testbed/test_testbed_api_testbed_run_topologyline.conf b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
index 53d0e6f4ca58f0e00fbc2cb0df4d596a5687e5e0..808d499322c9e6334d714a58c319bcf26a06ef45 100644 (file)
--- a/src/testbed/test_testbed_api_testbed_run_topologyline.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
@@ -35,8 +35,7 @@ NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
 [ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
+AUTOSTART = NO
 
 [core]
 PORT = 12092
@@ -77,4 +76,5 @@ AUTOSTART = NO
 RETURN_LOCAL_ADDRESSES = YES
 
 [gns-helper-service-w32]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
+

diff --git a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
index 84f338c3e869fa988f47a5f0010dc1b117658821..4eb62a9dc91fe6e611dd0f2d26c5953b9c4b8b8d 100644 (file)
--- a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
@@ -36,8 +36,7 @@ NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
 [ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
+AUTOSTART = NO
 
 [core]
 PORT = 12092
@@ -78,4 +77,5 @@ AUTOSTART = NO
 RETURN_LOCAL_ADDRESSES = YES
 
 [gns-helper-service-w32]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
+