bosh_vsphere_cpi 1.2865.0 → 1.2881.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61901cfb3ea1b5238cfea27df709f21128b701d0
-  data.tar.gz: fb1532f1e12449573b112c958706370f7248f29c
+  metadata.gz: 709f8ea4d8fdcbce3a60c83d718666dfcb5b0405
+  data.tar.gz: f2b312d3746cce0b6c08d7d9e973abc23553b653
 SHA512:
-  metadata.gz: 3f977fff415d9170c4ed358273bada7dbd455a0ae4b631a2bb67e8def4d7f0c1fe8c34673c33d078e80d75cb791c51b33d7dec64dff5b388f06e910db3f191cc
-  data.tar.gz: 6caff7a89146bf0166397eb8d4d0c8da35ceeb6752347801d017637f3608cc4be3000589376007fe8b0b712e9307e50b18b8d9ec47b06e3d6ad5335758f70b1e
+  metadata.gz: 1fbc8f30dc769f5727ad279240b59aacd9ca3b2370ff0be575cfc2fe6edd34fb049e0909e18895486903c9ff9e2ee02273bf1582e38e133f3895deb1f00dc71f
+  data.tar.gz: f1fbc214c332fc82e17633becfd900aee187530667a87e6a1dae2886e6ecb6ee30738e798e2fdf294589db71752c01e6ee834aed96664296ccdd7896c6e4e3d1

data/bin/vsphere_cpi

@@ -2,7 +2,6 @@
 
 require 'rubygems'
 require 'yaml'
-require 'sequel'
 require 'logger'
 require 'cloud'
 require 'cloud/vsphere'
@@ -11,26 +10,11 @@ require 'tmpdir'
 require 'bosh/cpi'
 require 'bosh/cpi/cli'
 
-Sequel.extension(:migration)
-
 cpi_config = YAML.load_file(ARGV.shift)
-db_config = cpi_config.fetch('db')
-
-require 'sequel/adapters/sqlite' if db_config['adapter'] == 'sqlite'
-
-connection_options = db_config.delete('connection_options') { {} }
-db_config.delete_if { |_, v| v.to_s.empty? }
-db_config = db_config.merge(connection_options)
-
-db = Sequel.connect(db_config)
-
-db_migrations_path = File.expand_path('../../db/migrations', __FILE__)
-Sequel::TimestampMigrator.new(db, db_migrations_path, {table: 'vsphere_cpi_schema'}).run
 
 Bosh::Clouds::Config.configure(OpenStruct.new(
   logger: Logger.new(STDERR),
   task_checkpoint: nil,
-  db: db,
 ))
 
 cloud_properties = cpi_config['cloud']['properties']

data/bin/vsphere_cpi_console

@@ -8,17 +8,10 @@ end
 require 'yaml'
 
 require 'pry'
-require 'sequel'
-require 'sequel/adapters/sqlite'
 require 'cloud'
 require 'cloud/vsphere'
 
-db = Sequel.sqlite
-Sequel.extension :migration
-
-Sequel::TimestampMigrator.new(db, File.expand_path('../../db/migrations', __FILE__), {}).run
-
-bosh_director_config = OpenStruct.new(logger: Logger.new(STDOUT), uuid: 'uuid', task_checkpoint: nil, db: Sequel.sqlite)
+bosh_director_config = OpenStruct.new(logger: Logger.new(STDOUT), uuid: 'uuid', task_checkpoint: nil)
 
 Bosh::Clouds::Config.configure(bosh_director_config)
 
@@ -32,4 +25,4 @@ puts "You are connected to #{vsphere_properties['vcenters'].first['host']}"
 # Welcome to the vSphere console!
 # you can access the cpi through the 'cpi' object
 
-Pry.start binding
+Pry.start binding

data/lib/cloud/vsphere/client.rb

@@ -70,8 +70,8 @@ module VSphereCloud
       end
     end
 
-    def power_off_vm(vm)
-      task = vm.power_off
+    def power_off_vm(vm_mob)
+      task = vm_mob.power_off
       wait_for_task(task)
     end
 
@@ -92,43 +92,26 @@ module VSphereCloud
     end
 
     def delete_disk(datacenter, path)
-      tasks = []
+      base_path = path.chomp(File.extname(path))
       [".vmdk", "-flat.vmdk"].each do |extension|
-        tasks << @service_content.file_manager.delete_file("#{path}#{extension}", datacenter)
-      end
-      tasks.each do |task|
-        begin
-          wait_for_task(task)
-        rescue => e
-          unless e.message =~ /File .* was not found/
-            raise e
-          end
-        end
+        delete_path(datacenter, "#{base_path}#{extension}")
       end
     end
 
     def move_disk(source_datacenter, source_path, dest_datacenter, dest_path)
       tasks = []
+      base_source_path = source_path.chomp(File.extname(source_path))
+      base_dest_path = source_path.chomp(File.extname(dest_path))
       [".vmdk", "-flat.vmdk"].each do |extension|
         tasks << @service_content.file_manager.move_file(
-          "#{source_path}#{extension}", source_datacenter,
-          "#{dest_path}#{extension}", dest_datacenter, false
+          "#{base_source_path}#{extension}", source_datacenter,
+          "#{base_dest_path}#{extension}", dest_datacenter, false
         )
       end
 
       tasks.each { |task| wait_for_task(task) }
     end
 
-    def copy_disk(source_datacenter, source_path, dest_datacenter, dest_path)
-      tasks = []
-      [".vmdk", "-flat.vmdk"].each do |extension|
-        tasks << @service_content.file_manager.copy_file("#{source_path}#{extension}", source_datacenter,
-                                                         "#{dest_path}#{extension}", dest_datacenter, false)
-      end
-
-      tasks.each { |task| wait_for_task(task) }
-    end
-
     def create_datastore_folder(folder_path, datacenter)
       @service_content.file_manager.make_directory(folder_path, datacenter, true)
     end
@@ -152,22 +135,6 @@ 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)
@@ -245,8 +212,38 @@ module VSphereCloud
       result
     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)
+    end
+
     private
 
+    def find_disk_size_using_browser(datastore, disk_cid, disk_folder)
+      search_spec_details = VimSdk::Vim::Host::DatastoreBrowser::FileInfo::Details.new
+      search_spec_details.file_type = true # actually return VmDiskInfos not FileInfos
+
+      query_details = VimSdk::Vim::Host::DatastoreBrowser::VmDiskQuery::Details.new
+      query_details.capacity_kb = true
+
+      query = VimSdk::Vim::Host::DatastoreBrowser::VmDiskQuery.new
+      query.details = query_details
+
+      search_spec = VimSdk::Vim::Host::DatastoreBrowser::SearchSpec.new
+      search_spec.details = search_spec_details
+      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
+
+      return nil if vm_disk_infos.empty?
+
+      vm_disk_infos.first.capacity_kb / 1024
+    rescue VimSdk::SoapError
+      nil
+    end
+
     def find_perf_metric_names(mob, names)
       @lock.synchronize do
         unless @metrics_cache.has_key?(mob.class)