From d2d9a01f6e09efb9c2f9949809511241a3299151 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Fri, 16 Nov 2012 14:46:54 +0000 Subject: [PATCH] - test config fixes for adaptive overlay connects --- src/testbed/test_testbed_api_testbed_run_topologyclique.conf | 2 +- src/testbed/test_testbed_api_testbed_run_topologyline.conf | 4 ++-- src/testbed/test_testbed_api_testbed_run_topologyrandom.conf | 2 +- src/testbed/test_testbed_api_testbed_run_topologyring.conf | 2 +- .../test_testbed_api_testbed_run_topologysmallworldring.conf | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf index b4c7f9f16..514cd42c1 100644 --- 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 0e362bf48..c07f023e0 100644 --- 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 ca2466af1..7156df3b2 100644 --- 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 a060a6386..de83ab201 100644 --- 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 6317cb833..d33f34a8b 100644 --- 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 -- 2.25.1