bosh_vsphere_cpi 1.2690.4.0 → 1.2693.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 891a95afcb3fa6552a51216efc923b9a9bdc3706
-  data.tar.gz: ab195064157845a46715c6bebce2b5a00aa48fdb
+  metadata.gz: 0a37fd96a19b749f7fb7023caeb04e53d9e2fb64
+  data.tar.gz: 5d99a25f25a4f27b9dfb893ef273d863733cd525
 SHA512:
-  metadata.gz: 38ba8d39aa0dcad873f1f471c67c315905a5332e73c7a35d425dec05e255c3c1e46eafc3d3931949267921cf5db3b1cf7c0cf41a47f0d4712accfef0a0d51c7e
-  data.tar.gz: f18331b1fe07adab8d9b491e94c99d562a21484f2c749a450bba57f70ce372a3f657c0faa163944b509416a04d61ab951a50b22fd5392f2ff1a5f718097bd13b
+  metadata.gz: fe5b85fae3bed0d442b7bbe1f69997b573171afd78ab582d7a5201272ece1a5c80a07ce666c80b53729b672529148faf74d88edaf5573fc886e95f922ce924df
+  data.tar.gz: 913bb1de5cabef9f080cfbbb44e6408aec39949561901c88c86ed71eebbd92f953e35b94b7076803862e9381060022ed301cae8800ce12e8f90be2ebe4e9a3d5

data/lib/cloud/vsphere/agent_env.rb

@@ -3,9 +3,10 @@ module VSphereCloud
     include VimSdk
     include RetryBlock
 
-    def initialize(client, file_provider)
+    def initialize(client, file_provider, cloud_searcher)
       @client = client
       @file_provider = file_provider
+      @cloud_searcher = cloud_searcher
     end
 
     def get_current_env(vm, datacenter_name)
@@ -30,7 +31,7 @@ module VSphereCloud
       @file_provider.upload_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.json", env_json)
       @file_provider.upload_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.iso", generate_env_iso(env_json))
 
-      datastore = @client.get_managed_object(Vim::Datastore, name: location[:datastore])
+      datastore = @cloud_searcher.get_managed_object(Vim::Datastore, name: location[:datastore])
       file_name = "[#{location[:datastore]}] #{location[:vm]}/env.iso"
 
       update_cdrom_env(vm, datastore, file_name)

data/lib/cloud/vsphere/client.rb

@@ -1,41 +1,27 @@
 require 'ruby_vim_sdk'
+require 'cloud/vsphere/cloud_searcher'
+require 'cloud/vsphere/soap_stub'
 
 module VSphereCloud
 
   class Client
     include VimSdk
-    PC = Vmodl::Query::PropertyCollector
-
     class AlreadyLoggedInException < StandardError; end
     class NotLoggedInException < StandardError; end
 
-    attr_accessor :service_content
-    attr_accessor :soap_stub
-    attr_accessor :service_instance
-
-    def initialize(host, options = {})
-      http_client = HTTPClient.new
-      soap_log = options['soap_log']
-      case soap_log
-      when String
-        log_file = File.open(soap_log, 'w')
-        log_file.sync = true
-        http_client.debug_dev = log_file
-      when IO, StringIO
-        http_client.debug_dev = soap_log
-      end
-      http_client.send_timeout = 14400
-      http_client.receive_timeout = 14400
-      http_client.connect_timeout = 30
-      http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    attr_reader :cloud_searcher, :service_content, :service_instance, :soap_stub
+
+    def initialize(host, options={})
+      @soap_stub = SoapStub.new(host, options[:soap_log]).create
 
-      @soap_stub = Soap::StubAdapter.new(host, 'vim.version.version6', http_client)
+      @service_instance =Vim::ServiceInstance.new('ServiceInstance', @soap_stub)
+      @service_content = @service_instance.content
 
-      @service_instance = Vim::ServiceInstance.new('ServiceInstance', soap_stub)
-      @service_content = service_instance.content
       @metrics_cache  = {}
       @lock = Mutex.new
       @logger = Bosh::Clouds::Config.logger
+
+      @cloud_searcher = CloudSearcher.new(service_content, @logger)
     end
 
     def login(username, password, locale)
@@ -49,94 +35,9 @@ module VSphereCloud
       @service_content.session_manager.logout
     end
 
-    def get_properties(obj, type, properties, options = {})
-      properties = [properties] if properties.kind_of?(String)
-      property_specs = [PC::PropertySpec.new(:type => type, :all => false, :path_set => properties)]
-
-      if obj.is_a?(Vmodl::ManagedObject)
-        object_spec = PC::ObjectSpec.new(:obj => obj, :skip => false)
-      else
-        object_spec = obj.collect { |o| PC::ObjectSpec.new(:obj => o, :skip => false) }
-      end
-
-      filter_spec = PC::FilterSpec.new(:prop_set => property_specs, :object_set => object_spec)
-
-      attempts = 0
-      begin
-        properties_response = get_all_properties(filter_spec)
-        result = {}
-
-        properties_response.each do |object_content|
-          object_properties = {:obj => object_content.obj}
-          if options[:ensure_all]
-            remaining_properties = Set.new(properties)
-          else
-            remaining_properties = Set.new(options[:ensure])
-          end
-          if object_content.prop_set
-            object_content.prop_set.each do |property|
-              object_properties[property.name] = property.val
-              remaining_properties.delete(property.name)
-            end
-          end
-          unless remaining_properties.empty?
-            raise "The object[s] #{obj.pretty_inspect} " +
-                      "should have the following properties: #{properties.pretty_inspect}, " +
-                      "but they were missing these: #{remaining_properties.pretty_inspect}."
-          end
-          result[object_content.obj] = object_properties
-        end
-
-        result = result.values.first if obj.is_a?(Vmodl::ManagedObject)
-        result
-      rescue => e
-        attempts += 1
-        if attempts < 8
-          sleep_interval = 2 ** attempts
-          @logger.warn("Error retrieving properties, retrying in #{sleep_interval} seconds: " +
-                       "#{e} - #{e.backtrace.join("\n")}")
-          sleep(sleep_interval)
-          retry
-        else
-          raise e
-        end
-      end
-    end
-
-    def get_property(obj, type, property, options = {})
-      get_properties(obj, type, property, options)[property]
-    end
-
-    def get_managed_objects(type, options={})
-      root = options[:root] || @service_content.root_folder
-      property_specs = [PC::PropertySpec.new(:type => type, :all => false, :path_set => ["name"])]
-      filter_spec = get_search_filter_spec(root, property_specs)
-      object_specs = get_all_properties(filter_spec)
-
-      result = []
-      object_specs.each do |object_spec|
-        name = object_spec.prop_set.first.val
-        if options[:name].nil? || name == options[:name]
-          if options[:include_name]
-            result << [name , object_spec.obj]
-          else
-            result << object_spec.obj
-          end
-        end
-      end
-      result
-    end
-
-    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
-      result.first
-    end
-
     def find_parent(obj, parent_type)
       while obj && obj.class != parent_type
-        obj = get_property(obj, obj.class, "parent", :ensure_all => true)
+        obj = @cloud_searcher.get_property(obj, obj.class, "parent", :ensure_all => true)
       end
       obj
     end
@@ -175,7 +76,7 @@ module VSphereCloud
     end
 
     def get_cdrom_device(vm)
-      devices = get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
+      devices = @cloud_searcher.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
       devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
     end
 
@@ -199,8 +100,10 @@ module VSphereCloud
     def move_disk(source_datacenter, source_path, dest_datacenter, dest_path)
       tasks = []
       [".vmdk", "-flat.vmdk"].each do |extension|
-        tasks << @service_content.file_manager.move_file("#{source_path}#{extension}", source_datacenter,
-                                                         "#{dest_path}#{extension}", dest_datacenter, false)
+        tasks << @service_content.file_manager.move_file(
+          "#{source_path}#{extension}", source_datacenter,
+          "#{dest_path}#{extension}", dest_datacenter, false
+        )
       end
 
       tasks.each { |task| wait_for_task(task) }
@@ -260,8 +163,12 @@ module VSphereCloud
       interval = 1.0
       started = Time.now
       loop do
-        properties = get_properties([task], Vim::Task, ["info.progress", "info.state", "info.result", "info.error"],
-                                    :ensure => ["info.state"])[task]
+        properties = @cloud_searcher.get_properties(
+          [task],
+          Vim::Task,
+          ["info.progress", "info.state", "info.result", "info.error"],
+          ensure: ["info.state"]
+        )[task]
 
         duration = Time.now - started
         raise "Task taking too long" if duration > 3600 # 1 hour
@@ -291,128 +198,6 @@ module VSphereCloud
       end
     end
 
-    def get_search_filter_spec(obj, property_specs)
-      resource_pool_traversal_spec = PC::TraversalSpec.new(
-          :name => "resourcePoolTraversalSpec",
-          :type => Vim::ResourcePool,
-          :path => "resourcePool",
-          :skip => false,
-          :select_set => [
-             PC::SelectionSpec.new(:name => "resourcePoolTraversalSpec"),
-             PC::SelectionSpec.new(:name => "resourcePoolVmTraversalSpec")
-          ]
-      )
-
-      resource_pool_vm_traversal_spec = PC::TraversalSpec.new(
-          :name => "resourcePoolVmTraversalSpec",
-          :type => Vim::ResourcePool,
-          :path => "vm",
-          :skip => false
-      )
-
-      compute_resource_rp_traversal_spec = PC::TraversalSpec.new(
-          :name => "computeResourceRpTraversalSpec",
-          :type => Vim::ComputeResource,
-          :path => "resourcePool",
-          :skip => false,
-          :select_set => [
-              PC::SelectionSpec.new(:name => "resourcePoolTraversalSpec"),
-              PC::SelectionSpec.new(:name => "resourcePoolVmTraversalSpec")
-          ]
-      )
-
-      compute_resource_datastore_traversal_spec = PC::TraversalSpec.new(
-          :name => "computeResourceDatastoreTraversalSpec",
-          :type => Vim::ComputeResource,
-          :path => "datastore",
-          :skip => false
-      )
-
-      compute_resource_host_traversal_spec = PC::TraversalSpec.new(
-          :name => "computeResourceHostTraversalSpec",
-          :type => Vim::ComputeResource,
-          :path => "host",
-          :skip => false
-      )
-
-      datacenter_host_traversal_spec = PC::TraversalSpec.new(
-          :name => "datacenterHostTraversalSpec",
-          :type => Vim::Datacenter,
-          :path => "hostFolder",
-          :skip => false,
-          :select_set => [
-              PC::SelectionSpec.new(:name => "folderTraversalSpec")
-          ]
-      )
-
-      datacenter_vm_traversal_spec = PC::TraversalSpec.new(
-          :name => "datacenterVmTraversalSpec",
-          :type => Vim::Datacenter,
-          :path => "vmFolder",
-          :skip => false,
-          :select_set => [
-              PC::SelectionSpec.new(:name => "folderTraversalSpec")
-          ]
-      )
-
-      host_vm_traversal_spec = PC::TraversalSpec.new(
-          :name => "hostVmTraversalSpec",
-          :type => Vim::HostSystem,
-          :path => "vm",
-          :skip => false,
-          :select_set => [
-              PC::SelectionSpec.new(:name => "folderTraversalSpec")
-          ]
-      )
-
-      folder_traversal_spec = PC::TraversalSpec.new(
-          :name => "folderTraversalSpec",
-          :type => Vim::Folder,
-          :path => "childEntity",
-          :skip => false,
-          :select_set => [
-              PC::SelectionSpec.new(:name => "folderTraversalSpec"),
-              PC::SelectionSpec.new(:name => "datacenterHostTraversalSpec"),
-              PC::SelectionSpec.new(:name => "datacenterVmTraversalSpec"),
-              PC::SelectionSpec.new(:name => "computeResourceRpTraversalSpec"),
-              PC::SelectionSpec.new(:name => "computeResourceDatastoreTraversalSpec"),
-              PC::SelectionSpec.new(:name => "computeResourceHostTraversalSpec"),
-              PC::SelectionSpec.new(:name => "hostVmTraversalSpec"),
-              PC::SelectionSpec.new(:name => "resourcePoolVmTraversalSpec")
-          ]
-      )
-
-      obj_spec = PC::ObjectSpec.new(
-          :obj => obj,
-          :skip => false,
-          :select_set => [
-              folder_traversal_spec,
-              datacenter_vm_traversal_spec,
-              datacenter_host_traversal_spec,
-              compute_resource_host_traversal_spec,
-              compute_resource_datastore_traversal_spec,
-              compute_resource_rp_traversal_spec,
-              resource_pool_traversal_spec,
-              host_vm_traversal_spec,
-              resource_pool_vm_traversal_spec
-          ]
-      )
-
-      PC::FilterSpec.new(:prop_set => property_specs, :object_set => [obj_spec])
-    end
-
-    def get_all_properties(filter_spec)
-      result = []
-      retrieve_result = @service_content.property_collector.retrieve_properties_ex([filter_spec],
-                                                                                   PC::RetrieveOptions.new)
-      until retrieve_result.nil?
-        retrieve_result.objects.each { |object_content| result << object_content }
-        break if retrieve_result.token.nil?
-        retrieve_result = @service_content.property_collector.continue_retrieve_properties_ex(retrieve_result.token)
-      end
-      result
-    end
-
     def get_perf_counters(mobs, names, options = {})
       metrics = find_perf_metric_names(mobs.first, names)
       metric_ids = metrics.values
@@ -446,6 +231,8 @@ module VSphereCloud
       result
     end
 
+    private
+
     def find_perf_metric_names(mob, names)
       @lock.synchronize do
         unless @metrics_cache.has_key?(mob.class)
@@ -477,5 +264,4 @@ module VSphereCloud
       result
     end
   end
-
 end

data/lib/cloud/vsphere/cloud.rb

@@ -9,6 +9,7 @@ require 'cloud/vsphere/file_provider'
 require 'cloud/vsphere/agent_env'
 require 'cloud/vsphere/lease_obtainer'
 require 'cloud/vsphere/lease_updater'
+require 'cloud/vsphere/drs_rules/drs_rule_cleaner'
 require 'cloud/vsphere/resources'
 require 'cloud/vsphere/resources/cluster'
 require 'cloud/vsphere/resources/datacenter'
@@ -38,9 +39,11 @@ module VSphereCloud
 
       @logger = config.logger
       @client = config.client
+      @cloud_searcher = CloudSearcher.new(@client.service_content, @logger)
+
       @resources = Resources.new(config)
       @file_provider = FileProvider.new(config.rest_client, config.vcenter_host)
-      @agent_env = AgentEnv.new(client, @file_provider)
+      @agent_env = AgentEnv.new(client, @file_provider, @cloud_searcher)
 
       # Global lock
       @lock = Mutex.new
@@ -76,7 +79,12 @@ module VSphereCloud
       disk = VSphereCloud::Models::Disk.find(uuid: disk_id)
 
       return false unless disk
-      return false unless disk.path
+      # Disk path is only being set when disk is created in vSphere.
+      # If the path is not set it means that disk was only created in
+      # CPI database and attach disk was not called or failed.
+      # We consider that disk is missing only if CPI desired state
+      # is to be present but it actually missing in infrastructure.
+      return true unless disk.path
       return false unless disk.datacenter
 
       @client.has_disk?(disk.path, disk.datacenter)
@@ -103,7 +111,7 @@ module VSphereCloud
 
           import_spec_result = import_ovf(name, ovf_file, cluster.resource_pool.mob, datastore.mob)
 
-          lease_obtainer = LeaseObtainer.new(@client, @logger)
+          lease_obtainer = LeaseObtainer.new(@cloud_searcher, @logger)
           nfc_lease = lease_obtainer.obtain(
             cluster.resource_pool,
             import_spec_result.import_spec,
@@ -115,7 +123,7 @@ module VSphereCloud
           result = name
 
           @logger.info('Removing NICs')
-          devices = client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
+          devices = @cloud_searcher.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
           config = Vim::Vm::ConfigSpec.new
           config.device_change = []
 
@@ -142,8 +150,8 @@ module VSphereCloud
         Bosh::ThreadPool.new(max_threads: 32, logger: @logger).wrap do |pool|
           @resources.datacenters.each_value do |datacenter|
             @logger.info("Looking for stemcell replicas in: #{datacenter.name}")
-            templates = client.get_property(datacenter.template_folder.mob, Vim::Folder, 'childEntity', ensure_all: true)
-            template_properties = client.get_properties(templates, Vim::VirtualMachine, ['name'])
+            templates = @cloud_searcher.get_property(datacenter.template_folder.mob, Vim::Folder, 'childEntity', ensure_all: true)
+            template_properties = @cloud_searcher.get_properties(templates, Vim::VirtualMachine, ['name'])
             template_properties.each_value do |properties|
               template_name = properties['name'].gsub('%2f', '/')
               if template_name.split('/').first.strip == stemcell
@@ -186,6 +194,7 @@ module VSphereCloud
           choose_placer(cloud_properties),
           cloud_properties,
           @client,
+          @cloud_searcher,
           @logger,
           self,
           @agent_env,
@@ -201,7 +210,7 @@ module VSphereCloud
         vm = get_vm_by_cid(vm_cid)
         datacenter = client.find_parent(vm, Vim::Datacenter)
         properties =
-          client.get_properties(
+          @cloud_searcher.get_properties(
             vm,
             Vim::VirtualMachine,
             ['runtime.powerState', 'runtime.question', 'config.hardware.device', 'name'],
@@ -215,7 +224,7 @@ module VSphereCloud
             @logger.info("VM is blocked on a question: #{question.text}, " +
                            "providing default answer: #{choices.choice_info[choices.default_index].label}")
             client.answer_vm(vm, question.id, choices.choice_info[choices.default_index].key)
-            power_state = client.get_property(vm, Vim::VirtualMachine, 'runtime.powerState')
+            power_state = @cloud_searcher.get_property(vm, Vim::VirtualMachine, 'runtime.powerState')
           else
             power_state = properties['runtime.powerState']
           end
@@ -256,6 +265,12 @@ module VSphereCloud
             end
           end
         end
+
+        DrsRuleCleaner.new(
+          @cloud_searcher,
+          @client.service_content.custom_fields_manager,
+          @logger
+        ).clean
       end
     end
 
@@ -263,7 +278,7 @@ module VSphereCloud
       with_thread_name("reboot_vm(#{vm_cid})") do
         vm = get_vm_by_cid(vm_cid)
         datacenter = client.find_parent(vm, Vim::Datacenter)
-        power_state = client.get_property(vm, Vim::VirtualMachine, 'runtime.powerState')
+        power_state = @cloud_searcher.get_property(vm, Vim::VirtualMachine, 'runtime.powerState')
 
         @logger.info("Reboot vm = #{vm_cid}")
         if power_state != Vim::VirtualMachine::PowerState::POWERED_ON
@@ -336,9 +351,9 @@ module VSphereCloud
 
         @logger.info("Configuring: #{vm_cid} to use the following network settings: #{networks.pretty_inspect}")
         vm = get_vm_by_cid(vm_cid)
-        devices = client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
+        devices = @cloud_searcher.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
         datacenter = client.find_parent(vm, Vim::Datacenter)
-        datacenter_name = client.get_property(datacenter, Vim::Datacenter, 'name')
+        datacenter_name = @cloud_searcher.get_property(datacenter, Vim::Datacenter, 'name')
         pci_controller = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualPCIController) }
 
         config = Vim::Vm::ConfigSpec.new
@@ -364,7 +379,7 @@ module VSphereCloud
         env = @agent_env.get_current_env(vm, datacenter_name)
         @logger.debug("Reading current agent env: #{env.pretty_inspect}")
 
-        devices = client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
+        devices = @cloud_searcher.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
         env['networks'] = generate_network_env(devices, networks, dvs_index)
 
         @logger.debug("Updating agent env to: #{env.pretty_inspect}")
@@ -377,18 +392,18 @@ module VSphereCloud
     end
 
     def get_vm_host_info(vm_ref)
-      vm = @client.get_properties(vm_ref, Vim::VirtualMachine, 'runtime')
+      vm = @cloud_searcher.get_properties(vm_ref, Vim::VirtualMachine, 'runtime')
       vm_runtime = vm['runtime']
 
-      properties = @client.get_properties(vm_runtime.host, Vim::HostSystem, ['datastore', 'parent'], ensure_all: true)
+      properties = @cloud_searcher.get_properties(vm_runtime.host, Vim::HostSystem, ['datastore', 'parent'], ensure_all: true)
 
       # Get the cluster that the vm's host belongs to.
-      cluster = @client.get_properties(properties['parent'], Vim::ClusterComputeResource, 'name')
+      cluster = @cloud_searcher.get_properties(properties['parent'], Vim::ClusterComputeResource, 'name')
 
       # Get the datastores that are accessible to the vm's host.
       datastores_accessible = []
       properties['datastore'].each do |store|
-        ds = @client.get_properties(store, Vim::Datastore, 'info', ensure_all: true)
+        ds = @cloud_searcher.get_properties(store, Vim::Datastore, 'info', ensure_all: true)
         datastores_accessible << ds['info'].name
       end
 
@@ -421,7 +436,7 @@ module VSphereCloud
         datacenter = client.find_parent(vm, Vim::Datacenter)
         datacenter_name = config.datacenter_name
 
-        vm_properties = client.get_properties(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
+        vm_properties = @cloud_searcher.get_properties(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
         host_info = get_vm_host_info(vm)
 
         create_disk = false
@@ -523,7 +538,7 @@ module VSphereCloud
           @agent_env.set_env(vm, location, env)
         end
 
-        devices = client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
+        devices = @cloud_searcher.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
         vmdk_path = "#{disk.path}.vmdk"
         virtual_disk =
           devices.find do |device|
@@ -543,7 +558,7 @@ module VSphereCloud
         # that the change has been applied. This is a known issue for vsphere 4.
         # Fixed in vsphere 5.
         5.times do
-          devices = client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
+          devices = @cloud_searcher.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
           virtual_disk =
             devices.find do |device|
               device.kind_of?(Vim::Vm::Device::VirtualDisk) &&
@@ -575,12 +590,17 @@ module VSphereCloud
         @logger.info("Deleting disk: #{disk_cid}")
         disk = Models::Disk.first(uuid: disk_cid)
         if disk
-          if disk.path
-            datacenter = client.find_by_inventory_path(disk.datacenter)
-            raise Bosh::Clouds::DiskNotFound.new(true), "disk #{disk_cid} not found" if datacenter.nil?
+          unless has_disk?(disk_cid)
+            raise Bosh::Clouds::DiskNotFound.new(true), "disk #{disk_cid} not found"
+          end
 
-            client.delete_disk(datacenter, disk.path)
+          datacenter = client.find_by_inventory_path(disk.datacenter)
+          if datacenter.nil?
+            raise Bosh::Clouds::DiskNotFound.new(true), "datacenter for disk #{disk_cid} not found"
           end
+
+          client.delete_disk(datacenter, disk.path) if disk.path
+
           disk.destroy
           @logger.info('Finished deleting disk')
         else
@@ -601,7 +621,7 @@ module VSphereCloud
       stemcell_vm = client.find_by_inventory_path([cluster.datacenter.name, 'vm',
                                                    cluster.datacenter.template_folder.name, stemcell])
       raise "Could not find stemcell: #{stemcell}" if stemcell_vm.nil?
-      stemcell_datastore = client.get_property(stemcell_vm, Vim::VirtualMachine, 'datastore', ensure_all: true)
+      stemcell_datastore = @cloud_searcher.get_property(stemcell_vm, Vim::VirtualMachine, 'datastore', ensure_all: true)
 
       if stemcell_datastore != datastore.mob
         @logger.info("Stemcell lives on a different datastore, looking for a local copy of: #{stemcell}.")
@@ -715,13 +735,13 @@ module VSphereCloud
 
       if vm_name.nil? || datastore_name.nil?
         vm_properties =
-          client.get_properties(vm, Vim::VirtualMachine, ['config.hardware.device', 'name'], ensure_all: true)
+          @cloud_searcher.get_properties(vm, Vim::VirtualMachine, ['config.hardware.device', 'name'], ensure_all: true)
         vm_name = vm_properties['name']
 
         unless datastore_name
           devices = vm_properties['config.hardware.device']
           datastore = get_primary_datastore(devices)
-          datastore_name = client.get_property(datastore, Vim::Datastore, 'name')
+          datastore_name = @cloud_searcher.get_property(datastore, Vim::Datastore, 'name')
         end
       end
 
@@ -794,13 +814,13 @@ module VSphereCloud
     def create_nic_config_spec(v_network_name, network, controller_key, dvs_index)
       raise "Can't find network: #{v_network_name}" if network.nil?
       if network.class == Vim::Dvs::DistributedVirtualPortgroup
-        portgroup_properties = client.get_properties(network,
+        portgroup_properties = @cloud_searcher.get_properties(network,
                                                      Vim::Dvs::DistributedVirtualPortgroup,
                                                      ['config.key', 'config.distributedVirtualSwitch'],
                                                      ensure_all: true)
 
         switch = portgroup_properties['config.distributedVirtualSwitch']
-        switch_uuid = client.get_property(switch, Vim::DistributedVirtualSwitch, 'uuid', ensure_all: true)
+        switch_uuid = @cloud_searcher.get_property(switch, Vim::DistributedVirtualSwitch, 'uuid', ensure_all: true)
 
         port = Vim::Dvs::PortConnection.new
         port.switch_uuid = switch_uuid
@@ -878,14 +898,14 @@ module VSphereCloud
 
     def wait_for_nfc_lease(lease)
       loop do
-        state = client.get_property(lease, Vim::HttpNfcLease, 'state')
+        state = @cloud_searcher.get_property(lease, Vim::HttpNfcLease, 'state')
         return state unless state == Vim::HttpNfcLease::State::INITIALIZING
         sleep(1.0)
       end
     end
 
     def upload_ovf(ovf, lease, file_items)
-      info = client.get_property(lease, Vim::HttpNfcLease, 'info', ensure_all: true)
+      info = @cloud_searcher.get_property(lease, Vim::HttpNfcLease, 'info', ensure_all: true)
       lease_updater = LeaseUpdater.new(client, lease)
 
       info.device_url.each do |device_url|
@@ -925,7 +945,7 @@ module VSphereCloud
     def wait_until_off(vm, timeout)
       started = Time.now
       loop do
-        power_state = client.get_property(vm, Vim::VirtualMachine, 'runtime.powerState')
+        power_state = @cloud_searcher.get_property(vm, Vim::VirtualMachine, 'runtime.powerState')
         break if power_state == Vim::VirtualMachine::PowerState::POWERED_OFF
         raise TimeoutException if Time.now - started > timeout
         sleep(1.0)
@@ -960,14 +980,21 @@ module VSphereCloud
     def choose_placer(cloud_properties)
       datacenter_spec = cloud_properties.fetch('datacenters', []).first
       cluster_spec = datacenter_spec.fetch('clusters', []).first if datacenter_spec
-      placer = FixedClusterPlacer.new(find_cluster(cluster_spec)) unless cluster_spec.nil?
+
+      unless cluster_spec.nil?
+        cluster_name = cluster_spec.keys.first
+        cluster = find_cluster(cluster_name)
+        cluster_config = cluster_spec.values.first
+        drs_rules = cluster_config.fetch('drs_rules', [])
+        placer = FixedClusterPlacer.new(cluster, drs_rules)
+      end
 
       placer.nil? ? @resources : placer
     end
 
-    def find_cluster(cluster_spec)
+    def find_cluster(cluster_name)
       datacenter = Resources::Datacenter.new(config)
-      datacenter.clusters[cluster_spec.keys.first]
+      datacenter.clusters[cluster_name]
     end
 
     attr_reader :config