mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
using vcloud classes Model and Collection
This commit is contained in:
parent
50139e8621
commit
0f7234734d
3 changed files with 16 additions and 33 deletions
|
@ -120,7 +120,6 @@ module Fog
|
|||
super(attrs)
|
||||
lazy_load_attrs = self.class.attributes - attributes.keys
|
||||
lazy_load_attrs.each do |attr|
|
||||
puts "-#{attr}-"
|
||||
attributes[attr]= NonLoaded if attributes[attr].nil?
|
||||
make_lazy_load_method(attr)
|
||||
end
|
||||
|
@ -165,8 +164,7 @@ module Fog
|
|||
end
|
||||
|
||||
def get_everyone
|
||||
item_ids = item_list.map {|item| item[:id] }
|
||||
items = item_ids.map{ |item_id| get_by_id(item_id)}
|
||||
items = item_list.map {|item| get_by_id(item[:id]) }
|
||||
load(items)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -4,7 +4,7 @@ module Fog
|
|||
module Compute
|
||||
class Vcloudng
|
||||
|
||||
class CatalogItem < Fog::Model
|
||||
class CatalogItem < Model
|
||||
|
||||
identity :id
|
||||
|
||||
|
|
|
@ -5,41 +5,26 @@ module Fog
|
|||
module Compute
|
||||
class Vcloudng
|
||||
|
||||
class CatalogItems < Fog::Collection
|
||||
class CatalogItems < Collection
|
||||
model Fog::Compute::Vcloudng::CatalogItem
|
||||
|
||||
attribute :catalog
|
||||
|
||||
def index(catalog_id = catalog.id)
|
||||
catalog_item_links(catalog_id).map{ |catalog_item| new(catalog_item)}
|
||||
end
|
||||
|
||||
def all(catalog_id = catalog.id)
|
||||
catalog_item_ids = catalog_item_links(catalog_id).map {|catalog_item| catalog_item[:id] }
|
||||
catalog_item_ids.map{ |catalog_item_id| get(catalog_item_id)}
|
||||
end
|
||||
|
||||
def get(catalog_item_id)
|
||||
data = service.get_catalog_item(catalog_item_id).body
|
||||
data[:id] = data[:href].split('/').last
|
||||
data[:vapp_template_id] = data[:Entity][:href].split('/').last
|
||||
%w(:Link :Entity).each {|key_to_delete| data.delete(key_to_delete) }
|
||||
new(data)
|
||||
end
|
||||
|
||||
def get_by_name(catalog_item_name, catalog_id = catalog.id)
|
||||
catalog_item = catalog_item_links(catalog_id).detect{|cat_item_link| cat_item_link[:name] == catalog_item_name }
|
||||
return nil unless catalog_item
|
||||
get(catalog_item[:id])
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def catalog_item_links(catalog_id)
|
||||
data = service.get_catalog(catalog_id).body
|
||||
catalog_items = data[:CatalogItems][:CatalogItem].select { |link| link[:type] == "application/vnd.vmware.vcloud.catalogItem+xml" }
|
||||
catalog_items.each{|catalog_item| catalog_item[:id] = catalog_item[:href].split('/').last }
|
||||
catalog_items
|
||||
def item_list
|
||||
data = service.get_catalog(catalog.id).body
|
||||
items = data[:CatalogItems][:CatalogItem].select { |link| link[:type] == "application/vnd.vmware.vcloud.catalogItem+xml" }
|
||||
items.each{|item| service.add_id_from_href!(item) }
|
||||
items
|
||||
end
|
||||
|
||||
def get_by_id(item_id)
|
||||
item = service.get_catalog_item(item_id).body
|
||||
item[:vapp_template_id] = item[:Entity][:href].split('/').last
|
||||
%w(:Link :Entity).each {|key_to_delete| item.delete(key_to_delete) }
|
||||
service.add_id_from_href!(item)
|
||||
item
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue