bosh_vcloud_cpi 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4d97d94d84c1a9a705a9ba642388c1f47b34cf7
-  data.tar.gz: 34d48cd6dfe0feb24ed2e726b4787f852c50b4c8
+  metadata.gz: 8f833b201172d03a8115330ee935c832fdc54548
+  data.tar.gz: e01e6af0273de56718fd79b9355564a7fc9c625e
 SHA512:
-  metadata.gz: 33d7e13c598313b197ee41be1979e3d86ad3de71c5584575f192708fa6b7840c5193dd98579a6b3e4e7e3a4a95a60c92cf111bbf889b1a2f76fd8ec89bb2a7be
-  data.tar.gz: d2d62fa77096ee532349c274d64f9e8ec3425cc34dba3771e43a55f5969b5b1d6b36b2903ebd1d211445eb96f0dd3bb52c6651b2dc119022f2de172bdba16825
+  metadata.gz: 61d9fdaa559a42b6d995d6d44250b348ff9b44d8b6d16e8c660d6f69bea5f00eb447446ae73cb086e60076565623b5b053391c5efe010761dccee6efdbcb2c29
+  data.tar.gz: 841241598cfb18901db127f6b2f5953a3366c483486b7b0b7b1b922e8d2d35c959082df963847a3723d4b2df44462019d71db1eee8cc3a912ecdff6219fda877

data/lib/cloud/vcloud/cloud.rb

@@ -95,6 +95,9 @@ module VCloudCloud
 
         vapp, vm =[s.state[:vapp], s.state[:vm]]
 
+        #set agent id of vm
+        vm.agent_id=agent_id
+
         # To handle concurrent create_vm requests,
         # if the target vApp exists, creates a temp vApp, and then recomposes its VM to the target vApp.
         if requested_name
@@ -228,8 +231,18 @@ module VCloudCloud
 
           # poweroff vm before we are able to delete it
           s.next Steps::PowerOff, :vm, true
-          s.next Steps::Undeploy, :vm
-          s.next Steps::Delete, s.state[:vm], true
+
+          vapp = s.state[:vapp] = client.resolve_link vm.container_vapp_link
+          #remove vapp if it is temporary vapp
+          #vapp is temporary vapp if vapp name is same as agent id
+          if vapp.name == vm.agent_id
+            s.next Steps::PowerOff, :vapp, true
+            s.next Steps::Undeploy, :vapp
+            s.next Steps::Delete, s.state[:vapp], true
+          else
+            s.next Steps::Undeploy, :vm
+            s.next Steps::Delete, s.state[:vm], true
+          end
 
           s.next Steps::DeleteCatalogMedia, vm.name
         rescue RestClient::Forbidden, ObjectNotFoundError => e

data/lib/cloud/vcloud/vcd_client.rb

@@ -95,7 +95,6 @@ module VCloudCloud
     end
 
     def vapp_by_name(name)
-      # @logger.debug "VAPP_BY_NAME - org.vdc_link: #{org.vdc_link}"
       vdc_link = org.vdc_link vdc_name
       raise ObjectNotFoundError, "Invalid virtual datacenter name: #{vdc_name}" unless vdc_link
       vdc_obj = resolve_link vdc_link

data/lib/cloud/vcloud/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VCloud
-      VERSION = '0.9.0'
+      VERSION = '0.10.0'
     end
   end
 end

data/lib/cloud/vcloud/xml/wrapper_classes/vm.rb

@@ -96,6 +96,14 @@ module VCloudSdk
          @root["name"]= value
       end
 
+      def agent_id
+         @root["agent_id"]
+      end
+
+      def agent_id=(value)
+         @root["agent_id"]= value
+      end
+
       def hardware_section
         get_nodes("VirtualHardwareSection", nil, false,
           "http://schemas.dmtf.org/ovf/envelope/1").first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH vCloud CPI
-  b1e960
+  3754cd
 email: support@cloudfoundry.com
 executables: []
 extensions: []