From ed18131bd038617c03e0b3b83e3eb56c31dc3e4a Mon Sep 17 00:00:00 2001
From: Sree Harsha Totakura <totakura@in.tum.de>
Date: Thu, 4 Apr 2013 09:25:22 +0000
Subject: - remove hosts with older kernel

---
 contrib/experiments/nse/infiniband.conf | 126 ++++++++++++++++++++++++++++++++
 contrib/infiniband_cluster.hosts        |   2 -
 contrib/testbed_cleanup.sh              |   2 +-
 contrib/testbed_infiniband.conf         |   4 +-
 4 files changed, 129 insertions(+), 5 deletions(-)
 create mode 100644 contrib/experiments/nse/infiniband.conf

diff --git a/contrib/experiments/nse/infiniband.conf b/contrib/experiments/nse/infiniband.conf
new file mode 100644
index 000000000..bb3ebd357
--- /dev/null
+++ b/contrib/experiments/nse/infiniband.conf
@@ -0,0 +1,126 @@
+[PATHS]
+SERVICEHOME = /tmp/nse-profiler/
+
+[testbed]
+AUTOSTART = NO
+PORT = 12113
+ACCEPT_FROM = 127.0.0.1;192.168.0.0/16;
+HOSTNAME = localhost
+MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
+OVERLAY_TOPOLOGY = RANDOM
+OVERLAY_RANDOM_LINKS = 1000
+OPERATION_TIMEOUT = 45 s
+
+[nse]
+PORT = 12114
+UNIXPATH = /tmp/test-nse-service-nse.unix
+BINARY = gnunet-service-nse
+#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
+#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
+AUTOSTART = NO
+# Overriding network settings for faster testing (do NOT use
+# these values in production just because they are here)
+WORKDELAY = 60 s
+INTERVAL = 10 s
+WORKBITS = 0
+PROOFFILE = $SERVICEHOME/nse.proof
+
+[arm]
+DEFAULTSERVICES = core nse
+UNIXPATH = /tmp/test-nse-service-arm.unix
+
+[statistics]
+AUTOSTART = YES
+PORT = 12115
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
+
+[transport]
+plugins = udp
+
+[transport-udp]
+PORT = 12116
+
+[core]
+AUTOSTART = YES
+
+[peerinfo]
+AUTOSTART = YES
+
+[dns]
+AUTOSTART = NO
+
+[topology]
+AUTOSTART = NO
+
+[dv]
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = YES
+
+[mesh]
+AUTOSTART = NO
+
+[chat]
+AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
+
+[nse-profiler]
+OUTPUT_FILE = nse_output_2000_peers.dat
+TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers
+DATA_OUTPUT_FILE = nse_stats_2000_peers
+ROUND0 = 1000
+#ROUND1 = 2000
+ROUND2 = 2000
+ROUND3 = 2000
+ROUND4 = 2000
+ROUND5 = 2000
+ROUND6 = 2000
+ROUND7 = 2000
+ROUND8 = 2000
+ROUND9 = 2000
+ROUND10 = 2000
+ROUND11 = 1000
+ROUND12 = 1000
+ROUND13 = 1000
+ROUND14 = 1000
+ROUND15 = 1000
+ROUND16 = 1000
+ROUND17 = 1000
+ROUND18 = 1000
+ROUND19 = 1000
+ROUND20 = 1000
+ROUND21 = 2000
+ROUND22 = 2000
+ROUND23 = 2000
+ROUND24 = 2000
+ROUND25 = 2000
+ROUND26 = 2000
+ROUND27 = 2000
+ROUND28 = 2000
+ROUND29 = 2000
+ROUND30 = 2000
+WAIT_TIME = 1920 s
+CONNECTION_LIMIT = 10
diff --git a/contrib/infiniband_cluster.hosts b/contrib/infiniband_cluster.hosts
index 61feb83df..05d9b6539 100644
--- a/contrib/infiniband_cluster.hosts
+++ b/contrib/infiniband_cluster.hosts
@@ -14,8 +14,6 @@ totakura@192.168.1.14:22
 totakura@192.168.1.15:22
 totakura@192.168.1.16:22
 totakura@192.168.1.17:22
-totakura@192.168.1.18:22
-totakura@192.168.1.19:22
 totakura@192.168.1.20:22
 totakura@192.168.1.21:22
 totakura@192.168.1.22:22
diff --git a/contrib/testbed_cleanup.sh b/contrib/testbed_cleanup.sh
index 5e87de108..57413fba0 100755
--- a/contrib/testbed_cleanup.sh
+++ b/contrib/testbed_cleanup.sh
@@ -10,5 +10,5 @@
 for host in `cut -d : -f 1 < infiniband_cluster.hosts | cut -d @ -f 2`
 do
     echo "ssh --> $host"
-    ssh $host 'pkill gnunet; rm -rf /tmp/gnunet-pipe*; rm -rf /tmp/testbed*'
+    ssh $host 'pkill -SIGKILL gnunet; rm -rf /tmp/gnunet-pipe*; rm -rf /tmp/testbed*'
 done
diff --git a/contrib/testbed_infiniband.conf b/contrib/testbed_infiniband.conf
index a0566b371..5ca12a1a0 100644
--- a/contrib/testbed_infiniband.conf
+++ b/contrib/testbed_infiniband.conf
@@ -1,10 +1,10 @@
 [testbed]
 AUTOSTART = NO
 PORT = 12113
-ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16;
+ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 HOSTNAME = localhost
 MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
-OVERLAY_TOPOLOGY = RANDOM
+OVERLAY_TOPOLOGY = LINE
 OVERLAY_RANDOM_LINKS = 4000
 OPERATION_TIMEOUT = 45 s
 # LOG_FILE = /tmp/testbed.log
-- 
cgit v1.2.3