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

feature #2371: fix bug returning errors from get_hash

Browse Source
This commit is contained in:
Javi Fontan 2014-01-28 15:59:45 +01:00
parent d6cfb50606
commit e3d868e36a
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cli/one_helper.rb
View File

@ -367,17 +367,17 @@ EOT
if top
table.top(options) {
array=pool_to_array(pool.get_hash)
if OpenNebula.is_error?(array)
STDERR.puts array.mesage
exit(-1)
end
array
array=pool.get_hash
return -1, array.message if OpenNebula.is_error?(array)
pool_to_array(array)
}
else
array=pool_to_array(pool.get_hash)
array=pool.get_hash
return -1, array.message if OpenNebula.is_error?(array)
array=pool_to_array(array)
if options[:ids]
array=array.select do |element|
options[:ids].include? element['ID'].to_i

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

@ -175,7 +175,10 @@ module OpenNebula
if OpenNebula.pool_page_size && allow_paginated &&
( ( size && size >= 2 ) || !size )
size = OpenNebula.pool_page_size if !size
{ @pool_name => { @element_name => info_paginated(size) } }
hash=info_paginated(size)
return hash if OpenNebula.is_error?(hash)
{ @pool_name => { @element_name => hash } }
else
rc=info
return rc if OpenNebula.is_error?(rc)