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

[gnunet]

Author: harsha
Date: 2012-11-23 13:23:16 +0100 (Fri, 23 Nov 2012)
New Revision: 25113

Added:
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
Modified:
   gnunet/src/testbed/
   gnunet/src/testbed/Makefile.am
Log:
test case for scale free routing

Index: gnunet/src/testbed
===================================================================
--- gnunet/src/testbed  2012-11-23 09:14:47 UTC (rev 25112)
+++ gnunet/src/testbed  2012-11-23 12:23:16 UTC (rev 25113)

Property changes on: gnunet/src/testbed
___________________________________________________________________
Modified: svn:ignore
## -28,3 +28,4 ##
 test_testbed_api_testbed_run_topology2dtorus
 test_testbed_api_testbed_run_topologysmallworld
 test_testbed_api_testbed_run_topologyfromfile
+test_testbed_api_testbed_run_topologyscalefree
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am      2012-11-23 09:14:47 UTC (rev 25112)
+++ gnunet/src/testbed/Makefile.am      2012-11-23 12:23:16 UTC (rev 25113)
@@ -80,25 +80,26 @@
  -version-info 0:0:0
 
 check_PROGRAMS = \
- test_testbed_api_hosts \
- test_testbed_api_controllerlink \
- test_testbed_api_2peers_1controller \
- test_testbed_api_3peers_3controllers \
- test_testbed_api \
- test_testbed_api_operations \
- test_testbed_api_testbed_run \
- test_testbed_api_test \
- test_gnunet_helper_testbed \
- test_testbed_api_topology \
- 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_topologyring \
- test_testbed_api_testbed_run_topologysmallworldring \
- test_testbed_api_testbed_run_topology2dtorus \
- test_testbed_api_testbed_run_topologysmallworld \
- test_testbed_api_testbed_run_topologyfromfile
+  test_testbed_api_hosts \
+  test_testbed_api_controllerlink \
+  test_testbed_api_2peers_1controller \
+  test_testbed_api_3peers_3controllers \
+  test_testbed_api \
+  test_testbed_api_operations \
+  test_testbed_api_testbed_run \
+  test_testbed_api_test \
+  test_gnunet_helper_testbed \
+  test_testbed_api_topology \
+  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_topologyring \
+  test_testbed_api_testbed_run_topologysmallworldring \
+  test_testbed_api_testbed_run_topology2dtorus \
+  test_testbed_api_testbed_run_topologysmallworld \
+  test_testbed_api_testbed_run_topologyfromfile \
+  test_testbed_api_testbed_run_topologyscalefree
 
 if ENABLE_TEST_RUN
  TESTS = \
@@ -113,14 +114,15 @@
   test_testbed_api_test \
   test_testbed_api_topology \
   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_topologyring \
- test_testbed_api_testbed_run_topologysmallworldring \
- test_testbed_api_testbed_run_topology2dtorus \
- test_testbed_api_testbed_run_topologysmallworld \
- test_testbed_api_testbed_run_topologyfromfile
+  test_testbed_api_testbed_run_topologyrandom \
+  test_testbed_api_testbed_run_topologyline \
+  test_testbed_api_testbed_run_topologyclique \
+  test_testbed_api_testbed_run_topologyring \
+  test_testbed_api_testbed_run_topologysmallworldring \
+  test_testbed_api_testbed_run_topology2dtorus \
+  test_testbed_api_testbed_run_topologysmallworld \
+  test_testbed_api_testbed_run_topologyfromfile \
+  test_testbed_api_testbed_run_topologyscalefree
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -242,6 +244,12 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
+test_testbed_api_testbed_run_topologyscalefree_SOURCES = \
+ test_testbed_api_testbed_run.c
+test_testbed_api_testbed_run_topologyscalefree_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
 EXTRA_DIST = \
   test_testbed_api.conf \
   test_testbed_api_testbed_run_topologyring.conf \
@@ -252,5 +260,6 @@
   test_testbed_api_testbed_run_topology2dtorus.conf \
   test_testbed_api_testbed_run_topologysmallworld.conf \
   test_testbed_api_testbed_run_topologyfromfile.conf \
+  test_testbed_api_testbed_run_topologyscalefree.conf \
   overlay_topology.txt \
   sample_hosts.txt
\ No newline at end of file

Copied: gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf 
(from rev 25112, 
gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf)
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf      
                        (rev 0)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf      
2012-11-23 12:23:16 UTC (rev 25113)
@@ -0,0 +1,80 @@
+[testbed]
+AUTOSTART = NO
+PORT = 12113
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+NEIGHBOUR_LIMIT = 100
+PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
+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