Merge branch 'master' of github.com:OPENNETWORKINGLAB/ONOS
diff --git a/cluster-mgmt/cp-config.sh b/cluster-mgmt/cp-config.sh
index 27213d9..e3b2108 100755
--- a/cluster-mgmt/cp-config.sh
+++ b/cluster-mgmt/cp-config.sh
@@ -7,14 +7,14 @@
SSH_COPY="authorized_keys id_rsa id_rsa.pub known_hosts onlab-gui.pem onlabkey.pem"
-if [ $# == 2 ]; then
- NR_NODES=$1
- basename=$2
-else
- echo "$0 nr_nodes basename"
+if [ x$ONOS_CLUSTER_BASENAME == "x" -o x$ONOS_CLUSTER_NR_NODES == "x" ]; then
+ echo "set environment variable ONOS_CLUSTER_BASENAME and ONOS_CLUSTER_NR_NODES"
exit
fi
+basename=$ONOS_CLUSTER_BASENAME
+NR_NODES=$ONOS_CLUSTER_NR_NODES
+
dsh -g $basename 'uname -a'
echo "Stopping Services"
@@ -55,9 +55,9 @@
dsh -g $basename 'sudo hostname `cat /etc/hostname`'
-for n in `seq 2 $NR_NODES`; do
- pcp -w ${basename}${n} ${basename}${n}/onsdemo_edge.py 'ONOS/test-network/mininet'
- pcp -w ${basename}${n} ${basename}${n}/tunnel_onos_edge.sh 'ONOS/test-network/mininet'
-done
-pcp -w ${basename}1 ${basename}1/tunnel_onos_core.sh 'ONOS/test-network/mininet'
-pcp -w ${basename}1 ${basename}1/onsdemo_core.py 'ONOS/test-network/mininet'
+#for n in `seq 2 $NR_NODES`; do
+# pcp -w ${basename}${n} ${basename}${n}/onsdemo_edge.py 'ONOS/test-network/mininet'
+# pcp -w ${basename}${n} ${basename}${n}/tunnel_onos_edge.sh 'ONOS/test-network/mininet'
+#done
+#pcp -w ${basename}1 ${basename}1/tunnel_onos_core.sh 'ONOS/test-network/mininet'
+#pcp -w ${basename}1 ${basename}1/onsdemo_core.py 'ONOS/test-network/mininet'
diff --git a/cluster-mgmt/cp-mininet.sh b/cluster-mgmt/cp-mininet.sh
index bdfb6d8..b7307c0 100755
--- a/cluster-mgmt/cp-mininet.sh
+++ b/cluster-mgmt/cp-mininet.sh
@@ -5,14 +5,14 @@
ZK_LIB='/var/lib/zookeeper'
CASSANDRA_LIB='/var/lib/cassandra'
-if [ $# == 2 ]; then
- NR_NODES=$1
- basename=$2
-else
- echo "$0 nr_nodes basename"
+if [ x$ONOS_CLUSTER_BASENAME == "x" -o x$ONOS_CLUSTER_NR_NODES == "x" ]; then
+ echo "set environment variable ONOS_CLUSTER_BASENAME and ONOS_CLUSTER_NR_NODES"
exit
fi
+basename=$ONOS_CLUSTER_BASENAME
+NR_NODES=$ONOS_CLUSTER_NR_NODES
+
dsh -g $basename 'uname -a'
for n in `seq 1 $NR_NODES`; do
diff --git a/cluster-mgmt/make-config.sh b/cluster-mgmt/make-config.sh
index 0099e82..5e0794f 100755
--- a/cluster-mgmt/make-config.sh
+++ b/cluster-mgmt/make-config.sh
@@ -1,14 +1,17 @@
#! /bin/bash
USERNAME=ubuntu
-if [ $# == 3 ]; then
- NR_NODES=$1
- basename=$2
- hosts_file=$3
-else
- echo "$0 nr_hodes basename hostfile"
+if [ x$ONOS_CLUSTER_BASENAME == "x" -o x$ONOS_CLUSTER_NR_NODES == "x" ]; then
+ echo "set environment variable ONOS_CLUSTER_BASENAME and ONOS_CLUSTER_NR_NODES"
+ exit
+elif [ $# != 1 ]; then
+ echo "$0 hostfile"
exit
fi
+basename=$ONOS_CLUSTER_BASENAME
+NR_NODES=$ONOS_CLUSTER_NR_NODES
+hosts_file=$1
+
for n in `seq 1 $NR_NODES`; do
rm -rf ${basename}${n}
mkdir ${basename}${n}
diff --git a/cluster-mgmt/start-mininet.sh b/cluster-mgmt/start-mininet.sh
index 4fb8531..e226c39 100755
--- a/cluster-mgmt/start-mininet.sh
+++ b/cluster-mgmt/start-mininet.sh
@@ -5,13 +5,14 @@
ZK_LIB='/var/lib/zookeeper'
CASSANDRA_LIB='/var/lib/cassandra'
-if [ $# == 1 ]; then
- basename=$1
-else
- echo "$0 basename"
+if [ x$ONOS_CLUSTER_BASENAME == "x" -o x$ONOS_CLUSTER_NR_NODES == "x" ]; then
+ echo "set environment variable ONOS_CLUSTER_BASENAME and ONOS_CLUSTER_NR_NODES"
exit
fi
+basename=$ONOS_CLUSTER_BASENAME
+NR_NODES=$ONOS_CLUSTER_NR_NODES
+
dsh -g $basename 'uname -a'
dsh -g ${basename} 'cd ONOS/test-network/mininet; ./tunnel_onsdemo.sh start'