fog-vcloud-director 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ec20f44fe7e72eaf434b28549b021ec6339a543
-  data.tar.gz: 6d2f576b46b4b6dbec88d63179e04fbef82307e1
+  metadata.gz: 514a98d2a454438da4fe30d96a6d0cdad5c887bc
+  data.tar.gz: 5ce51eedb33d580d41edc21112a4173816cdc7b9
 SHA512:
-  metadata.gz: b727d8661f9216de28e9bf3b3f55faf78fc51fa3a292f9d28874f505a32d0ab8e8e0a5723a5188eedf03283d69029a3a062072932b6e3e03557031699e8e96ef
-  data.tar.gz: 99b56d01ca702bf9cc7bdf04eed389ae252f9973d2e8e0b76f3fdc45a3d6dab119c6671442332e94702839c8483c2ce0cd21cd9b8dafeaeb21eef907df5e3ac4
+  metadata.gz: 8fd4c6491d595e78692a39086e54a13d2f20e031d9f1d9b49bfaeafb11cc9505c76166c78d965bff459d65b0f5490d094a01c781b203b7886f351d9a9271a8a2
+  data.tar.gz: 78a26f8829d2843dbd51bb6922ef13ab66b396c28ec1e88c1c6ce722c0ab8fea0505bd14ace2e7c040ca46ccbb07ef29182ef38d7afcb3513d162944d4aa100e

data/lib/fog/vcloud_director/compute.rb

@@ -380,6 +380,19 @@ module Fog
           @connection.reset
         end
 
+        def instantiate_template(options)
+          vapp_template_id = options[:template]
+          vapp_name        = options[:stack_name]
+
+          # Remove unneeded options.
+          options.delete(:template)
+          options.delete(:stack_name)
+
+          response = instantiate_vapp_template(vapp_name, vapp_template_id, options)
+          process_task(response.body[:Tasks][:Task])
+          response.body[:href].split('/').last # returns the vapp_id if it was instantiated successfully.
+        end
+
         def request(params)
           begin
             do_request(params)

data/lib/fog/vcloud_director/models/compute/catalogs.rb

@@ -1,5 +1,6 @@
 require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/catalog'
+require 'fog/vcloud_director/models/compute/catalog_item'
 
 module Fog
   module Compute
@@ -9,6 +10,13 @@ module Fog
 
         attribute :organization
 
+        def get_single_catalog_item(item_id)
+          item = service.get_catalog_item(item_id).body
+          return nil unless item
+          item[:vapp_template_id] = item[:Entity][:href].split('/').last
+          Fog::Compute::VcloudDirector::CatalogItem.new(item.merge({ :service => service, :collection => [] }))
+        end
+
         private
 
         def get_by_id(item_id)

data/lib/fog/vcloud_director/models/compute/vapps.rb

@@ -19,6 +19,8 @@ module Fog
         def get_single_vapp(vapp_id)
           item = service.get_vapp(vapp_id).body
           return nil unless item
+          %w(:Link).each {|key_to_delete| item.delete(key_to_delete) }
+          service.add_id_from_href!(item)
           new(item)
         end
 

data/lib/fog/vcloud_director/requests/compute/instantiate_vapp_template.rb

@@ -47,15 +47,15 @@ module Fog
         def generate_instantiate_vapp_template_request(options ={})        
           
           #overriding some params so they work with new standardised generator
-          options[:InstantiationParams] = 
-          {
-            :NetworkConfig => 
-              [{
-              :networkName => options[:network_name],
-              :networkHref => options[:network_uri],
-              :fenceMode => 'bridged'
-              }]
-          } unless options[:InstantiationParams]
+          # options[:InstantiationParams] =
+          # {
+          #   :NetworkConfig =>
+          #     [{
+          #     :networkName => options[:network_name],
+          #     :networkHref => options[:network_uri],
+          #     :fenceMode => 'bridged'
+          #     }]
+          # } unless options[:InstantiationParams]
           options[:name] = options.delete(:vapp_name) if options[:vapp_name]
           options[:Description] = options.delete(:description) unless options[:Description]
           if options[:vms_config] then

data/lib/fog/vcloud_director/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module VcloudDirector
-    VERSION = "0.1.5".freeze
+    VERSION = "0.1.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vcloud-director
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Luka Zakrajšek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core