Merge branch 'master' of github.com:OPENNETWORKINGLAB/ONOS into maven
diff --git a/cluster-mgmt/bin/func.sh b/cluster-mgmt/bin/func.sh
index 9785e66..b6f4c1e 100755
--- a/cluster-mgmt/bin/func.sh
+++ b/cluster-mgmt/bin/func.sh
@@ -75,6 +75,32 @@
sleep 1
done
;;
+ bootup)
+ echo "Removing old Cassandra data and logs"
+ dsh -g ${basename} "rm -rf /var/lib/cassandra/*"
+ dsh -g ${basename} "rm -rf /var/log/cassandra/*"
+
+ echo "Starting Cassandra nodes one by one..."
+ for (( c=1; c<=$nr_nodes; c++ ))
+ do
+ echo "Starting node ${basename}${c}"
+ dsh -g ${basename} -w ${basename}${c} "cd $ONOS_DIR; ./start-cassandra.sh start"
+
+ #Wait until it's up
+ while [ 1 ]; do
+ echo $$
+ dsh -w ${basename}1 "cd $ONOS_DIR; ./start-cassandra.sh status" > .cassandra_check.$$
+ cat .cassandra_check.$$
+ nup=`cat .cassandra_check.$$ | grep Normal |grep Up| wc -l`
+ if [ $nup == $c ]; then
+ echo "New node up: $nup up of of $nr_nodes"
+ break;
+ fi
+ echo "Waiting for new node to come up: $nup up of of $nr_nodes"
+ sleep 5
+ done
+ done
+ ;;
stop)
echo "Stopping Cassandra.."
dsh -g ${basename} "cd $ONOS_DIR; ./start-cassandra.sh stop"
diff --git a/scripts/run-onos-simple.sh b/scripts/run-onos-simple.sh
deleted file mode 100755
index d288158..0000000
--- a/scripts/run-onos-simple.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-basedir=`dirname $0`
-onosdir="${basedir}/.."
-
-logfile="${onosdir}/logback.xml"
-jarfile="${onosdir}/target/floodlight-only.jar"
-classpath="${jarfile}:${onosdir}/lib/*:${onosdir}/lib/titan/*"
-mainclass="net.floodlightcontroller.core.Main"
-propfile="${onosdir}/onos.properties"
-
-#java -Dlogback.configurationFile=logback.xml -cp target/floodlight-only.jar:lib/*:lib/titan/* net.floodlightcontroller.core.Main -cf onos.properties
-#java -Dlogback.configurationFile=${logfile} -cp ${classpath} ${mainclass} -cf ${propfile}
-mvn -f ${onosdir}/pom.xml exec:exec -Dexec.executable="java" -Dexec.args="-Dlogback.configurationFile=${logfile} -cp %classpath ${mainclass} -cf ${propfile}"