- test config fixes for adaptive overlay connects

diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
index b4c7f9f16bd5d994b0e52b28e13973cebb46c485..514cd42c1e5a39b1a3d6e33cc5dbb6d0a42639b4 100644 (file)
--- a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
@@ -4,7 +4,7 @@ PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 NEIGHBOUR_LIMIT = 100
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3
+PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
 OVERLAY_TOPOLOGY = CLIQUE
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 

diff --git a/src/testbed/test_testbed_api_testbed_run_topologyline.conf b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
index 0e362bf48177ca4b523bc33c51ac6505a98d1cee..c07f023e05c615984099c1513aed195211c76f1c 100644 (file)
--- a/src/testbed/test_testbed_api_testbed_run_topologyline.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
@@ -4,8 +4,8 @@ PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 NEIGHBOUR_LIMIT = 100
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 1
 OVERLAY_TOPOLOGY = LINE
+PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
 [fs]
@@ -77,4 +77,4 @@ 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 ca2466af15e8fa49f76adbe80715c8c7ddfa99d4..7156df3b220ff34ff6a5742053db159dc9258fbd 100644 (file)
--- a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
@@ -3,7 +3,7 @@ AUTOSTART = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3
+PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
 OVERLAY_TOPOLOGY = RANDOM
 OVERLAY_RANDOM_LINKS = 5
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args

diff --git a/src/testbed/test_testbed_api_testbed_run_topologyring.conf b/src/testbed/test_testbed_api_testbed_run_topologyring.conf
index a060a6386b16bbc7aad3cb75f58feb7d798c59ee..de83ab20140c82c6ce7dcd4a6430f7d9a74585fb 100644 (file)
--- a/src/testbed/test_testbed_api_testbed_run_topologyring.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyring.conf
@@ -4,7 +4,7 @@ PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 NEIGHBOUR_LIMIT = 100
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3
+PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
 OVERLAY_TOPOLOGY = RING
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 

diff --git a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
index 6317cb8333d26aebfdde099017dc3f8937581bd6..d33f34a8b609001711f0fff513f04fb62a5feebc 100644 (file)
--- a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
@@ -3,7 +3,7 @@ AUTOSTART = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3
+PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
 OVERLAY_TOPOLOGY = SMALL_WORLD_RING
 OVERLAY_RANDOM_LINKS = 3
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args