-
-
Save dmamolina/32e9fe8a426b9b26e82e to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb | |
index 964d5fd..4f26d5b 100755 | |
--- a/src/sunstone/sunstone-server.rb | |
+++ b/src/sunstone/sunstone-server.rb | |
@@ -498,8 +498,8 @@ get '/infrastructure' do | |
[200, infrastructure.to_json] | |
end | |
-get '/vm/:id/log' do | |
- @SunstoneServer.get_vm_log(params[:id]) | |
+get '/vm/:rid/log' do | |
+ @SunstoneServer.get_vm_log(params[:rid]) | |
end | |
############################################################################## | |
@@ -512,18 +512,18 @@ get '/:resource/monitor' do | |
params[:monitor_resources]) | |
end | |
-get '/user/:id/monitor' do | |
+get '/user/:rid/monitor' do | |
@SunstoneServer.get_user_accounting(params) | |
end | |
-get '/group/:id/monitor' do | |
- params[:gid] = params[:id] | |
+get '/group/:rid/monitor' do | |
+ params[:gid] = params[:rid] | |
@SunstoneServer.get_user_accounting(params) | |
end | |
-get '/:resource/:id/monitor' do | |
+get '/:resource/:rid/monitor' do | |
@SunstoneServer.get_resource_monitoring( | |
- params[:id], | |
+ params[:rid], | |
params[:resource], | |
params[:monitor_resources]) | |
end | |
@@ -551,8 +551,8 @@ get '/marketplace' do | |
@SunstoneServer.get_appliance_pool | |
end | |
-get '/marketplace/:id' do | |
- @SunstoneServer.get_appliance(params[:id]) | |
+get '/marketplace/:rid' do | |
+ @SunstoneServer.get_appliance(params[:rid]) | |
end | |
############################################################################## | |
@@ -581,23 +581,23 @@ end | |
# GET Resource information | |
############################################################################## | |
-get '/:resource/:id/template' do | |
- @SunstoneServer.get_template(params[:resource], params[:id]) | |
+get '/:resource/:rid/template' do | |
+ @SunstoneServer.get_template(params[:resource], params[:rid]) | |
end | |
-get '/:resource/:id' do | |
+get '/:resource/:rid' do | |
if params[:extended] | |
- @SunstoneServer.get_resource(params[:resource], params[:id], true) | |
+ @SunstoneServer.get_resource(params[:resource], params[:rid], true) | |
else | |
- @SunstoneServer.get_resource(params[:resource], params[:id]) | |
+ @SunstoneServer.get_resource(params[:resource], params[:rid]) | |
end | |
end | |
############################################################################## | |
# Delete Resource | |
############################################################################## | |
-delete '/:resource/:id' do | |
- @SunstoneServer.delete_resource(params[:resource], params[:id]) | |
+delete '/:resource/:rid' do | |
+ @SunstoneServer.delete_resource(params[:resource], params[:rid]) | |
end | |
############################################################################## | |
@@ -673,17 +673,17 @@ end | |
############################################################################## | |
# Start VNC Session for a target VM | |
############################################################################## | |
-post '/vm/:id/startvnc' do | |
- vm_id = params[:id] | |
+post '/vm/:rid/startvnc' do | |
+ vm_id = params[:rid] | |
@SunstoneServer.startvnc(vm_id, $vnc) | |
end | |
############################################################################## | |
# Perform an action on a Resource | |
############################################################################## | |
-post '/:resource/:id/action' do | |
+post '/:resource/:rid/action' do | |
@SunstoneServer.perform_action(params[:resource], | |
- params[:id], | |
+ params[:rid], | |
@request_body) | |
end |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment