bosh_vsphere_cpi 1.2682.1.0 → 1.2685.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52a22d440892009f6d466516f79a97199fb0844a
-  data.tar.gz: 4c6b71b6074141153e45c53eebd96ab943d585ed
+  metadata.gz: bb75a5c5f99392b3883c23316028c678d7805d1c
+  data.tar.gz: 02d9fc933cac7271b579cbbfc0b883e11b8f75ca
 SHA512:
-  metadata.gz: c7dcc9e25e6fb4ae5829d584b48acc617c0fa3541bfce3294cee175a62a5370b3cd785eb33923e577c8706b7d266e1cacd872af33161c87ef03f85df1f72c3c6
-  data.tar.gz: 7fca5156afcd197254c5f864eaf939aad4685c34fc55cd02b4a82a4138f3f9fbfe1afe942d2c24be798fc93a0a2603517732316edbe3c41156e3716edf7d0afb
+  metadata.gz: a3d9fc81fc4a51f342910c6bffd52309a0875f174bc54edddca84d870368721d48335d96f089af270f52c0a7a26e34d2dcbf55d599ee124cd6cee9d12689f377
+  data.tar.gz: 4880e3ba35be392ae34ed87cd9980339b37896fdfeac2076d5963be5dd1e09e2c1e7fdb520a37f08c112c7e4caaf0fba26535d99e7fd39386be8cee8ad181c89

data/lib/cloud/vsphere/client.rb

@@ -235,6 +235,22 @@ module VSphereCloud
       wait_for_task(task)
     end
 
+    def has_disk?(disk_path, disk_datacenter)
+      datacenter = find_by_inventory_path(disk_datacenter)
+
+      [".vmdk", "-flat.vmdk"].each do |extension|
+        begin
+          uuid = @service_content.virtual_disk_manager.query_virtual_disk_uuid(
+            "#{disk_path}#{extension}", datacenter
+          )
+          return true if uuid
+        rescue VimSdk::SoapError
+        end
+      end
+
+      false
+    end
+
     def find_by_inventory_path(path)
       full_path = Array(path).join("/")
       @service_content.search_index.find_by_inventory_path(full_path)

data/lib/cloud/vsphere/cloud.rb

@@ -72,6 +72,16 @@ module VSphereCloud
       false
     end
 
+    def has_disk?(disk_id)
+      disk = VSphereCloud::Models::Disk.find(uuid: disk_id)
+
+      return false unless disk
+      return false unless disk.path
+      return false unless disk.datacenter
+
+      @client.has_disk?(disk.path, disk.datacenter)
+    end
+
     def create_stemcell(image, _)
       with_thread_name("create_stemcell(#{image}, _)") do
         result = nil
@@ -503,8 +513,17 @@ module VSphereCloud
 
         vm = get_vm_by_cid(vm_cid)
 
-        devices = client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
+        location = get_vm_location(vm)
+        env = @agent_env.get_current_env(vm, location[:datacenter])
+        @logger.info("Reading current agent env: #{env.pretty_inspect}")
+        if env['disks']['persistent'][disk.uuid]
+          env['disks']['persistent'].delete(disk.uuid)
+          @logger.info("Updating agent env to: #{env.pretty_inspect}")
 
+          @agent_env.set_env(vm, location, env)
+        end
+
+        devices = client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
         vmdk_path = "#{disk.path}.vmdk"
         virtual_disk =
           devices.find do |device|
@@ -516,13 +535,6 @@ module VSphereCloud
         config.device_change = []
         config.device_change << create_delete_device_spec(virtual_disk)
 
-        location = get_vm_location(vm)
-        env = @agent_env.get_current_env(vm, location[:datacenter])
-        @logger.info("Reading current agent env: #{env.pretty_inspect}")
-        env['disks']['persistent'].delete(disk.uuid)
-        @logger.info("Updating agent env to: #{env.pretty_inspect}")
-
-        @agent_env.set_env(vm, location, env)
         @logger.info('Detaching disk')
         client.reconfig_vm(vm, config)
 

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2682.1.0'
+      VERSION = '1.2685.0'
     end
   end
 end

data/lib/cloud/vsphere.rb

@@ -15,7 +15,7 @@ module Bosh
                      :create_vm, :delete_vm, :reboot_vm, :has_vm?,
                      :set_vm_metadata,
                      :configure_networks,
-                     :create_disk, :delete_disk,
+                     :create_disk, :has_disk?, :delete_disk,
                      :attach_disk, :detach_disk,
                      :snapshot_disk, :delete_snapshot,
                      :current_vm_id, :get_disks, :ping

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2682.1.0
+  version: 1.2685.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-11 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.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2682.1.0
+        version: 1.2685.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
         version: 2.4.0
 description: |-
   BOSH VSphere CPI
-  93a782
+  989d8b
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi