bosh_vcloud_cpi 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a78d3ecf8e961821180d301cb22fcee8a6a3d2c
-  data.tar.gz: bc414b5280ac52c0addf1fe754830b3dd856369d
+  metadata.gz: 0c75f38d47794901287ec60ea31c0930390b3619
+  data.tar.gz: 82f2ef9fbf7ac32f5a5b63d6f953fb11b2f74f05
 SHA512:
-  metadata.gz: 3485a56c5d4b7046bcd301f82f8f76d21a7a460ec863e7175b65d6694957b23915976c66a64d916db51238021dd77d95169c856e30ba7a8b504dd984e322a114
-  data.tar.gz: 088ebb06315d9fe0432f17cb55a94a6fafbdfa6f4ff7ba0fe4882507dd1d447a62fb7b90d5d145929e768ded0ac38fa29205fa1a2b3b5ae0593b193d18c3e53e
+  metadata.gz: f63d6d3f03c6777c2c1a6f38c773a5720b369ce7dfd9a9e0aca4961a1eb1180b470c5cb8bd36d5d5211224ce21e41174b7e99a302e2b7049925ca72f96eec1c8
+  data.tar.gz: 2c1b57504536b4785e5a639c6cd69a8f9bf0851c2fb14d5895ec1f56a2961a91f4e2bc43806aaec0b3fd3311d3bd176c1da8e3d52d7d9821cdf09d2f377fcee1

data/lib/cloud/vcloud/steps/recompose.rb

@@ -12,6 +12,7 @@ module VCloudCloud
 
         # HACK: Workaround. recomposeLink is not available when vapp is running (so force construct the link)
         recompose_vapp_link = container_vapp.recompose_vapp_link true
+        state[:recompose_vapp_name] = name
         client.invoke_and_wait :post, recompose_vapp_link, :payload => params
       end
 
@@ -19,12 +20,15 @@ module VCloudCloud
         # The recompose method is only used in create_vm step.
         # The rollback logic here is to delete the new-created VM.
         vm = state[:vm]
-        if vm
+        vapp_name = state[:recompose_vapp_name]
+        if !vm.nil? && !vapp_name.nil?
           @logger.debug "Requesting VM: #{vm.name}"
 
           begin
-            entity = client.reload vm
-            link = entity.remove_link true
+            client.flush_cache
+            vapp = client.vapp_by_name vapp_name
+            target_vm = vapp.vms.find { |v| v.name == vm.name }
+            link = target_vm.remove_link true
             client.invoke_and_wait :delete, link if link
           rescue => ex
             @logger.debug(ex) if @logger
@@ -32,6 +36,7 @@ module VCloudCloud
 
           # remove the item from state
           state.delete :vm
+          state.delete :recompose_vapp_name
         end
       end
     end

data/lib/cloud/vcloud/version.rb

@@ -2,7 +2,7 @@ module Bosh
   module Clouds
 
     class VCloud
-      VERSION = '0.5.3'
+      VERSION = '0.5.4'
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -110,7 +110,7 @@ dependencies:
         version: 1.5.6
 description: |-
   BOSH vCloud CPI
-  dff08c
+  645f27
 email: support@cloudfoundry.com
 executables: []
 extensions: []