bosh_vsphere_cpi 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4395e6dd0db3e79ecccc8d4475dfca0aebac8684
-  data.tar.gz: 48fe6a81c8586522b8040cbc45c03d32d5305fa1
+  metadata.gz: 8cf26eed256c7480a429cb3d09eaf357656adb64
+  data.tar.gz: 66f4347df33381995b727d84370de31160acd7cd
 SHA512:
-  metadata.gz: 07c5278031cb259efb6dbd019db122a2cf06365eddd31a19a7fc7a7a377ea290fee62f6a43ab6ac514eb51173350d3e5def2829544351b1e5e02fc33ce1760ff
-  data.tar.gz: 8cdc7000a67cced611bc18859ecb4390f292b081e669fe03209ba38dfd563e9bc8c0ebf8e23e335d0142bb535082fa58f710bb0db4550b03ca8af6423bbcbeef
+  metadata.gz: d29158bac673485edb46eea81b1678482774e05d38114c97dfa8210460b6fd33fa0b8d2e737b963f3eaf73d1fc3bb646420868e4db92b8e59b5b88fe9bfddfc8
+  data.tar.gz: 09c56e204697cb410e700f5cd3510067d069dae5ea17f3b2775e127d338d09d3b32d9ec58387de82f9f048e6b4192fe364f0c8797afcb2fb2da244dc3f878118

data/lib/cloud/vsphere/client.rb

@@ -304,7 +304,7 @@ module VSphereCloud
 
       datastore_path = "[#{datastore.name}] #{disk_folder}"
       @logger.debug("Trying to find disk in : #{datastore_path}")
-      vm_disk_infos = wait_for_task(datastore.mob.browser.search(datastore_path, search_spec)).file
+      vm_disk_infos = wait_for_task(datastore.mob.browser.search("[#{datastore.name}] #{disk_folder}", search_spec)).file
       return nil if vm_disk_infos.empty?
 
       vm_disk_infos.first.capacity_kb / 1024
@@ -312,26 +312,13 @@ module VSphereCloud
       nil
     end
 
-    def disk_path_exists?(vm_mob, disk_path)
-      match = /\[(.+)\] (.+)\/(.+\.vmdk)/.match(disk_path)
-      search_spec_details = VimSdk::Vim::Host::DatastoreBrowser::FileInfo::Details.new
-      search_spec_details.file_type = true # actually return VmDiskInfos not FileInfos
-
-      search_spec = VimSdk::Vim::Host::DatastoreBrowser::SearchSpec.new
-      search_spec.details = search_spec_details
-      search_spec.match_pattern = [match[3]]
-
-      datastore_path = "[#{match[1]}] #{match[2]}"
-      @logger.debug("Trying to find disk in : #{datastore_path}")
-      vm_disk_infos = wait_for_task(vm_mob.environment_browser.datastore_browser.search(datastore_path, search_spec)).file
-      return false if vm_disk_infos.empty?
+    def add_persistent_disk_property_to_vm(vm, disk)
+      vm_config = Vim::Vm::ConfigSpec.new
+      v_app_config_spec = VimSdk::Vim::VApp::VmConfigSpec.new
 
-      true
-    rescue VimSdk::SoapError, FileNotFoundException
-      false
-    end
+      v_app_property_spec = VimSdk::Vim::VApp::PropertySpec.new
+      v_app_property_info = VimSdk::Vim::VApp::PropertyInfo.new
 
-    def add_persistent_disk_property_to_vm(vm, disk)
       vm_disk = vm.disk_by_cid(disk.cid)
       disk_device_key = vm_disk.key
 
@@ -340,7 +327,6 @@ module VSphereCloud
         return
       end
 
-      v_app_property_info = VimSdk::Vim::VApp::PropertyInfo.new
       v_app_property_info.key = disk_device_key
       v_app_property_info.id = disk.cid
       v_app_property_info.label = disk.cid
@@ -350,36 +336,58 @@ module VSphereCloud
       v_app_property_info.description = 'Used by BOSH to track persistent disks. Change at your own risk.'
       v_app_property_info.user_configurable = true
 
-      v_app_property_spec = VimSdk::Vim::VApp::PropertySpec.new
       v_app_property_spec.info = v_app_property_info
       v_app_property_spec.operation = VimSdk::Vim::Option::ArrayUpdateSpec::Operation::ADD
-
-      v_app_config_spec = VimSdk::Vim::VApp::VmConfigSpec.new
       v_app_config_spec.property << v_app_property_spec
 
-      vm_config = Vim::Vm::ConfigSpec.new
       vm_config.v_app_config = v_app_config_spec
 
       reconfig_vm(vm.mob, vm_config)
     end
 
-    def delete_persistent_disk_property_from_vm(vm, disk_device_key)
-      if vm.get_vapp_property_by_key(disk_device_key).nil?
-        @logger.debug("Disk property[#{disk_device_key}] does not exist on vm '#{vm.cid}'")
-        return
-      end
+    def set_custom_field(mob, name, value)
+      @fields_manager ||= @service_content.custom_fields_manager
+      name = name.to_s
+      value = value.to_s
+      field = nil
 
-      v_app_property_spec = VimSdk::Vim::VApp::PropertySpec.new
-      v_app_property_spec.remove_key = disk_device_key
-      v_app_property_spec.operation = VimSdk::Vim::Option::ArrayUpdateSpec::Operation::REMOVE
-
-      v_app_config_spec = VimSdk::Vim::VApp::VmConfigSpec.new
-      v_app_config_spec.property << v_app_property_spec
+      begin
+        field = @fields_manager.add_field_definition(name, mob.class, nil, nil)
+      rescue SoapError => e
+        if e.fault.kind_of?(Vim::Fault::NoPermission)
+          @logger.warn("Can't create custom field definition due to lack of permission: #{e.message}")
+        elsif e.fault.kind_of?(Vim::Fault::DuplicateName)
+          @logger.warn("Custom field definition already exists: #{e.message}")
+          custom_fields = @fields_manager.field
+          field = custom_fields.find do |field|
+            field.name == name && field.managed_object_type == mob.class
+          end
+        else
+          raise e
+        end
+      end
 
-      vm_config = Vim::Vm::ConfigSpec.new
-      vm_config.v_app_config = v_app_config_spec
+      unless field.nil?
+        begin
+        @fields_manager.set_field(mob, field.key, value)
+        rescue SoapError => e
+          if e.fault.kind_of?(Vim::Fault::NoPermission)
+            @logger.warn("Can't set custom fields due to lack of permission: #{e.message}")
+          end
+        end
+      end
+    end
 
-      reconfig_vm(vm.mob, vm_config)
+    def remove_custom_field_def(name, mob_type)
+      @fields_manager ||= @service_content.custom_fields_manager
+      name = name.to_s
+      custom_fields = @fields_manager.field
+      field = custom_fields.find do |field|
+        field.name == name && field.managed_object_type == mob_type
+      end
+      unless field.nil?
+        @fields_manager.remove_field_definition(field.key)
+      end
     end
 
     private

data/lib/cloud/vsphere/cloud.rb

@@ -195,7 +195,34 @@ module VSphereCloud
 
         persistent_disks = vm.persistent_disks
         unless persistent_disks.empty?
-          vm.detach_disks(persistent_disks)
+          disks_to_move = []
+          @logger.info("Found #{persistent_disks.size} persistent disk(s)")
+          config = Vim::Vm::ConfigSpec.new
+          config.device_change = []
+
+          persistent_disks.each do |virtual_disk|
+            @logger.info("Detaching: #{virtual_disk.backing.file_name}")
+            config.device_change << Resources::VM.create_delete_device_spec(virtual_disk)
+
+            if vm.has_persistent_disk_property_mismatch?(virtual_disk)
+              @logger.info("Property Mismatch")
+              disks_to_move << virtual_disk
+            end
+          end
+          retry_block { client.reconfig_vm(vm.mob, config) }
+          @logger.info("Detached #{persistent_disks.size} persistent disk(s)")
+
+          @logger.info("Renaming #{disks_to_move.size} persistent disk(s)")
+          disks_to_move.each do |disk|
+            current_path = disk.backing.file_name
+
+            current_datastore = current_path.split(" ").first
+            original_disk_path = vm.get_old_disk_filepath(disk.key)
+            dest_filename = original_disk_path.split(" ").last
+            dest_path = "#{current_datastore} #{dest_filename}"
+
+            @datacenter.move_disk(current_path, dest_path)
+          end
         end
 
         # Delete env.iso and VM specific files managed by the director
@@ -232,35 +259,9 @@ module VSphereCloud
 
     def set_vm_metadata(vm_cid, metadata)
       with_thread_name("set_vm_metadata(#{vm_cid}, ...)") do
-        begin
-          fields_manager = client.service_content.custom_fields_manager
-          custom_fields = fields_manager.field
-          name_to_key_id = {}
-
-          metadata.each_key do |name|
-            field = custom_fields.find { |field| field.name == name.to_s &&
-              field.managed_object_type == Vim::VirtualMachine }
-            unless field
-              field = fields_manager.add_field_definition(name.to_s, Vim::VirtualMachine, nil, nil)
-            end
-            name_to_key_id[name] = field.key
-          end
-
-          vm = vm_provider.find(vm_cid)
-
-          metadata.each do |name, value|
-            value = '' if value.nil? # value is required
-            fields_manager.set_field(vm.mob, name_to_key_id[name], value)
-          end
-        rescue SoapError => e
-          if e.fault.kind_of?(Vim::Fault::NoPermission)
-            @logger.warn("Can't set custom fields due to lack of " +
-                           "permission: #{e.message}")
-          elsif e.fault.kind_of?(Vim::Fault::DuplicateName)
-            @logger.warn("Can't add custom field definition that already exists: #{e.message}")
-          else
-            raise e
-          end
+        vm = vm_provider.find(vm_cid)
+        metadata.each do |name, value|
+          client.set_custom_field(vm.mob, name, value)
         end
       end
     end
@@ -326,12 +327,11 @@ module VSphereCloud
       with_thread_name("detach_disk(#{vm_cid}, #{disk_cid})") do
         @logger.info("Detaching disk: #{disk_cid} from vm: #{vm_cid}")
 
+        disk = @datacenter.find_disk(disk_cid)
         vm = vm_provider.find(vm_cid)
-        disk = vm.disk_by_original_cid(disk_cid)
-        raise Bosh::Clouds::DiskNotAttached.new(true), "Disk '#{disk_cid}' is not attached to VM '#{vm_cid}'" if disk.nil?
 
-        delete_disk_from_agent_env(vm, disk_cid)
-        vm.detach_disks([disk])
+        delete_disk_from_agent_env(vm, disk)
+        vm.detach_disk(disk)
       end
     end
 
@@ -647,13 +647,13 @@ module VSphereCloud
       @logger.info("Updated agent env to: #{env.pretty_inspect}")
     end
 
-    def delete_disk_from_agent_env(vm, disk_cid)
+    def delete_disk_from_agent_env(vm, disk)
       vm_mob = vm.mob
       location = get_vm_location(vm_mob)
       env = @agent_env.get_current_env(vm_mob, location[:datacenter])
       @logger.info("Reading current agent env: #{env.pretty_inspect}")
-      if env['disks']['persistent'][disk_cid]
-        env['disks']['persistent'].delete(disk_cid)
+      if env['disks']['persistent'][disk.cid]
+        env['disks']['persistent'].delete(disk.cid)
         @logger.info("Updating agent env to: #{env.pretty_inspect}")
 
         @agent_env.set_env(vm_mob, location, env)

data/lib/cloud/vsphere/resources/vm.rb

@@ -60,7 +60,7 @@ module VSphereCloud
       end
 
       def persistent_disks
-        devices.select do |device|
+       devices.select do |device|
           device.kind_of?(Vim::Vm::Device::VirtualDisk) &&
             device.backing.disk_mode == Vim::Vm::Device::VirtualDiskOption::DiskMode::INDEPENDENT_PERSISTENT
         end
@@ -77,7 +77,7 @@ module VSphereCloud
       end
 
       def fix_device_unit_numbers(device_changes)
-        controllers_available_unit_numbers = Hash.new { |h, k| h[k] = (0..15).to_a }
+        controllers_available_unit_numbers = Hash.new { |h,k| h[k] = (0..15).to_a }
         devices.each do |device|
           if device.controller_key
             available_unit_numbers = controllers_available_unit_numbers[device.controller_key]
@@ -117,7 +117,7 @@ module VSphereCloud
           if question
             choices = question.choice
             @logger.info("VM is blocked on a question: #{question.text}, " +
-                "providing default answer: #{choices.choice_info[choices.default_index].label}")
+              "providing default answer: #{choices.choice_info[choices.default_index].label}")
             @client.answer_vm(@mob, question.id, choices.choice_info[choices.default_index].key)
             power_state = cloud_searcher.get_property(@mob, Vim::VirtualMachine, 'runtime.powerState')
           else
@@ -138,21 +138,6 @@ module VSphereCloud
         end
       end
 
-      def disk_by_original_cid(disk_cid)
-        devices.each do |d|
-          if d.kind_of?(Vim::Vm::Device::VirtualDisk)
-            found_property = get_vapp_property_by_key(d.key)
-            unless found_property.nil?
-              if verify_persistent_disk_property?(found_property) && found_property.label == disk_cid
-                return d
-              end
-            end
-          end
-        end
-
-        nil
-      end
-
       def reboot
         @mob.reboot_guest
       end
@@ -189,8 +174,8 @@ module VSphereCloud
         return false if found_property.nil? || !verify_persistent_disk_property?(found_property)
 
         # get full path without a datastore
-        file_path = disk.backing.file_name[/([^\]]*)\.vmdk/, 1].strip
-        original_file_path = found_property.value[/([^\]]*)\.vmdk/, 1].strip
+        file_path = disk.backing.file_name[/([^\]]*)\.vmdk/,1].strip
+        original_file_path =found_property.value[/([^\]]*)\.vmdk/,1].strip
         @logger.debug("Current file path is #{file_path}")
         @logger.debug("Original file path is #{original_file_path}")
 
@@ -231,51 +216,31 @@ module VSphereCloud
         return disk_config_spec
       end
 
-      def detach_disks(virtual_disks)
+      def detach_disk(disk)
         reload
-        disks_to_move = []
-        @logger.info("Found #{virtual_disks.size} persistent disk(s)")
+        virtual_disk = disk_by_cid(disk.cid)
+        raise Bosh::Clouds::DiskNotAttached.new(true), "Disk '#{disk.cid}' is not attached to VM '#{@cid}'" if virtual_disk.nil?
+
         config = Vim::Vm::ConfigSpec.new
         config.device_change = []
-
-        virtual_disks.each do |virtual_disk|
-          @logger.info("Detaching: #{virtual_disk.backing.file_name}")
-          config.device_change << Resources::VM.create_delete_device_spec(virtual_disk)
-
-          disk_property = get_vapp_property_by_key(virtual_disk.key)
-          unless disk_property.nil?
-            if has_persistent_disk_property_mismatch?(virtual_disk) && !@client.disk_path_exists?(@mob, disk_property.value)
-              @logger.info('Persistent disk was moved: moving disk to expected location')
-              disks_to_move << virtual_disk
-            end
-          end
+        config.device_change << self.class.create_delete_device_spec(virtual_disk)
+
+        @logger.info('Detaching disk')
+        @client.reconfig_vm(@mob, config)
+
+        # detach-disk is async and task completion does not necessarily mean
+        # that changes have been applied to VC side. Query VC until we confirm
+        # that the change has been applied. This is a known issue for vsphere 4.
+        # Fixed in vsphere 5.
+        5.times do
+          reload
+          virtual_disk = disk_by_cid(disk.cid)
+          break if virtual_disk.nil?
+          sleep(1.0)
         end
-        retry_block { @client.reconfig_vm(@mob, config) }
-        @logger.info("Detached #{virtual_disks.size} persistent disk(s)")
-
-        move_disks_to_old_path(disks_to_move)
-
-        @logger.info('Finished detaching disk(s)')
+        raise "Failed to detach disk '#{disk.cid}' from vm '#{@cid}'" unless virtual_disk.nil?
 
-        virtual_disks.each do |disk|
-          @logger.debug("Deleting persistent disk property #{disk.key} from vm '#{@cid}'")
-          @client.delete_persistent_disk_property_from_vm(self, disk.key)
-        end
-        @logger.debug('Finished deleting persistent disk properties from vm')
-      end
-
-      def move_disks_to_old_path(disks_to_move)
-        @logger.info("Renaming #{disks_to_move.size} persistent disk(s)")
-        disks_to_move.each do |virtual_disk|
-          current_path = virtual_disk.backing.file_name
-
-          current_datastore = current_path.split(" ").first
-          original_disk_path = get_old_disk_filepath(virtual_disk.key)
-          dest_filename = original_disk_path.split(" ").last
-          dest_path = "#{current_datastore} #{dest_filename}"
-
-          @client.move_disk(datacenter, current_path, datacenter, dest_path)
-        end
+        @logger.info('Finished detaching disk')
       end
 
       def self.create_delete_device_spec(device, options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common