From 1452f59f5cb04335842193616b851b902e5101be Mon Sep 17 00:00:00 2001 From: Jan Orel Date: Wed, 1 Apr 2020 11:25:42 +0200 Subject: [PATCH] M #~: Fix typo (#4462) --- src/cli/onevm | 9 ++++++--- src/oca/ruby/opennebula/pool.rb | 2 +- src/oca/ruby/opennebula/virtual_machine.rb | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/cli/onevm b/src/cli/onevm index 17f59dcb3c..1d0d37f1db 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -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 diff --git a/src/oca/ruby/opennebula/pool.rb b/src/oca/ruby/opennebula/pool.rb index 929430725a..77b0d05721 100644 --- a/src/oca/ruby/opennebula/pool.rb +++ b/src/oca/ruby/opennebula/pool.rb @@ -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 diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb index d119b1ebbb..e5c129fa57 100644 --- a/src/oca/ruby/opennebula/virtual_machine.rb +++ b/src/oca/ruby/opennebula/virtual_machine.rb @@ -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"]] # } #