From a471511073feb85db1dca881a492ffce74d5ca46 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 22 Feb 2011 18:59:40 +0100 Subject: [PATCH] feature #495: Change Sunstone file names --- src/sunstone/bin/sunstone-server | 102 ++++++++++++++++++ src/sunstone/config.ru | 2 +- src/sunstone/models/OpenNebulaJSON.rb | 23 ++-- .../models/OpenNebulaJSON/ClusterJSON.rb | 2 +- .../models/OpenNebulaJSON/HostJSON.rb | 2 +- .../models/OpenNebulaJSON/ImageJSON.rb | 2 +- .../models/OpenNebulaJSON/PoolJSON.rb | 2 +- .../models/OpenNebulaJSON/UserJSON.rb | 2 +- .../OpenNebulaJSON/VirtualMachineJSON.rb | 2 +- .../OpenNebulaJSON/VirtualNetworkJSON.rb | 2 +- .../models/{OneUI.rb => SunstoneServer.rb} | 0 .../{one-ui.rb => sunstone-server.rb} | 0 12 files changed, 119 insertions(+), 22 deletions(-) create mode 100644 src/sunstone/bin/sunstone-server rename src/sunstone/models/{OneUI.rb => SunstoneServer.rb} (100%) rename src/sunstone/{one-ui.rb => sunstone-server.rb} (100%) diff --git a/src/sunstone/bin/sunstone-server b/src/sunstone/bin/sunstone-server new file mode 100644 index 0000000000..5ac68703d0 --- /dev/null +++ b/src/sunstone/bin/sunstone-server @@ -0,0 +1,102 @@ +if [ -z "$ONE_LOCATION" ]; then + SUNSTONE_PID=/var/run/one/sunstone.pid + SUNSTONE_SERVER=/usr/lib/one/sunstone/config.ru + SUNSTONE_LOCK_FILE=/var/lock/one/.sunstone.lock + SUNSTONE_LOG=/var/log/one/sunstone.log +else + SUNSTONE_PID=$ONE_LOCATION/var/sunstone.pid + SUNSTONE_SERVER=$ONE_LOCATION/lib/sunstone/config.ru + SUNSTONE_LOCK_FILE=$ONE_LOCATION/var/.sunstone.lock + SUNSTONE_LOG=$ONE_LOCATION/var/sunstone.log +fi + +PORT="4567" +HOST="127.0.0.1" + +setup() +{ + + if [ -f $SUNSTONE_LOCK_FILE ]; then + if [ -f $SUNSTONE_PID ]; then + SUNSTONEPID=`cat $SUNSTONE_PID` + ps $SUNSTONEPID &> /dev/null + if [ $? -eq 0 ]; then + echo "Sunstone Server is still running (PID:$SUNSTONEPID). Please try 'sunstone-server stop' first." + exit 1 + fi + fi + echo "Stale .lock detected. Erasing it." + rm $SUNSTONE_LOCK_FILE + fi +} + + +start() +{ + if [ ! -f "$SUNSTONE_SERVER" ]; then + echo "Can not find $SUNSTONE_SERVER." + exit 1 + fi + + # Start the sunstone daemon + touch $SUNSTONE_LOCK_FILE + rackup $SUNSTONE_SERVER -s thin -p $PORT -o $HOST -P $SUNSTONE_PID &> $SUNSTONE_LOG & + + LASTRC=$? + + if [ $LASTRC -ne 0 ]; then + echo "Error executing $SUNSTONE_SERVER" + exit 1 + fi + + sleep 1 + ps $LASTPID &> /dev/null + + if [ $? -ne 0 ]; then + echo "Error executing $SUNSTONE_SERVER." + exit 1 + fi + + echo "sunstone-server started" +} + +# +# Function that stops the daemon/service +# +stop() +{ + if [ ! -f $SUNSTONE_PID ]; then + echo "Couldn't find sunstone-server process pid." + exit 1 + fi + + # Kill the sunstone daemon + kill -INT `cat $SUNSTONE_PID` &> /dev/null + + echo "sunstone-server stopped" +} + +while getopts "p:h:" OPTION +do + case $OPTION in + p) PORT=$OPTARG;; + h) HOST=$OPTARG;; + \?) echo "Invalid option: -$OPTARG" >&2; exit 3 ;; + esac +done + +shift $((OPTIND-1)) + +case "$1" in + start) + setup + start + ;; + stop) + stop + ;; + *) + echo "Usage: sunstone {start|stop}" >&2 + exit 3 + ;; +esac \ No newline at end of file diff --git a/src/sunstone/config.ru b/src/sunstone/config.ru index a7034811d0..8b695e23af 100644 --- a/src/sunstone/config.ru +++ b/src/sunstone/config.ru @@ -19,6 +19,6 @@ # TBD Change path for intallation tree $: << File.dirname(__FILE__) -require 'one-ui.rb' +require 'sunstone-server.rb' run Sinatra::Application diff --git a/src/sunstone/models/OpenNebulaJSON.rb b/src/sunstone/models/OpenNebulaJSON.rb index 28821ef8e1..51e2478221 100644 --- a/src/sunstone/models/OpenNebulaJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON.rb @@ -18,29 +18,24 @@ ONE_LOCATION = ENV["ONE_LOCATION"] if !ONE_LOCATION RUBY_LIB_LOCATION = "/usr/lib/one/ruby" - VAR_LOCATION = "/var/lib/one" else RUBY_LIB_LOCATION = ONE_LOCATION+"/lib/ruby" - VAR_LOCATION = ONE_LOCATION+"/var" end $: << RUBY_LIB_LOCATION +$: << File.dirname(__FILE__) require 'OpenNebula' include OpenNebula -# TBD Change path for intallation tree -#require 'OpenNebulaJSON/PoolJSON' -#require 'OpenNebulaJSON/HostJSON' -#require 'OpenNebulaJSON/JSONUtils' -require 'models/OpenNebulaJSON/ClusterJSON' -require 'models/OpenNebulaJSON/HostJSON' -require 'models/OpenNebulaJSON/ImageJSON' -require 'models/OpenNebulaJSON/JSONUtils' -require 'models/OpenNebulaJSON/PoolJSON' -require 'models/OpenNebulaJSON/UserJSON' -require 'models/OpenNebulaJSON/VirtualMachineJSON' -require 'models/OpenNebulaJSON/VirtualNetworkJSON' +require 'OpenNebulaJSON/ClusterJSON' +require 'OpenNebulaJSON/HostJSON' +require 'OpenNebulaJSON/ImageJSON' +require 'OpenNebulaJSON/JSONUtils' +require 'OpenNebulaJSON/PoolJSON' +require 'OpenNebulaJSON/UserJSON' +require 'OpenNebulaJSON/VirtualMachineJSON' +require 'OpenNebulaJSON/VirtualNetworkJSON' module OpenNebula class Error diff --git a/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb b/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb index 9c015d0187..a8dbc44635 100644 --- a/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb @@ -14,7 +14,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -require 'models/OpenNebulaJSON/JSONUtils' +require 'OpenNebulaJSON/JSONUtils' module OpenNebulaJSON class ClusterJSON < OpenNebula::Cluster diff --git a/src/sunstone/models/OpenNebulaJSON/HostJSON.rb b/src/sunstone/models/OpenNebulaJSON/HostJSON.rb index 42490d405a..33f8962f6a 100644 --- a/src/sunstone/models/OpenNebulaJSON/HostJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/HostJSON.rb @@ -14,7 +14,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -require 'models/OpenNebulaJSON/JSONUtils' +require 'OpenNebulaJSON/JSONUtils' module OpenNebulaJSON class HostJSON < OpenNebula::Host diff --git a/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb b/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb index 05cb041d21..36ddb98790 100644 --- a/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb @@ -14,7 +14,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -require 'models/OpenNebulaJSON/JSONUtils' +require 'OpenNebulaJSON/JSONUtils' module OpenNebulaJSON class ImageJSON < OpenNebula::Image diff --git a/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb b/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb index 4c4414200d..d32241c5d7 100644 --- a/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb @@ -14,7 +14,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -require 'models/OpenNebulaJSON/JSONUtils' +require 'OpenNebulaJSON/JSONUtils' module OpenNebulaJSON class HostPoolJSON < OpenNebula::HostPool; include JSONUtils; end diff --git a/src/sunstone/models/OpenNebulaJSON/UserJSON.rb b/src/sunstone/models/OpenNebulaJSON/UserJSON.rb index 803903641f..1a17e93a6d 100644 --- a/src/sunstone/models/OpenNebulaJSON/UserJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/UserJSON.rb @@ -14,7 +14,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -require 'models/OpenNebulaJSON/JSONUtils' +require 'OpenNebulaJSON/JSONUtils' module OpenNebulaJSON class UserJSON < OpenNebula::User diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb index 932b54a97b..3bdc57eeaa 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb @@ -14,7 +14,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -require 'models/OpenNebulaJSON/JSONUtils' +require 'OpenNebulaJSON/JSONUtils' module OpenNebulaJSON class VirtualMachineJSON < OpenNebula::VirtualMachine diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb index 3170dd1607..b4e7503dbb 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb @@ -14,7 +14,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -require 'models/OpenNebulaJSON/JSONUtils' +require 'OpenNebulaJSON/JSONUtils' module OpenNebulaJSON class VirtualNetworkJSON < OpenNebula::VirtualNetwork diff --git a/src/sunstone/models/OneUI.rb b/src/sunstone/models/SunstoneServer.rb similarity index 100% rename from src/sunstone/models/OneUI.rb rename to src/sunstone/models/SunstoneServer.rb diff --git a/src/sunstone/one-ui.rb b/src/sunstone/sunstone-server.rb similarity index 100% rename from src/sunstone/one-ui.rb rename to src/sunstone/sunstone-server.rb