move testbed setup to template

5 files changed, 13 insertions, 15 deletions

diff --git a/src/dv/template_dv.conf b/src/dv/template_dv.conf
index f0567e823..812b6975c 100644
--- a/src/dv/template_dv.conf
+++ b/src/dv/template_dv.conf
@@ -9,24 +9,28 @@
 # 
 # Allowed connections: 
 # OF84 - M1RG
-# OF84 - 548J
 # OF84 - 93AR
-
+# M1RG - 93AR
 # 548J - M1RG
 # 548J - 93AR
 #
 # Disallowed connections:
-# M1RG - 93AR
+# OF84 - 548J
+
+[testbed]
+OVERLAY_TOPOLOGY = CLIQUE
+SETUP_TIMEOUT = 1 m
+OPERATION_TIMEOUT = 5 s
 
 [transport-blacklist-OF84RAOAU2B1SOSEHJH6350MA0F7C98U55RI76LGIQOM7O33TFHPNUFB47CDBSCOLIINMVJ2U82445ABOBQRIVREG20L31KVDV5HG60]
+548J7M14O4I0F8I84U0UFARVJ97DB6QOT3MCA8O8SNAIT5JJ8TR95LUVAP3N5L7DN33IB49SNMF3Q3C0VPLTGP9ASCULA9S2OIMHHH8 = tcp
 
 [transport-blacklist-M1RGJB4FQSM17JJ3M9BF7Q0I8MCO8C462NMOHI26RLT7C7A2KE6HCOPRA4ARM5HPL1J9IDDK5G8SFU5GUSHCTBH90ECETK1BFQD76R0]
-93ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O = tcp
 
 [transport-blacklist-548J7M14O4I0F8I84U0UFARVJ97DB6QOT3MCA8O8SNAIT5JJ8TR95LUVAP3N5L7DN33IB49SNMF3Q3C0VPLTGP9ASCULA9S2OIMHHH8]
+OF84RAOAU2B1SOSEHJH6350MA0F7C98U55RI76LGIQOM7O33TFHPNUFB47CDBSCOLIINMVJ2U82445ABOBQRIVREG20L31KVDV5HG60 = tcp
 
 [transport-blacklist-93ARIS6Q347RPU9EFPS9LA00VPHQLG3RBLKEKTHV4D6UVGEAC75KIIBFB5U9KK9P9P1RU1CBPV4BSSDUTB2AL2N2LG9KSO9APQNLS0O]
-M1RGJB4FQSM17JJ3M9BF7Q0I8MCO8C462NMOHI26RLT7C7A2KE6HCOPRA4ARM5HPL1J9IDDK5G8SFU5GUSHCTBH90ECETK1BFQD76R0 = tcp
 
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-dv-testing/
diff --git a/src/dv/test_transport_blacklist.c b/src/dv/test_transport_blacklist.c
index 4e287a5bd..601544afa 100644
--- a/src/dv/test_transport_blacklist.c
+++ b/src/dv/test_transport_blacklist.c
@@ -39,6 +39,7 @@ test_connection (void *cls,
                  unsigned int links_succeeded,
                  unsigned int links_failed)
 {
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Links successful %u / %u failed\n", links_succeeded, links_failed);
   if ( (4 == num_peers) && (0 == links_failed) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
diff --git a/src/dv/test_transport_blacklist_data.conf b/src/dv/test_transport_blacklist_data.conf
index 58bf62b33..534a61849 100644
--- a/src/dv/test_transport_blacklist_data.conf
+++ b/src/dv/test_transport_blacklist_data.conf
@@ -3,8 +3,3 @@
 [transport]
 PORT = 2565
 PLUGINS = tcp 
-
-[testbed]
-OVERLAY_TOPOLOGY = CLIQUE
-SETUP_TIMEOUT = 1 m
-OPERATION_TIMEOUT = 5 s
diff --git a/src/dv/test_transport_dv.c b/src/dv/test_transport_dv.c
index aa208515f..0b021e92e 100644
--- a/src/dv/test_transport_dv.c
+++ b/src/dv/test_transport_dv.c
@@ -30,7 +30,6 @@
  */
 static int ok;
 
-
 static void
 test_connection (void *cls,
                  struct GNUNET_TESTBED_RunHandle *h,
@@ -39,6 +38,9 @@ test_connection (void *cls,
                  unsigned int links_succeeded,
                  unsigned int links_failed)
 {
+  int c;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Links successful %u / %u failed\n", links_succeeded, links_failed);
+
   if ( (4 != num_peers) || (0 != links_failed) )
   {
     fprintf (stderr, "Testbed failed to connect peers\n");
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index b80ded243..346677a25 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -10,7 +10,3 @@ AUTOSTART = YES
 
 [set]
 AUTOSTART = YES
-
-[testbed]
-OVERLAY_TOPOLOGY = CLIQUE
-SETUP_TIMEOUT = 30 s