[GNUnet-SVN] r20855 - gnunet-planetlab/gnunet_automatic_deployment

[gnunet]

Author: wachs
Date: 2012-04-02 15:04:53 +0200 (Mon, 02 Apr 2012)
New Revision: 20855

Modified:
   gnunet-planetlab/gnunet_automatic_deployment/start_gnunet.sh
   gnunet-planetlab/gnunet_automatic_deployment/stop_gnunet.sh
   gnunet-planetlab/gnunet_automatic_deployment/update_gnunet.sh
Log:
- make scripts configurable


Modified: gnunet-planetlab/gnunet_automatic_deployment/start_gnunet.sh
===================================================================
--- gnunet-planetlab/gnunet_automatic_deployment/start_gnunet.sh        
2012-04-02 13:02:25 UTC (rev 20854)
+++ gnunet-planetlab/gnunet_automatic_deployment/start_gnunet.sh        
2012-04-02 13:04:53 UTC (rev 20855)
@@ -1,13 +1,21 @@
 #!/bin/sh
 
+# Planetlab username
+username="tum_dht_testing"
+# Number of ssh parallelism
+parallelism=50
+# Timeout for ssh operations 
+timeout=3600
+# Destination directory on the nodes
+deployment_dir="/home/$username/deploy"
+
+# File containing nodes
 nodes_file="nodes.txt"
 working_nodes_file="./tmp/working_nodes.txt"
 working_nodes_filtered_file="./tmp/working_nodes_filtered.txt"
-parallelism=10
-timeout=900
 
-cmd_pssh="pssh -O StrictHostKeychecking=no -t $timeout -p $parallelism -v -l 
tum_dht_testing -h $working_nodes_filtered_file -P "
-cmd_pscp="pscp -O StrictHostKeychecking=no -p $parallelism -v -l 
tum_dht_testing -h $working_nodes_filtered_file "
+cmd_pssh="pssh -O StrictHostKeychecking=no -t $timeout -p $parallelism -v -l 
$username -h $working_nodes_filtered_file -P"
+cmd_pscp="pscp -O StrictHostKeychecking=no -p $parallelism -v -l $username -h 
$working_nodes_filtered_file "
 
 deployment_dir="/home/tum_dht_testing/deploy"
 

Modified: gnunet-planetlab/gnunet_automatic_deployment/stop_gnunet.sh
===================================================================
--- gnunet-planetlab/gnunet_automatic_deployment/stop_gnunet.sh 2012-04-02 
13:02:25 UTC (rev 20854)
+++ gnunet-planetlab/gnunet_automatic_deployment/stop_gnunet.sh 2012-04-02 
13:04:53 UTC (rev 20855)
@@ -1,11 +1,22 @@
 #!/bin/sh
 
+# Planetlab username
+username="tum_dht_testing"
+# Number of ssh parallelism
+parallelism=50
+# Timeout for ssh operations 
+timeout=3600
+# Destination directory on the nodes
+deployment_dir="/home/$username/deploy"
+
+# File containing nodes
 nodes_file="nodes.txt"
 working_nodes_file="./tmp/working_nodes.txt"
 working_nodes_filtered_file="./tmp/working_nodes_filtered.txt"
-parallelism=10
-timeout=900
 
+cmd_pssh="pssh -O StrictHostKeychecking=no -t $timeout -p $parallelism -v -l 
$username -h $working_nodes_filtered_file -P"
+cmd_pscp="pscp -O StrictHostKeychecking=no -p $parallelism -v -l $username -h 
$working_nodes_filtered_file "
+
 cmd_pssh="pssh -O StrictHostKeychecking=no -t $timeout -p $parallelism -v -l 
tum_dht_testing -h $working_nodes_filtered_file -P "
 cmd_pscp="pscp -O StrictHostKeychecking=no -p $parallelism -v -l 
tum_dht_testing -h $working_nodes_filtered_file "
 

Modified: gnunet-planetlab/gnunet_automatic_deployment/update_gnunet.sh
===================================================================
--- gnunet-planetlab/gnunet_automatic_deployment/update_gnunet.sh       
2012-04-02 13:02:25 UTC (rev 20854)
+++ gnunet-planetlab/gnunet_automatic_deployment/update_gnunet.sh       
2012-04-02 13:04:53 UTC (rev 20855)
@@ -5,16 +5,23 @@
 #exit 1
 #fi
 
-nodes_file=$1
-#working_nodes_file="./tmp/working_nodes.txt"
-#working_nodes_filtered_file="./tmp/working_nodes_filtered.txt"
-working_nodes_filtered_file=$1
-parallelism=25
+# Planetlab username
+username="tum_dht_testing"
+# Number of ssh parallelism
+parallelism=50
+# Timeout for ssh operations 
 timeout=3600
+# Destination directory on the nodes
+deployment_dir="/home/$username/deploy"
 
-cmd_pssh="pssh -O StrictHostKeychecking=no -t $timeout -p $parallelism -v -l 
tum_dht_testing -h $working_nodes_filtered_file -P"
-cmd_pscp="pscp -O StrictHostKeychecking=no -p $parallelism -v -l 
tum_dht_testing -h $working_nodes_filtered_file "
+# File containing nodes
+nodes_file="nodes.txt"
+working_nodes_file="./tmp/working_nodes.txt"
+working_nodes_filtered_file="./tmp/working_nodes_filtered.txt"
 
+cmd_pssh="pssh -O StrictHostKeychecking=no -t $timeout -p $parallelism -v -l 
$username -h $working_nodes_filtered_file -P"
+cmd_pscp="pscp -O StrictHostKeychecking=no -p $parallelism -v -l $username -h 
$working_nodes_filtered_file "
+
 #deployment_dir="/home/tum_dht_testing/deploy"
 #
 #echo "Determenining working nodes ..."