Cherry-pick from https://gerrit.onos.onlab.us/#/c/68/
Revise onos.py for ramcloud branch
issue: ONOS-959
Conflicts:
start-rest.sh
NOTE: The above conflict has been resolved by hand.
In the process, minor refactoring/editing was done
for consistency with the rest of the scripts:
ONOSDIR -> ONOS_HOME
NOTE2: Fixed few issues in file vm-utils/onos.py that are related
to RAMCloud:
- Fixed the path to the RAMCloud ramcloud.conf configuration file
- Fixed the path to the RAMCloud daemon.
NOTE3: Fixed the modules list as set in baseModule in file vm-utils/onos.py
to reflect the dev/ramcloud-new-datamodel list.
NOTE4: Changed the file permission of vm-utils/onos.py so it is executable.
Change-Id: I4e245f694f9ed4182b49410707d214a2d6a056de
diff --git a/start-rest.sh b/start-rest.sh
index a79a415..92a14da 100755
--- a/start-rest.sh
+++ b/start-rest.sh
@@ -1,13 +1,13 @@
#! /bin/bash
# Change this accordingly
-ONOSDIR=${ONOS_HOME:-${HOME}/ONOS}
+ONOS_HOME=${ONOS_HOME:-${HOME}/ONOS}
script_name="topology_rest.py"
#######################
-WEBDIR=${ONOSDIR}/web
+WEBDIR=${ONOS_HOME}/web
restscript=${WEBDIR}/$script_name
-LOGDIR=${ONOS_LOGDIR:-${ONOSDIR}/onos-logs}
+LOGDIR=${ONOS_LOGDIR:-${ONOS_HOME}/onos-logs}
REST_LOG="${LOGDIR}/rest.`hostname`.log"
#######################