From e32ecf77273db70513661798e07f268ff86ab614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantino=20V=C3=A1zquez=20Blanco?= Date: Mon, 5 Oct 2009 17:06:56 +0000 Subject: [PATCH] Fixing zero element pool listing git-svn-id: http://svn.opennebula.org/one/trunk@812 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/cloud/occi/lib/VirtualMachinePoolOCCI.rb | 13 ++++++++----- src/cloud/occi/lib/VirtualNetworkPoolOCCI.rb | 12 +++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/cloud/occi/lib/VirtualMachinePoolOCCI.rb b/src/cloud/occi/lib/VirtualMachinePoolOCCI.rb index bab2a7a4bf..d094f12976 100755 --- a/src/cloud/occi/lib/VirtualMachinePoolOCCI.rb +++ b/src/cloud/occi/lib/VirtualMachinePoolOCCI.rb @@ -9,12 +9,15 @@ class VirtualMachinePoolOCCI < VirtualMachinePool pool_hash=Crack::XML.parse(to_xml) occi_xml = "" - vmlist=[pool_hash['VM_POOL']['VM']].flatten + if pool_hash['VM_POOL'] != nil + vmlist=[pool_hash['VM_POOL']['VM']].flatten + + vmlist.each{|vm| + occi_xml+='' + } + end - vmlist.each{|vm| - occi_xml+='' - } occi_xml += "" end end diff --git a/src/cloud/occi/lib/VirtualNetworkPoolOCCI.rb b/src/cloud/occi/lib/VirtualNetworkPoolOCCI.rb index 44b0d44aac..d3a6a96d31 100644 --- a/src/cloud/occi/lib/VirtualNetworkPoolOCCI.rb +++ b/src/cloud/occi/lib/VirtualNetworkPoolOCCI.rb @@ -9,12 +9,14 @@ class VirtualNetworkPoolOCCI < VirtualNetworkPool network_pool_hash=Crack::XML.parse(to_xml) occi_xml = "" - vnlist=[pool_hash['VNET_POOL']['VNET']].flatten + if network_pool_hash['VM_POOL'] != nil + vnlist=[network_pool_hash['VNET_POOL']['VNET']].flatten - vnlist.each{|network| - occi_xml+='' - } + vnlist.each{|network| + occi_xml+='' + } + end occi_xml += "" end