shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Merge branch 'bug-1123'

Browse Source 
Conflicts:
	src/sunstone/models/SunstoneServer.rb
This commit is contained in:
Ruben S. Montero 2012-02-17 12:30:35 +01:00
commit d2adccbc51
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sunstone/models/SunstoneServer.rb
View File

@ -231,7 +231,7 @@ class SunstoneServer
############################################################################
#
############################################################################
def get_monitoring(id, resource, monitor_resources, gid)
def get_monitoring(id, resource, monitor_resources, opts={})
watch_client = case resource
when "vm","VM"
OneWatchClient::VmWatchClient.new
@ -242,13 +242,16 @@ class SunstoneServer
return [200, error.to_json]
end
filter = {}
filter[:uid] = opts[:uid] if opts[:gid]!="0"
columns = monitor_resources.split(',')
columns.map!{|e| e.to_sym}
if id
rc = watch_client.resource_monitoring(id.to_i, columns)
rc = watch_client.resource_monitoring(id.to_i, columns, filter)
else
rc = watch_client.total_monitoring(columns)
rc = watch_client.total_monitoring(columns, filter)
end
if rc.nil?

6
src/sunstone/sunstone-server.rb
View File

@ -269,7 +269,8 @@ get '/:resource/monitor' do
nil,
params[:resource],
params[:monitor_resources],
session[:user_gid])
:uid => session[:user_id],
:gid => session[:user_gid])
end
get '/:resource/:id/monitor' do
@ -277,7 +278,8 @@ get '/:resource/:id/monitor' do
params[:id],
params[:resource],
params[:monitor_resources],
session[:user_gid])
:uid => session[:user_id],
:gid => session[:user_gid])
end