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

feature #1383: Check if item key exists in describe* commands

Browse Source
This commit is contained in:
Daniel Molina 2012-10-01 15:36:50 +02:00
parent d5aa8b1fd9
commit db7326bc0f
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cloud/ec2/bin/econe-describe-addresses
View File

@ -74,7 +74,13 @@ CommandParser::CmdParser.new(ARGV) do
if CloudClient::is_error?(rc)
exit_with_code -1, "#{cmd_name}: #{rc.message}"
else
TABLE.show(rc['addressesSet']['item'] || [])
if rc.empty? || rc['addressesSet'].nil? || rc['addressesSet']['item'].nil?
addrs = []
else
addrs = rc['addressesSet']['item']
end
TABLE.show(addrs)
exit_with_code 0
end
end

8
src/cloud/ec2/bin/econe-describe-images
View File

@ -86,7 +86,13 @@ used with an OpenNebula Cloud."
if CloudClient::is_error?(rc)
exit_with_code -1, "#{cmd_name}: #{rc.message}"
else
TABLE.show(rc['imagesSet']['item'] || [])
if rc.empty? || rc['imagesSet'].nil? || rc['imagesSet']['item'].nil?
imgs = []
else
imgs = rc['imagesSet']['item']
end
TABLE.show(imgs)
exit_with_code 0
end
end

10
src/cloud/ec2/bin/econe-describe-instances
View File

@ -84,7 +84,15 @@ CommandParser::CmdParser.new(ARGV) do
if CloudClient::is_error?(rc)
exit_with_code -1, "#{cmd_name}: #{rc.message}"
else
TABLE.show(rc['reservationSet']['item'][0]['instancesSet']['item'] || [])
if rc.empty? ||
rc['reservationSet']['item'][0]['instancesSet'].nil? ||
rc['reservationSet']['item'][0]['instancesSet']['item'].nil?
insts = []
else
insts = rc['reservationSet']['item'][0]['instancesSet']['item']
end
TABLE.show(insts)
exit_with_code 0
end
end