[GNUnet-SVN] r24918 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-11-12 17:55:33 +0100 (Mon, 12 Nov 2012)
New Revision: 24918

Added:
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
Modified:
   gnunet/src/testbed/
   gnunet/src/testbed/Makefile.am
   gnunet/src/testbed/testbed_api_testbed.c
Log:
test case for ring topology

Index: gnunet/src/testbed
===================================================================
--- gnunet/src/testbed  2012-11-12 16:21:29 UTC (rev 24917)
+++ gnunet/src/testbed  2012-11-12 16:55:33 UTC (rev 24918)

Property changes on: gnunet/src/testbed
___________________________________________________________________
Modified: svn:ignore
## -23,3 +23,5 ##
 test_testbed_api_testbed_run_topologyrandom
 test_testbed_api_testbed_run_topologyline
 test_testbed_api_testbed_run_topologyclique
+test_testbed_api_testbed_run_topologyring
+
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am      2012-11-12 16:21:29 UTC (rev 24917)
+++ gnunet/src/testbed/Makefile.am      2012-11-12 16:55:33 UTC (rev 24918)
@@ -93,7 +93,8 @@
  test_testbed_api_topology_clique \
  test_testbed_api_testbed_run_topologyrandom \
  test_testbed_api_testbed_run_topologyline \
- test_testbed_api_testbed_run_topologyclique
+ test_testbed_api_testbed_run_topologyclique \
+ test_testbed_api_testbed_run_topologyring
 
 if ENABLE_TEST_RUN
  TESTS = \
@@ -110,7 +111,8 @@
   test_testbed_api_topology_clique \
  test_testbed_api_testbed_run_topologyrandom \
  test_testbed_api_testbed_run_topologyline \
- test_testbed_api_testbed_run_topologyclique
+ test_testbed_api_testbed_run_topologyclique \
+ test_testbed_api_testbed_run_topologyring
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -202,9 +204,15 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
+test_testbed_api_testbed_run_topologyring_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topologyring_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
 
 EXTRA_DIST = \
   test_testbed_api.conf \
+  test_testbed_api_testbed_run_topologyring.conf \
   test_testbed_api_testbed_run_topologyclique.conf \
   test_testbed_api_testbed_run_topologyline.conf \
   test_testbed_api_testbed_run_topologyrandom.conf \

Copied: gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf (from 
rev 24910, gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf)
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf           
                (rev 0)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf   
2012-11-12 16:55:33 UTC (rev 24918)
@@ -0,0 +1,80 @@
+[testbed]
+AUTOSTART = NO
+PORT = 12113
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+NEIGHBOUR_LIMIT = 100
+MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10
+OVERLAY_TOPOLOGY = RING
+#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
+
+[fs]
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = NO
+
+[mesh]
+AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
+
+[block]
+plugins = dht test
+
+[dhtcache]
+QUOTA = 1 MB
+DATABASE = sqlite
+
+[transport]
+PLUGINS = tcp
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+PORT = 12365
+
+[ats]
+WAN_QUOTA_OUT = 3932160
+WAN_QUOTA_IN = 3932160
+
+[core]
+PORT = 12092
+AUTOSTART = YES
+
+[arm]
+DEFAULTSERVICES = core transport
+PORT = 12366
+
+[transport-tcp]
+TIMEOUT = 300 s
+PORT = 12368
+
+[TESTING]
+NUM_PEERS = 5
+WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+MAX_CONCURRENT_SSH = 10
+USE_PROGRESSBARS = YES
+PEERGROUP_TIMEOUT = 2400 s
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[PATHS]
+SERVICEHOME = /tmp/test-testbed/
+
+[dns]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
+
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
+
+[gns-helper-service-w32]
+AUTOSTART = NO
\ No newline at end of file

Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c    2012-11-12 16:21:29 UTC (rev 
24917)
+++ gnunet/src/testbed/testbed_api_testbed.c    2012-11-12 16:55:33 UTC (rev 
24918)
@@ -662,6 +662,11 @@
       rc->topology = GNUNET_TESTBED_TOPOLOGY_LINE;
       rc->num_oc = num_peers - 1;
     }
+    else if (0 == strcasecmp (topology, "RING"))
+    {
+      rc->topology = GNUNET_TESTBED_TOPOLOGY_RING;
+      rc->num_oc = num_peers;
+    }
     else
       LOG (GNUNET_ERROR_TYPE_WARNING,
            "Unknown topology %s given in configuration\n", topology);