bosh_vsphere_cpi 1.2717.0 → 1.2719.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1bfc1c8c4a6da66256c94d4e39c05e90fb6cf92
-  data.tar.gz: fa159df824553753dab38654cee27f8b615be3f4
+  metadata.gz: 78dc8a7eb2e667d88b7d2615dc9b05c473e4e199
+  data.tar.gz: ad1e065f7327fe484b02162fa90e2aebfc24e95e
 SHA512:
-  metadata.gz: 9e4ea12ba7da3585ae58f9db596a2085be43214143124fb3ad4653439752dbcc1beaf947be87fc93796e6a2ed43ed538d7de682ba966ba5c92f28ab6b5efccb9
-  data.tar.gz: e4f811edccf0391d439b27cddb9154ee30d75c9d3f854ff41083e379ed18c8e520f1fe61e9a2814bf8832e7633a444d01510d420216172e855a70a1bf52d53d6
+  metadata.gz: fc7191329c78d6aa802f938eea9d7c47c2b9f8113af75b7144485943b18b836049a80b06bcb66132d5bcc09b48c5913d22d74ff46980982b14c6b18a66ac4758
+  data.tar.gz: 8f07bbfa49a2e9a6e9f9bfee73128e1530c156673151b6a6337e8bffbcbacf5375e3b0185f7cbc2c0566c6187be912bd527b6e3913c56d6919b8b5efe4a09bff

data/lib/cloud/vsphere/cloud.rb

@@ -9,7 +9,6 @@ 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'
@@ -265,12 +264,6 @@ module VSphereCloud
             end
           end
         end
-
-        DrsRuleCleaner.new(
-          @cloud_searcher,
-          @client.service_content.custom_fields_manager,
-          @logger
-        ).clean
       end
     end
 
@@ -353,7 +346,7 @@ module VSphereCloud
         vm = get_vm_by_cid(vm_cid)
         devices = @cloud_searcher.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
         datacenter = client.find_parent(vm, Vim::Datacenter)
-        datacenter_name = @cloud_searcher.get_property(datacenter, Vim::Datacenter, 'name')
+        datacenter_name = config.datacenter_name
         pci_controller = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualPCIController) }
 
         config = Vim::Vm::ConfigSpec.new

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2717.0'
+      VERSION = '1.2719.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2717.0
+  version: 1.2719.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2717.0
+        version: 1.2719.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2717.0
+        version: 1.2719.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2717.0
+        version: 1.2719.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2717.0
+        version: 1.2719.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ dependencies:
         version: 0.7.1
 description: |-
   BOSH VSphere CPI
-  8c135f
+  024418
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi
@@ -173,7 +173,6 @@ files:
 - lib/cloud/vsphere/config.rb
 - lib/cloud/vsphere/drs_rules/drs_lock.rb
 - lib/cloud/vsphere/drs_rules/drs_rule.rb
-- lib/cloud/vsphere/drs_rules/drs_rule_cleaner.rb
 - lib/cloud/vsphere/drs_rules/vm_attribute_manager.rb
 - lib/cloud/vsphere/file_provider.rb
 - lib/cloud/vsphere/fixed_cluster_placer.rb

data/lib/cloud/vsphere/drs_rules/drs_rule_cleaner.rb

@@ -1,40 +0,0 @@
-require 'cloud/vsphere/drs_rules/vm_attribute_manager'
-require 'cloud/vsphere/drs_rules/drs_lock'
-
-module VSphereCloud
-  class DrsRuleCleaner
-    CUSTOM_ATTRIBUTE_NAME = 'drs_rule'
-
-    def initialize(cloud_searcher, custom_fields_manager, logger)
-      @cloud_searcher = cloud_searcher
-      @custom_fields_manager = custom_fields_manager
-      @logger = logger
-
-      @vm_attribute_manager = VMAttributeManager.new(
-        @custom_fields_manager,
-        @logger
-      )
-    end
-
-    def clean
-      DrsLock.new(@vm_attribute_manager, @logger).with_drs_lock do
-        unless has_tagged_vms?
-          @logger.info('Cleaning drs rule attribute')
-          @vm_attribute_manager.delete(CUSTOM_ATTRIBUTE_NAME)
-        end
-      end
-    end
-
-    private
-
-    def has_tagged_vms?
-      custom_attribute = @vm_attribute_manager.find_by_name(CUSTOM_ATTRIBUTE_NAME)
-      return [] unless custom_attribute
-
-      @cloud_searcher.has_managed_object_with_attribute?(
-        VimSdk::Vim::VirtualMachine,
-        custom_attribute.key
-      )
-    end
-  end
-end