require 'fog/core/collection'
require 'fog/vcloud_director/models/compute/vapp'

module Fog
  module Compute
    class VcloudDirector
      class Vapps < Collection

        include Fog::VcloudDirector::Query

        model Fog::Compute::VcloudDirector::Vapp

        attribute :vdc

        def query_type
          "vApp"
        end

        private

        def get_by_id(item_id)
          item = service.get_vapp(item_id).body
          %w(:Link).each {|key_to_delete| item.delete(key_to_delete) }
          service.add_id_from_href!(item)
          item
        end

        def item_list
          data = service.get_vdc(vdc.id).body
          return [] if data[:ResourceEntities].empty?
          resource_entities = data[:ResourceEntities][:ResourceEntity]
          items = resource_entities.select { |link| link[:type] == "application/vnd.vmware.vcloud.vApp+xml" }
          items.each{|item| service.add_id_from_href!(item) }
          items
        end
      end
    end
  end
end

require 'fog/core/collection'
require 'fog/vcloud_director/models/compute/vapp'

module Fog
  module Compute
    class VcloudDirector
      class Vapps < Collection

        include Fog::VcloudDirector::Query

        model Fog::Compute::VcloudDirector::Vapp

        attribute :vdc

        def query_type
          "vApp"
        end

        private

        def get_by_id(item_id)
          item = service.get_vapp(item_id).body
          %w(:Link).each {|key_to_delete| item.delete(key_to_delete) }
          service.add_id_from_href!(item)
          item[:Description] ||= ""
          item
        end

        def item_list
          data = service.get_vdc(vdc.id).body
          return [] if data[:ResourceEntities].empty?
          resource_entities = data[:ResourceEntities][:ResourceEntity]
          items = resource_entities.select { |link| link[:type] == "application/vnd.vmware.vcloud.vApp+xml" }
          items.each{|item| service.add_id_from_href!(item) }
          items
        end
      end
    end
  end
end

Fix failing test -- Description is optional
Fix failing test -- Description is optional

The :Description field is optional on vApps, and if not specified it plays havoc
with lazy loading -- the attribute stays in NonLoaded state, which in turn means
the object gets reloaded unneccessarily. This fixes that behaviour by simply setting
a default, blank, description
