bosh_vsphere_cpi 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a34eef018c05343002743fbf10d259455c34ebe
-  data.tar.gz: 268febe0f8b3d79243d7edcd2749c2bf2c989935
+  metadata.gz: 60b9ea302efbf07e91dd0adc105f975ec8dcacd8
+  data.tar.gz: 1c8ef64cfb700603dd0a14f8c3e4179461225e2d
 SHA512:
-  metadata.gz: 3c65dc3f129c698aeaed6bea1fd597e40b8d7b90a5fddb7933cad41a70af2e3db50509366dc834c1e857f7c690ca5497086c66c8c6ca6ddb3134cbe4157a6a35
-  data.tar.gz: 6161c9e5cec6d4c97f94421bcac212c577a913140d566701ac2bf039edf6fc8bfaab455d5756b7d3c30b4f1013a336485535f66e0b447a3b9cefec5d5c34c1fb
+  metadata.gz: 6c86a93bead968a65f17b37c63b03110ec6a41d4ec8a6507796243a6d4a2da4e4327c41fb314e6deeeb4ee513d3c3321133fb45cd0cf7cbda8e4fba2132aa654
+  data.tar.gz: 07864ca78d8e30f593e91f031d24248eedacdb93472d20654e3409f79fd2aa746d844dd75f54b7f018eb797c0108b9906faae4f58f17d4b20a92d2efc5d5fc0a

data/lib/cloud/vsphere.rb

@@ -5,6 +5,7 @@ require 'common/thread_formatter'
 require 'ruby_vim_sdk'
 
 require 'cloud/vsphere/retry_block'
+require 'cloud/vsphere/object_stringifier'
 require 'cloud/vsphere/agent_env'
 require 'cloud/vsphere/client'
 require 'cloud/vsphere/cloud'

data/lib/cloud/vsphere/agent_env.rb

@@ -17,11 +17,11 @@ module VSphereCloud
       datastore_name = cdrom.backing.datastore.name
       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
+      raise Bosh::Clouds::CloudError.new("Could not find matching datastore name '#{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
+      raise Bosh::Clouds::CloudError.new("Unable to load env.json from '#{env_path}/env.json'") unless contents
 
       JSON.load(contents)
     end

data/lib/cloud/vsphere/client.rb

@@ -62,7 +62,7 @@ module VSphereCloud
       raise 'Recommendations were detected, you may be running in Manual DRS mode. Aborting.' if result.recommendations.any?
 
       if result.attempted.empty?
-        raise "Could not power on VM: #{result.not_attempted.map(&:msg).join(', ')}"
+        raise "Could not power on VM '#{vm}': #{result.not_attempted.map(&:fault).map(&:msg).join(', ')}"
       else
         task = result.attempted.first.task
         wait_for_task(task)
@@ -120,16 +120,6 @@ module VSphereCloud
       @service_content.root_folder.create_folder(name)
     end
 
-    def move_into_folder(folder, objects)
-      task = folder.move_into(objects)
-      wait_for_task(task)
-    end
-
-    def move_into_root_folder(objects)
-      task = @service_content.root_folder.move_into(objects)
-      wait_for_task(task)
-    end
-
     def delete_folder(folder)
       task = folder.destroy
       wait_for_task(task)
@@ -152,7 +142,7 @@ module VSphereCloud
         )[task]
 
         duration = Time.now - started
-        raise "Task taking too long" if duration > 3600 # 1 hour
+        raise "Task exceeded 60 minutes, task properties: #{properties}" if duration > 3600 # 1 hour
 
         # Update the polling interval based on task progress
         if properties["info.progress"] && properties["info.progress"] > 0

data/lib/cloud/vsphere/cloud.rb

@@ -8,8 +8,16 @@ module VSphereCloud
     include RetryBlock
 
     class TimeoutException < StandardError; end
+    class NetworkException < StandardError
+      attr_accessor :vm_cid
+
+      def message
+        super + (vm_cid ? " for VM '#{vm_cid}'" : '')
+      end
+    end
 
     attr_accessor :client
+    attr_reader :datacenter
 
     def initialize(options)
       @config = Config.build(options)
@@ -71,10 +79,10 @@ module VSphereCloud
         Dir.mktmpdir do |temp_dir|
           @logger.info("Extracting stemcell to: #{temp_dir}")
           output = `tar -C #{temp_dir} -xzf #{image} 2>&1`
-          raise "Corrupt image, tar exit status: #{$?.exitstatus} output: #{output}" if $?.exitstatus != 0
+          raise "Corrupt image '#{image}', tar exit status: #{$?.exitstatus}, output: #{output}" if $?.exitstatus != 0
 
           ovf_file = Dir.entries(temp_dir).find { |entry| File.extname(entry) == '.ovf' }
-          raise 'Missing OVF' if ovf_file.nil?
+          raise "Missing OVF for stemcell '#{stemcell}'" if ovf_file.nil?
           ovf_file = File.join(temp_dir, ovf_file)
 
           name = "sc-#{SecureRandom.uuid}"
@@ -276,8 +284,12 @@ module VSphereCloud
         @logger.debug("Reading current agent env: #{env.pretty_inspect}")
 
         devices = @cloud_searcher.get_property(vm.mob, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
-        env['networks'] = generate_network_env(devices, networks, dvs_index)
-
+        begin
+          env['networks'] = generate_network_env(devices, networks, dvs_index)
+        rescue NetworkException => e
+          e.vm_cid = vm_cid
+          raise e
+        end
         @logger.debug("Updating agent env to: #{env.pretty_inspect}")
         location = get_vm_location(vm.mob, datacenter: @datacenter.name)
         @agent_env.set_env(vm.mob, location, env)
@@ -334,7 +346,7 @@ module VSphereCloud
 
         vm.reload
         virtual_disk = vm.disk_by_cid(disk.cid)
-        raise Bosh::Clouds::DiskNotAttached.new(true), "Disk (#{disk.cid}) is not attached to VM (#{vm.cid})" if virtual_disk.nil?
+        raise Bosh::Clouds::DiskNotAttached.new(true), "Disk '#{disk.cid}' is not attached to VM '#{vm.cid}'" if virtual_disk.nil?
 
         config = Vim::Vm::ConfigSpec.new
         config.device_change = []
@@ -353,7 +365,7 @@ module VSphereCloud
           break if virtual_disk.nil?
           sleep(1.0)
         end
-        raise "Failed to detach disk: #{disk.cid} from vm: #{vm.cid}" unless virtual_disk.nil?
+        raise "Failed to detach disk '#{disk.cid}' from vm '#{vm.cid}'" unless virtual_disk.nil?
 
         @logger.info('Finished detaching disk')
       end
@@ -386,9 +398,9 @@ module VSphereCloud
     end
 
     def replicate_stemcell(cluster, datastore, stemcell)
-      stemcell_vm = client.find_by_inventory_path([cluster.datacenter.name, 'vm',
-                                                   cluster.datacenter.template_folder.path_components, stemcell])
-      raise "Could not find stemcell: #{stemcell}" if stemcell_vm.nil?
+      stemcell_vm_path_components = [cluster.datacenter.name, 'vm', cluster.datacenter.template_folder.path_components, stemcell]
+      stemcell_vm = client.find_by_inventory_path(stemcell_vm_path_components)
+      raise "Could not find VM for stemcell '#{stemcell}' at path '#{stemcell_vm_path_components.join("/")}'" if stemcell_vm.nil?
       stemcell_datastore = @cloud_searcher.get_property(stemcell_vm, Vim::VirtualMachine, 'datastore', ensure_all: true)
 
       if stemcell_datastore != datastore.mob
@@ -435,7 +447,9 @@ module VSphereCloud
       networks.each do |network_name, network|
         network_entry = network.dup
         v_network_name = network['cloud_properties']['name']
-        nic = nics[v_network_name].pop
+        network = nics[v_network_name]
+        raise NetworkException, "Could not find network '#{v_network_name}'" if network.nil?
+        nic = network.pop
         network_entry['mac'] = nic.mac_address
         network_env[network_name] = network_entry
       end
@@ -481,7 +495,7 @@ module VSphereCloud
 
         unless datastore_name
           devices = vm_properties['config.hardware.device']
-          datastore = get_primary_datastore(devices)
+          datastore = get_primary_datastore(devices, vm_name)
           datastore_name = @cloud_searcher.get_property(datastore, Vim::Datastore, 'name')
         end
       end
@@ -489,17 +503,16 @@ module VSphereCloud
       { datacenter: datacenter_name, datastore: datastore_name, vm: vm_name }
     end
 
-    def get_primary_datastore(devices)
+    def get_primary_datastore(devices, vm_name = nil)
       ephemeral_disks = devices.select { |device| device.kind_of?(Vim::Vm::Device::VirtualDisk) &&
         device.backing.disk_mode != Vim::Vm::Device::VirtualDiskOption::DiskMode::INDEPENDENT_PERSISTENT }
 
-      datastore = nil
-      ephemeral_disks.each do |disk|
-        if datastore
-          raise 'Ephemeral disks should all be on the same datastore.' unless datastore.eql?(disk.backing.datastore)
-        else
-          datastore = disk.backing.datastore
-        end
+      datastore = ephemeral_disks.first.backing.datastore
+      disk_in_wrong_datastore = ephemeral_disks.find { |disk| !datastore.eql?(disk.backing.datastore) }
+      if disk_in_wrong_datastore
+        error_msg = vm_name ? "for VM '#{vm_name}'" : ""
+        raise "Ephemeral disks #{error_msg} should all be on the same datastore. " +
+            "Expected datastore '#{datastore}' to match datastore '#{disk_in_wrong_datastore.backing.datastore}'"
       end
 
       datastore
@@ -524,7 +537,7 @@ module VSphereCloud
     end
 
     def create_nic_config_spec(v_network_name, network, controller_key, dvs_index)
-      raise "Can't find network: #{v_network_name}" if network.nil?
+      raise "Invalid network '#{v_network_name}'" if network.nil?
       if network.class == Vim::Dvs::DistributedVirtualPortgroup
         portgroup_properties = @cloud_searcher.get_properties(network,
                                                      Vim::Dvs::DistributedVirtualPortgroup,

data/lib/cloud/vsphere/cloud_searcher.rb

@@ -50,7 +50,7 @@ module VSphereCloud
             end
           end
           unless remaining_properties.empty?
-            raise MissingPropertiesException.new("The object[s] #{obj} " +
+            raise MissingPropertiesException.new("The object[s] '#{obj}' " +
               "should have the following properties: #{properties.pretty_inspect}, " +
               "but they were missing these: #{remaining_properties.pretty_inspect}.")
           end
@@ -93,8 +93,8 @@ module VSphereCloud
 
     def get_managed_object(type, options)
       result = get_managed_objects(type, options)
-      raise "Could not find #{type}: #{options.pretty_inspect}" if result.length == 0
-      raise "Found more than one #{type}: #{options.pretty_inspect}" if result.length > 1
+      raise "Could not find '#{type}': #{options.pretty_inspect}" if result.length == 0
+      raise "Found more than one '#{type}': #{options.pretty_inspect}" if result.length > 1
       result.first
     end
 

data/lib/cloud/vsphere/disk_provider.rb

@@ -26,7 +26,9 @@ module VSphereCloud
 
     def find_and_move(disk_cid, cluster, datacenter, accessible_datastores)
       disk = find(disk_cid)
-      return disk if accessible_datastores.include?(disk.datastore.name)
+      disk_in_persistent_datastore = @datacenter.persistent_datastores.include?(disk.datastore.name)
+      disk_in_accessible_datastore = accessible_datastores.include?(disk.datastore.name)
+      return disk if disk_in_persistent_datastore && disk_in_accessible_datastore
 
       destination_datastore = @resources.pick_persistent_datastore_in_cluster(cluster.name, disk.size_in_mb)
 
@@ -46,6 +48,15 @@ module VSphereCloud
       @logger.debug("Looking for disk #{disk_cid} in datastores: #{persistent_datastores}")
       persistent_datastores.each do |_, datastore|
         disk = @client.find_disk(disk_cid, datastore, @disk_path)
+        @logger.debug("disk #{disk_cid} found in: #{datastore}") unless disk.nil?
+        return disk unless disk.nil?
+      end
+
+      other_datastores = @datacenter.all_datastores.reject{|datastore_name, _| persistent_datastores[datastore_name] }
+      @logger.debug("disk #{disk_cid} not found in filtered persistent datastores, trying other datastores: #{other_datastores}")
+      other_datastores.each do |_, datastore|
+        disk = @client.find_disk(disk_cid, datastore, @disk_path)
+        @logger.debug("disk #{disk_cid} found in: #{datastore}") unless disk.nil?
         return disk unless disk.nil?
       end
 

data/lib/cloud/vsphere/file_provider.rb

@@ -19,7 +19,7 @@ module VSphereCloud
         elsif response.code == 404
           nil
         else
-          raise "Could not fetch file: #{url}, status code: #{response.code}"
+          raise "Could not fetch file '#{url}', received status code '#{response.code}'"
         end
       end
     end
@@ -35,7 +35,7 @@ module VSphereCloud
           { 'Content-Type' => 'application/octet-stream', 'Content-Length' => contents.length })
 
         unless response.code < 400
-          raise "Could not upload file: #{url}, status code: #{response.code}"
+          raise "Could not upload file '#{url}', received status code '#{response.code}'"
         end
       end
     end

data/lib/cloud/vsphere/fixed_cluster_placer.rb

@@ -1,5 +1,8 @@
 module VSphereCloud
   class FixedClusterPlacer
+    include ObjectStringifier
+    stringify_with :cluster
+
     attr_reader :drs_rules
 
     def initialize(cluster, drs_rules)
@@ -21,5 +24,9 @@ module VSphereCloud
     def pick_persistent_datastore(_, _)
       raise NotImplementedError
     end
+
+    private
+
+    attr_reader :cluster
   end
 end

data/lib/cloud/vsphere/object_stringifier.rb

@@ -0,0 +1,15 @@
+module VSphereCloud
+  module ObjectStringifier
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def stringify_with(*attributes)
+        define_method(:to_s) do
+          "(#{self.class.name} (#{attributes.map{|attr| "#{attr}=\"#{self.send(attr)}\""}.join(', ')}))"
+        end
+      end
+    end
+  end
+end

data/lib/cloud/vsphere/resources.rb

@@ -2,6 +2,8 @@ require 'cloud/vsphere/resources/datacenter'
 
 module VSphereCloud
   class Resources
+    include ObjectStringifier
+    stringify_with :datacenter
     MEMORY_HEADROOM = 128
     DISK_HEADROOM = 1024
     STALE_TIMEOUT = 60
@@ -28,7 +30,7 @@ module VSphereCloud
       @lock.synchronize do
         cluster = @datacenter.clusters[cluster_name]
         if cluster.nil?
-          raise Bosh::Clouds::CloudError, "Couldn't find cluster '#{cluster_name}'. Found #{@datacenter.clusters.values.map(&:name)}"
+          raise Bosh::Clouds::CloudError, "Couldn't find cluster '#{cluster_name}'. Found: #{@datacenter.clusters.values.map(&:name)}"
         end
 
         datastore = cluster.pick_persistent(disk_size_in_mb)
@@ -122,7 +124,7 @@ module VSphereCloud
 
     private
 
-    attr_reader :config
+    attr_reader :config, :datacenter
 
 
     class PersistentDiskIndex

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

@@ -4,6 +4,8 @@ module VSphereCloud
   class Resources
     class Cluster
       include VimSdk
+      include ObjectStringifier
+      stringify_with :name
 
       PROPERTIES = %w(name datastore resourcePool host)
       HOST_PROPERTIES = %w(hardware.memorySize runtime.inMaintenanceMode)
@@ -114,14 +116,22 @@ module VSphereCloud
         @persistent_datastores ||= select_datastores(@datacenter_persistent_datastore_pattern)
       end
 
+      def all_datastores
+        @all_datastores ||= Datastore.build_from_client(
+          @client,
+          properties['datastore']
+        ).inject({}) do |acc, datastore|
+          acc[datastore.name] = datastore
+          acc
+        end
+      end
+
       private
 
       attr_reader :config, :client, :properties, :logger
 
       def select_datastores(pattern)
-        @datastores ||= Datastore.build_from_client(@client, properties['datastore'])
-        matching_datastores = @datastores.select { |datastore| datastore.name =~ pattern }
-        matching_datastores.inject({}) { |h, datastore| h[datastore.name] = datastore; h }
+        all_datastores.select { |name, datastore| name =~ pattern }
       end
 
       def pick_store(type, size)
@@ -204,7 +214,7 @@ module VSphereCloud
       # @return [void]
       def fetch_resource_pool_utilization
         properties = @client.cloud_searcher.get_properties(resource_pool.mob, Vim::ResourcePool, 'summary')
-        raise "Failed to get utilization for resource pool #{resource_pool}" if properties.nil?
+        raise "Failed to get utilization for resource pool '#{resource_pool}'" if properties.nil?
 
         runtime_info = properties["summary"].runtime
 

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

@@ -9,13 +9,13 @@ module VSphereCloud
 
       def find(name, config)
         cluster_mob = cluster_mobs[name]
-        raise "Can't find cluster: #{name}" if cluster_mob.nil?
+        raise "Can't find cluster '#{name}'" if cluster_mob.nil?
 
         cluster_properties = @client.cloud_searcher.get_properties(
           cluster_mob, VimSdk::Vim::ClusterComputeResource,
           Cluster::PROPERTIES, :ensure_all => true
         )
-        raise "Can't find properties for cluster: #{name}" if cluster_properties.nil?
+        raise "Can't find properties for cluster '#{name}'" if cluster_properties.nil?
 
         Cluster.new(
           @datacenter,

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

@@ -4,6 +4,8 @@ module VSphereCloud
   class Resources
     class Datacenter
       include VimSdk
+      include ObjectStringifier
+      stringify_with :name
 
       attr_accessor :config
 
@@ -27,7 +29,7 @@ module VSphereCloud
 
       def mob
         mob = @client.find_by_inventory_path(name)
-        raise "Datacenter: #{name} not found" if mob.nil?
+        raise "Datacenter '#{name}' not found" if mob.nil?
         mob
       end
 
@@ -70,17 +72,22 @@ module VSphereCloud
         @clusters.each do |cluster_name, cluster_config|
           clusters[cluster_name] = @cluster_provider.find(cluster_name, cluster_config)
         end
+        @logger.debug("All clusters provided: #{@clusters}")
         clusters
       end
 
       def persistent_datastores
-        datastores = {}
-        clusters.each do |_, cluster|
-          cluster.persistent_datastores.each do |_, datastore|
-            datastores[datastore.name] = datastore
-          end
+        clusters.values.inject({}) do |acc, cluster|
+          acc.merge!(cluster.persistent_datastores)
+          acc
+        end
+      end
+
+      def all_datastores
+        clusters.values.inject({}) do |acc, cluster|
+          acc.merge!(cluster.all_datastores)
+          acc
         end
-        datastores
       end
 
       def pick_persistent_datastore(size)
@@ -95,14 +102,14 @@ module VSphereCloud
         datastores = persistent_datastores.values
         available_datastores = datastores.reject { |datastore| datastore.free_space - size < DISK_HEADROOM }
 
-        @logger.debug("Looking for a #{type} datastore with #{size}MB free space.")
+        @logger.debug("Looking for a '#{type}' datastore with #{size}MB free space.")
         @logger.debug("All datastores: #{datastores.map(&:debug_info)}")
         @logger.debug("Datastores with enough space: #{available_datastores.map(&:debug_info)}")
 
         selected_datastore = Util.weighted_random(available_datastores.map { |datastore| [datastore, datastore.free_space] })
 
         if selected_datastore.nil?
-          raise Bosh::Clouds::NoDiskSpace.new(true), "Couldn't find a #{type} datastore with #{size}MB of free space. Found:\n #{datastores.map(&:debug_info).join("\n ")}\n"
+          raise Bosh::Clouds::NoDiskSpace.new(true), "Couldn't find a '#{type}' datastore with #{size}MB of free space. Found:\n #{datastores.map(&:debug_info).join("\n ")}\n"
         end
         selected_datastore
       end

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

@@ -4,6 +4,8 @@ module VSphereCloud
   class Resources
     class Datastore
       include VimSdk
+      include ObjectStringifier
+      stringify_with :name, :mob
       PROPERTIES = %w(summary.freeSpace summary.capacity name)
 
       def self.build_from_client(client, datastore_properties)

data/lib/cloud/vsphere/resources/disk/ephemeral_disk.rb

@@ -2,6 +2,7 @@ require 'cloud/vsphere/resources/disk/disk_config'
 
 module VSphereCloud
   class EphemeralDisk
+    DISK_NAME = 'ephemeral_disk'
     def initialize(size_in_mb, folder_name, datastore)
       @folder_name = folder_name
       @datastore = datastore
@@ -15,7 +16,7 @@ module VSphereCloud
     private
 
     def filename
-      "[#{@datastore.name}] #{@folder_name}/ephemeral_disk.vmdk"
+      "[#{@datastore.name}] #{@folder_name}/#{DISK_NAME}.vmdk"
     end
   end
 end

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

@@ -18,7 +18,7 @@ module VSphereCloud
       def find_or_create_folder(path_components)
         if path_components.empty?
           folder = root_vm_folder
-          raise "Root VM Folder not found: #{@datacenter_name}/vm" if folder.nil?
+          raise "Root VM Folder not found '#{@datacenter_name}/vm'" if folder.nil?
           return folder
         end
 

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

@@ -3,6 +3,8 @@ module VSphereCloud
     class VM
       include VimSdk
       include RetryBlock
+      include ObjectStringifier
+      stringify_with :cid
 
       attr_reader :mob, :cid
 
@@ -64,6 +66,12 @@ module VSphereCloud
         end
       end
 
+      def ephemeral_disk
+        devices.find do |device|
+          device.kind_of?(Vim::Vm::Device::VirtualDisk) && device.backing.file_name =~ /#{VSphereCloud::EphemeralDisk::DISK_NAME}.vmdk$/
+        end
+      end
+
       def pci_controller
         devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualPCIController) }
       end
@@ -157,12 +165,12 @@ module VSphereCloud
         end
       end
 
-      private
-
       def power_state
         properties['runtime.powerState']
       end
 
+      private
+
       def properties
         @properties ||= cloud_searcher.get_properties(
           @mob,

data/lib/cloud/vsphere/vm_creator.rb

@@ -19,7 +19,7 @@ module VSphereCloud
 
     def create(agent_id, stemcell_cid, networks, persistent_disk_cids, environment)
       stemcell_vm = @cpi.stemcell_vm(stemcell_cid)
-      raise "Could not find stemcell: #{stemcell_cid}" if stemcell_vm.nil?
+      raise "Could not find VM for stemcell '#{stemcell_cid}'" if stemcell_vm.nil?
 
       stemcell_size =
         @cloud_searcher.get_property(stemcell_vm, VimSdk::Vim::VirtualMachine, 'summary.storage.committed', ensure_all: true)
@@ -94,13 +94,18 @@ module VSphereCloud
 
         @agent_env.set_env(created_vm.mob, location, env)
 
-        @logger.info("Powering on VM: #{created_vm} (#{created_vm.cid})")
+        @logger.info("Powering on VM: #{created_vm}")
         created_vm.power_on
 
         create_drs_rules(created_vm.mob, cluster)
       rescue => e
+        e.vm_cid = vm_cid if e.instance_of?(Cloud::NetworkException)
         @logger.info("#{e} - #{e.backtrace.join("\n")}")
-        created_vm.delete if created_vm
+        begin
+          created_vm.delete if created_vm
+        rescue => ex
+          @logger.info("Failed to delete vm '#{vm_cid}' with message:  #{ex.inspect}")
+        end
         raise e
       end
 
@@ -118,7 +123,7 @@ module VSphereCloud
       rule_config = @placer.drs_rules.first
 
       if rule_config['type'] != 'separate_vms'
-        raise "vSphere CPI only supports DRS rule of 'separate_vms' type"
+        raise "vSphere CPI only supports DRS rule of 'separate_vms' type, not '#{rule_config['type']}'"
       end
 
       drs_rule = VSphereCloud::DrsRule.new(

data/lib/cloud/vsphere/vm_provider.rb

@@ -8,7 +8,7 @@ module VSphereCloud
 
     def find(vm_cid)
       vm_mob = @client.find_by_inventory_path(@datacenter.vm_path(vm_cid))
-      raise Bosh::Clouds::VMNotFound, "VM `#{vm_cid}' not found" if vm_mob.nil?
+      raise Bosh::Clouds::VMNotFound, "VM '#{vm_cid}' not found at path '#{@datacenter.vm_path(vm_cid)}'" if vm_mob.nil?
 
       Resources::VM.new(vm_cid, vm_mob, @client, @logger)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -133,6 +133,7 @@ files:
 - lib/cloud/vsphere/fixed_cluster_placer.rb
 - lib/cloud/vsphere/lease_obtainer.rb
 - lib/cloud/vsphere/lease_updater.rb
+- lib/cloud/vsphere/object_stringifier.rb
 - lib/cloud/vsphere/path_finder.rb
 - lib/cloud/vsphere/resources.rb
 - lib/cloud/vsphere/resources/cluster.rb