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

M #~: Fix typo (#4462)

Browse Source
This commit is contained in:
Jan Orel 2020-04-01 11:25:42 +02:00 committed by GitHub
parent ce388212f5
commit 1452f59f5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cli/onevm
View File

@ -1007,7 +1007,8 @@ CommandParser::CmdParser.new(ARGV) do
helper.schedule_actions([args[0]], options, @comm_name)
else
helper.perform_action(args[0], options, 'disk snapshot created') do |o|
helper.perform_action(args[0], options,
'disk snapshot created') do |o|
o.disk_snapshot_create(args[1].to_i, args[2])
end
end
@ -1033,7 +1034,8 @@ CommandParser::CmdParser.new(ARGV) do
helper.schedule_actions([args[0]], options, @comm_name)
else
helper.perform_action(args[0], options, 'disk snapshot reverted') do |o|
helper.perform_action(args[0], options,
'disk snapshot reverted') do |o|
o.disk_snapshot_revert(args[1].to_i, args[2].to_i)
end
end
@ -1059,7 +1061,8 @@ CommandParser::CmdParser.new(ARGV) do
helper.schedule_actions([args[0]], options, @comm_name)
else
helper.perform_action(args[0], options, 'disk snapshot deleted') do |o|
helper.perform_action(args[0], options,
'disk snapshot deleted') do |o|
o.disk_snapshot_delete(args[1].to_i, args[2].to_i)
end
end

2
src/oca/ruby/opennebula/pool.rb
View File

@ -112,7 +112,7 @@ module OpenNebula
hash = {}
# Get all existing Object IDs
ids = xmldoc.retrieve_elements("#{root_elem}/ID")
ids = xmldoc.retrieve_elements('/MONITORING_DATA/MONITORING/ID')
if ids.nil?
return hash

6
src/oca/ruby/opennebula/virtual_machine.rb
View File

@ -560,12 +560,12 @@ module OpenNebula
# the requested xpath expressions, and an Array of 'timestamp, value'.
#
# @example
# vm.monitoring( ['MONITORING/CPU', 'MONITORING/NETTX'] )
# vm.monitoring( ['CPU', 'NETTX'] )
#
# {
# "MONITORING/CPU"=>[["1435085098", "47"], ["1435085253", "5"],
# "CPU"=>[["1435085098", "47"], ["1435085253", "5"],
# ["1435085410", "48"], ["1435085566", "3"], ["1435088136", "2"]],
# "MONITORING/NETTX"=>[["1435085098", "0"], ["1435085253", "50"],
# "NETTX"=>[["1435085098", "0"], ["1435085253", "50"],
# ["1435085410", "50"], ["1435085566", "50"], ["1435085723", "50"]]
# }
#