bosh_vsphere_cpi 1.2768.0 → 1.2776.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8af66504112ec3911132c5d16d9e521f282e8feb
-  data.tar.gz: afa5d54a1f25c92a84fca0cb983427e935beba97
+  metadata.gz: 31149e0ae258f1112289e338fdaed4637a168920
+  data.tar.gz: 7410b16578fcca107ebb6374697fc5b3d01034f4
 SHA512:
-  metadata.gz: 3b623c4c71086d44a0f454a2cc0c96de4e495fec23eac2f3a281b5c6ca77ac9ff9791da44534f2e772d9e89e871e10aa856f609eca3222d73f454172011b94e7
-  data.tar.gz: 60acb0eeb63e4ec6d36fefbc1202e36ecb0334142897bf1f9ffbf7dc59a9cc0d651c67980d6a21f5999271abef5a388ad50eed09eed52762b6a0403e79892a54
+  metadata.gz: 44d87afdd54b60a14d09bc135db33e1a0caf0f5622d7f6400c51bfb8c235d6b8c7817259a47fee2fe48572f55a5b7d44ff1d021b0914c125cd0d21e1570f29bf
+  data.tar.gz: dc03664c276795f8bbbeccea132edad2f6d41f9b2a4a36f77e288e886d6fe123541b7725726b6b39a18999e02c697c99cf86e7ff78aebcd917aff33fa7b9a8df

data/lib/cloud/vsphere/agent_env.rb

@@ -15,7 +15,10 @@ module VSphereCloud
       return unless env_iso_folder
 
       datastore_name = cdrom.backing.datastore.name
-      env_path = env_iso_folder.match(/\[#{datastore_name}\] (.*)/)[1]
+      datastore_pattern = Regexp.escape(datastore_name)
+      result = env_iso_folder.match(/\[#{datastore_pattern}\] (.*)/)
+      raise Bosh::Clouds::CloudError.new('Could not find matching datastore name') unless result
+      env_path = result[1]
 
       contents = @file_provider.fetch_file(datacenter_name, datastore_name, "#{env_path}/env.json")
       raise Bosh::Clouds::CloudError.new('Unable to load env.json') unless contents
@@ -27,7 +30,7 @@ module VSphereCloud
       env_json = JSON.dump(env)
 
       disconnect_cdrom(vm)
-      clean_up_old_env(vm)
+      clean_env(vm)
       @file_provider.upload_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.json", env_json)
       @file_provider.upload_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.iso", generate_env_iso(env_json))
 
@@ -42,6 +45,17 @@ module VSphereCloud
       File.dirname(cdrom_device.backing.file_name)
     end
 
+    def clean_env(vm)
+      cdrom = @client.get_cdrom_device(vm)
+      env_iso_folder = env_iso_folder(cdrom)
+      return unless env_iso_folder
+
+      datacenter = @client.find_parent(vm, Vim::Datacenter)
+
+      @client.delete_path(datacenter, File.join(env_iso_folder, 'env.json'))
+      @client.delete_path(datacenter, File.join(env_iso_folder, 'env.iso'))
+    end
+
     private
 
     def update_cdrom_env(vm, datastore, file_name)
@@ -84,17 +98,6 @@ module VSphereCloud
       end
     end
 
-    def clean_up_old_env(vm)
-      cdrom = @client.get_cdrom_device(vm)
-      env_iso_folder = env_iso_folder(cdrom)
-      return unless env_iso_folder
-
-      datacenter = @client.find_parent(vm, Vim::Datacenter)
-
-      @client.delete_path(datacenter, File.join(env_iso_folder, 'env.json'))
-      @client.delete_path(datacenter, File.join(env_iso_folder, 'env.iso'))
-    end
-
     def which(programs)
       ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
         programs.each do |bin|

data/lib/cloud/vsphere/client.rb

@@ -82,10 +82,12 @@ module VSphereCloud
 
     def delete_path(datacenter, path)
       task = @service_content.file_manager.delete_file(path, datacenter)
-      wait_for_task(task)
-    rescue => e
-      unless e.message =~ /File .* was not found/
-        raise e
+      begin
+        wait_for_task(task)
+      rescue => e
+        unless e.message =~ /File .* was not found/
+          raise e
+        end
       end
     end
 
@@ -94,7 +96,15 @@ module VSphereCloud
       [".vmdk", "-flat.vmdk"].each do |extension|
         tasks << @service_content.file_manager.delete_file("#{path}#{extension}", datacenter)
       end
-      tasks.each { |task| wait_for_task(task) }
+      tasks.each do |task|
+        begin
+          wait_for_task(task)
+        rescue => e
+          unless e.message =~ /File .* was not found/
+            raise e
+          end
+        end
+      end
     end
 
     def move_disk(source_datacenter, source_path, dest_datacenter, dest_path)

data/lib/cloud/vsphere/cloud.rb

@@ -252,19 +252,14 @@ module VSphereCloud
           @logger.info("Detached #{persistent_disks.size} persistent disk(s)")
         end
 
-        retry_block { client.delete_vm(vm) }
-        @logger.info("Deleted vm: #{vm_cid}")
-
         # Delete env.iso and VM specific files managed by the director
         retry_block do
           cdrom = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
-          if cdrom
-            env_iso_folder = @agent_env.env_iso_folder(cdrom)
-            if env_iso_folder
-              client.delete_path(datacenter, env_iso_folder)
-            end
-          end
+          @agent_env.clean_env(vm) if cdrom
         end
+
+        retry_block { client.delete_vm(vm) }
+        @logger.info("Deleted vm: #{vm_cid}")
       end
     end
 

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2768.0'
+      VERSION = '1.2776.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2768.0
+  version: 1.2776.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2768.0
+        version: 1.2776.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2768.0
+        version: 1.2776.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2768.0
+        version: 1.2776.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2768.0
+        version: 1.2776.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ dependencies:
         version: 0.7.1
 description: |-
   BOSH VSphere CPI
-  2b24dc
+  5aa001
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi