bosh_vsphere_cpi 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20484247b0bb76cefc40f2f28054428a6680991b
-  data.tar.gz: 1d48fb046acb02cf0417b6b803c28e6883291b0a
+  metadata.gz: 4395e6dd0db3e79ecccc8d4475dfca0aebac8684
+  data.tar.gz: 48fe6a81c8586522b8040cbc45c03d32d5305fa1
 SHA512:
-  metadata.gz: 0ca9d5f7600ad20b84ce67c8ddeab6381c7d77ffa2baaff0323f492bfb267e57570385249b91f0c49970ddbb75b98c453b6422e02e5abd5c443f0e7f42d91627
-  data.tar.gz: 17673951c1c87149dc4e32ba21627f1d139a96af603d81cdd4deace7791dbcdf7a4cf341f9ec7ba0f5b825bb300e33ce3bd147beb60b2bc2cd387da756938bb1
+  metadata.gz: 07c5278031cb259efb6dbd019db122a2cf06365eddd31a19a7fc7a7a377ea290fee62f6a43ab6ac514eb51173350d3e5def2829544351b1e5e02fc33ce1760ff
+  data.tar.gz: 8cdc7000a67cced611bc18859ecb4390f292b081e669fe03209ba38dfd563e9bc8c0ebf8e23e335d0142bb535082fa58f710bb0db4550b03ca8af6423bbcbeef

data/lib/cloud/vsphere/agent_env.rb

@@ -73,7 +73,7 @@ module VSphereCloud
       cdrom.backing = backing_info
 
       config = Vim::Vm::ConfigSpec.new
-      config.device_change = [create_edit_device_spec(cdrom)]
+      config.device_change = [Resources::VM.create_edit_device_spec(cdrom)]
       @client.reconfig_vm(vm, config)
     end
 
@@ -82,7 +82,7 @@ module VSphereCloud
       if cdrom.connectable.connected
         cdrom.connectable.connected = false
         config = Vim::Vm::ConfigSpec.new
-        config.device_change = [create_edit_device_spec(cdrom)]
+        config.device_change = [Resources::VM.create_edit_device_spec(cdrom)]
         @client.reconfig_vm(vm, config)
       end
     end
@@ -111,12 +111,5 @@ module VSphereCloud
     def genisoimage
       @genisoimage ||= which(%w{genisoimage mkisofs})
     end
-
-    def create_edit_device_spec(device)
-      device_config_spec = Vim::Vm::Device::VirtualDeviceSpec.new
-      device_config_spec.device = device
-      device_config_spec.operation = Vim::Vm::Device::VirtualDeviceSpec::Operation::EDIT
-      device_config_spec
-    end
   end
 end

data/lib/cloud/vsphere/client.rb

@@ -14,7 +14,12 @@ module VSphereCloud
       @soap_stub = SoapStub.new(host, options[:soap_log]).create
 
       @service_instance = Vim::ServiceInstance.new('ServiceInstance', @soap_stub)
-      @service_content = @service_instance.content
+
+      begin
+        @service_content = @service_instance.content
+      rescue HTTPClient::ConnectTimeoutError => e
+        raise "Please make sure the CPI has proper network access to vSphere. (#{e.class}: #{e.message})"
+      end
 
       @metrics_cache  = {}
       @lock = Mutex.new
@@ -32,6 +37,8 @@ module VSphereCloud
       raise NotLoggedInException unless @session
       @session = nil
       @service_content.session_manager.logout
+    rescue VimSdk::SoapError => e
+      @logger.info "Failed to logout: #{e.message}"
     end
 
     def find_parent(obj, parent_type)
@@ -79,8 +86,8 @@ module VSphereCloud
       devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
     end
 
-    def delete_path(datacenter, path)
-      task = @service_content.file_manager.delete_file(path, datacenter)
+    def delete_path(datacenter_mob, path)
+      task = @service_content.file_manager.delete_file(path, datacenter_mob)
       begin
         wait_for_task(task)
       rescue => e
@@ -90,26 +97,35 @@ module VSphereCloud
       end
     end
 
-    def delete_disk(datacenter, path)
-      base_path = path.chomp(File.extname(path))
-      [".vmdk", "-flat.vmdk"].each do |extension|
-        delete_path(datacenter, "#{base_path}#{extension}")
+    def delete_disk(datacenter_mob, path)
+      task = service_content.virtual_disk_manager.delete_virtual_disk(
+        path,
+        datacenter_mob
+      )
+
+      begin
+        wait_for_task(task)
+      rescue => e
+        unless e.message =~ /File .* was not found/
+          raise e
+        end
       end
     end
 
-    def move_disk(source_datacenter, source_path, dest_datacenter, dest_path)
-      create_parent_folder(dest_datacenter, dest_path)
-      tasks = []
-      base_source_path = source_path.chomp(File.extname(source_path))
-      base_dest_path = dest_path.chomp(File.extname(dest_path))
-      [".vmdk", "-flat.vmdk"].each do |extension|
-        tasks << @service_content.file_manager.move_file(
-          "#{base_source_path}#{extension}", source_datacenter.mob,
-          "#{base_dest_path}#{extension}", dest_datacenter.mob, false
-        )
-      end
+    def move_disk(source_datacenter_mob, source_path, dest_datacenter_mob, dest_path)
+      create_parent_folder(dest_datacenter_mob, dest_path)
+      @logger.info("Moving disk: #{source_path} to #{dest_path}")
+      task = service_content.virtual_disk_manager.move_virtual_disk(
+        source_path,
+        source_datacenter_mob,
+        dest_path,
+        dest_datacenter_mob,
+        false,
+        nil
+      )
 
-      tasks.each { |task| wait_for_task(task) }
+      wait_for_task(task)
+      @logger.info('Moved disk')
     end
 
     def create_datastore_folder(folder_path, datacenter)
@@ -155,6 +171,21 @@ module VSphereCloud
       matches
     end
 
+    def find_all_stemcell_replicas_in_datastore(datacenter, stemcell_id, datastore_name)
+      matches = []
+      yield_all_resources_by_name(datacenter, 'VirtualMachine') do |vm_mob, name|
+        if name =~ Regexp.new(stemcell_id)
+          vm_datastore = @cloud_searcher.get_property(vm_mob,
+            Vim::VirtualMachine, 'datastore', ensure_all: true)
+          if vm_datastore.first.name == datastore_name
+            matches << vm_mob
+          end
+        end
+      end
+
+      matches
+    end
+
     def wait_for_task(task)
       interval = 1.0
       started = Time.now
@@ -228,19 +259,18 @@ module VSphereCloud
     end
 
     def find_disk(disk_cid, datastore, disk_folder)
-      disk_path = "[#{datastore.name}] #{disk_folder}/#{disk_cid}.vmdk"
       disk_size_in_mb = find_disk_size_using_browser(datastore, disk_cid, disk_folder)
-      disk_size_in_mb.nil? ? nil : Resources::Disk.new(disk_cid, disk_size_in_mb, datastore, disk_path)
+      disk_size_in_mb.nil? ? nil : Resources::PersistentDisk.new(disk_cid, disk_size_in_mb, datastore, disk_folder)
     end
 
-    def create_disk(datacenter, datastore, disk_cid, disk_folder, disk_size_in_mb, disk_type)
+    def create_disk(datacenter_mob, datastore, disk_cid, disk_folder, disk_size_in_mb, disk_type)
       if disk_type.nil?
         raise 'no disk type specified'
       end
 
       disk_path = "[#{datastore.name}] #{disk_folder}/#{disk_cid}.vmdk"
 
-      create_parent_folder(datacenter, disk_path)
+      create_parent_folder(datacenter_mob, disk_path)
 
       disk_spec = VimSdk::Vim::VirtualDiskManager::FileBackedVirtualDiskSpec.new
       disk_spec.disk_type = disk_type
@@ -249,19 +279,12 @@ module VSphereCloud
 
       task = service_content.virtual_disk_manager.create_virtual_disk(
         disk_path,
-        datacenter.mob,
+        datacenter_mob,
         disk_spec
       )
       wait_for_task(task)
 
-      Resources::Disk.new(disk_cid, disk_size_in_mb, datastore, disk_path)
-    end
-
-    private
-
-    def create_parent_folder(datacenter, disk_path)
-      destination_folder = File.dirname(disk_path)
-      create_datastore_folder(destination_folder, datacenter.mob)
+      Resources::PersistentDisk.new(disk_cid, disk_size_in_mb, datastore, disk_folder)
     end
 
     def find_disk_size_using_browser(datastore, disk_cid, disk_folder)
@@ -279,7 +302,9 @@ module VSphereCloud
       search_spec.match_pattern = ["#{disk_cid}.vmdk"]
       search_spec.query = [query]
 
-      vm_disk_infos = wait_for_task(datastore.mob.browser.search("[#{datastore.name}] #{disk_folder}", search_spec)).file
+      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
       return nil if vm_disk_infos.empty?
 
       vm_disk_infos.first.capacity_kb / 1024
@@ -287,6 +312,78 @@ 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?
+
+      true
+    rescue VimSdk::SoapError, FileNotFoundException
+      false
+    end
+
+    def add_persistent_disk_property_to_vm(vm, disk)
+      vm_disk = vm.disk_by_cid(disk.cid)
+      disk_device_key = vm_disk.key
+
+      if vm.get_vapp_property_by_key(disk_device_key) != nil
+        @logger.debug("Disk property already exists '#{disk.cid}' on vm '#{vm.cid}'")
+        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
+      v_app_property_info.category = 'BOSH Persistent Disks'
+      v_app_property_info.type = 'string'
+      v_app_property_info.value = disk.path
+      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
+
+      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
+
+      vm_config = Vim::Vm::ConfigSpec.new
+      vm_config.v_app_config = v_app_config_spec
+
+      reconfig_vm(vm.mob, vm_config)
+    end
+
+    private
+
     def task_exception_for_vim_fault(fault)
       exceptions_by_fault = {
         VimSdk::Vim::Fault::FileNotFound => FileNotFoundException,
@@ -375,5 +472,10 @@ module VSphereCloud
         end
       end
     end
+
+    def create_parent_folder(datacenter_mob, disk_path)
+      destination_folder = File.dirname(disk_path)
+      create_datastore_folder(destination_folder, datacenter_mob)
+    end
   end
 end