bosh_vsphere_cpi 1.2881.0 → 1.2889.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 709f8ea4d8fdcbce3a60c83d718666dfcb5b0405
-  data.tar.gz: f2b312d3746cce0b6c08d7d9e973abc23553b653
+  metadata.gz: 2f732cb263b84c1859b030decb85a5137ae77c25
+  data.tar.gz: 4f218c7207396752c0bf42e8766f09ba9facfa15
 SHA512:
-  metadata.gz: 1fbc8f30dc769f5727ad279240b59aacd9ca3b2370ff0be575cfc2fe6edd34fb049e0909e18895486903c9ff9e2ee02273bf1582e38e133f3895deb1f00dc71f
-  data.tar.gz: f1fbc214c332fc82e17633becfd900aee187530667a87e6a1dae2886e6ecb6ee30738e798e2fdf294589db71752c01e6ee834aed96664296ccdd7896c6e4e3d1
+  metadata.gz: 2d594e71275ddfdc3c073ebb452a45cfd815e570460e06202eec291fd0075633672a7e36e9008f90cabd01ebcc56e2d0d97f10e226c0ecd98ae525846f32ca0e
+  data.tar.gz: 3670ab84febbdf7983edbc7995bbea1eefaf29ec4db04cf7c16627bb8edcad0848c9e2ed3bd396f5ee781ebadad52d4a14318416fe3a6d0c45db679b973853c4

data/lib/cloud/vsphere/client.rb

@@ -1,7 +1,3 @@
-require 'ruby_vim_sdk'
-require 'cloud/vsphere/cloud_searcher'
-require 'cloud/vsphere/soap_stub'
-
 module VSphereCloud
 
   class Client
@@ -19,7 +15,7 @@ module VSphereCloud
 
       @metrics_cache  = {}
       @lock = Mutex.new
-      @logger = Bosh::Clouds::Config.logger
+      @logger = options.fetch(:logger) { Bosh::Clouds::Config.logger }
 
       @cloud_searcher = CloudSearcher.new(service_content, @logger)
     end
@@ -99,6 +95,7 @@ module VSphereCloud
     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 = source_path.chomp(File.extname(dest_path))
@@ -218,8 +215,33 @@ module VSphereCloud
       disk_size_in_mb.nil? ? nil : Resources::Disk.new(disk_cid, disk_size_in_mb, datastore, disk_path)
     end
 
+    def create_disk(datacenter, datastore, disk_cid, disk_folder, disk_size_in_mb)
+      disk_path = "[#{datastore.name}] #{disk_folder}/#{disk_cid}.vmdk"
+
+      create_parent_folder(datacenter, disk_path)
+
+      disk_spec = VimSdk::Vim::VirtualDiskManager::FileBackedVirtualDiskSpec.new
+      disk_spec.disk_type = 'preallocated'
+      disk_spec.capacity_kb = disk_size_in_mb * 1024
+      disk_spec.adapter_type = 'lsiLogic'
+
+      task = service_content.virtual_disk_manager.create_virtual_disk(
+        disk_path,
+        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)
+    end
+
     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

data/lib/cloud/vsphere/cloud.rb

@@ -1,28 +1,6 @@
 require 'json'
 require 'membrane'
-require 'ruby_vim_sdk'
 require 'cloud'
-require 'cloud/vsphere/retry_block'
-require 'cloud/vsphere/client'
-require 'cloud/vsphere/config'
-require 'cloud/vsphere/file_provider'
-require 'cloud/vsphere/agent_env'
-require 'cloud/vsphere/lease_obtainer'
-require 'cloud/vsphere/lease_updater'
-require 'cloud/vsphere/resources'
-require 'cloud/vsphere/resources/cluster'
-require 'cloud/vsphere/resources/datacenter'
-require 'cloud/vsphere/resources/datastore'
-require 'cloud/vsphere/resources/folder'
-require 'cloud/vsphere/resources/vm'
-require 'cloud/vsphere/resources/resource_pool'
-require 'cloud/vsphere/resources/scorer'
-require 'cloud/vsphere/resources/util'
-require 'cloud/vsphere/path_finder'
-require 'cloud/vsphere/vm_creator_builder'
-require 'cloud/vsphere/disk_provider'
-require 'cloud/vsphere/vm_provider'
-require 'cloud/vsphere/fixed_cluster_placer'
 
 module VSphereCloud
   class Cloud < Bosh::Cloud
@@ -39,7 +17,19 @@ module VSphereCloud
       @logger = config.logger
       @client = config.client
       @cloud_searcher = CloudSearcher.new(@client.service_content, @logger)
-      @datacenter = Resources::Datacenter.new(config)
+      @datacenter = Resources::Datacenter.new({
+        client: @client,
+        use_sub_folder: @config.datacenter_use_sub_folder,
+        vm_folder: @config.datacenter_vm_folder,
+        template_folder: @config.datacenter_template_folder,
+        name: @config.datacenter_name,
+        disk_path: @config.datacenter_disk_path,
+        ephemeral_pattern: @config.datacenter_datastore_pattern,
+        persistent_pattern: @config.datacenter_persistent_datastore_pattern,
+        clusters: @config.datacenter_clusters,
+        logger: @config.logger,
+        mem_overcommit: @config.mem_overcommit
+      })
 
       @resources = Resources.new(@datacenter, config)
       @file_provider = FileProvider.new(config.rest_client, config.vcenter_host)

data/lib/cloud/vsphere/config.rb

@@ -1,6 +1,3 @@
-require 'ruby_vim_sdk'
-require 'cloud/vsphere/cluster_config'
-
 module VSphereCloud
   class Config
     def self.build(config_hash)

data/lib/cloud/vsphere/disk_provider.rb

@@ -17,22 +17,7 @@ module VSphereCloud
       disk_cid = "disk-#{SecureRandom.uuid}"
       @logger.debug("Creating disk '#{disk_cid}' in datastore '#{datastore.name}'")
 
-      disk_spec = VimSdk::Vim::VirtualDiskManager::FileBackedVirtualDiskSpec.new
-      disk_spec.disk_type = 'preallocated'
-      disk_spec.capacity_kb = disk_size_in_mb * 1024
-      disk_spec.adapter_type = 'lsiLogic'
-
-      disk_path = path(datastore, disk_cid)
-      create_parent_folder(disk_path)
-
-      task = @virtual_disk_manager.create_virtual_disk(
-        disk_path,
-        @datacenter.mob,
-        disk_spec
-      )
-      @client.wait_for_task(task)
-
-      Resources::Disk.new(disk_cid, disk_size_in_mb, datastore, disk_path)
+      @client.create_disk(@datacenter, datastore, disk_cid, @disk_path, disk_size_in_mb)
     end
 
     def find_and_move(disk_cid, cluster, datacenter_name, accessible_datastores)
@@ -51,7 +36,6 @@ module VSphereCloud
 
       destination_path = path(destination_datastore, disk_cid)
       @logger.info("Moving #{disk.path} to #{destination_path}")
-      create_parent_folder(destination_path)
       @client.move_disk(datacenter_name, disk.path, datacenter_name, destination_path) #TODO: return the new disk
       @logger.info('Moved disk successfully')
       Resources::Disk.new(disk_cid, disk.size_in_mb, destination_datastore, destination_path)
@@ -82,10 +66,5 @@ module VSphereCloud
 
       datastore
     end
-
-    def create_parent_folder(disk_path)
-      destination_folder = File.dirname(disk_path)
-      @client.create_datastore_folder(destination_folder, @datacenter.mob)
-    end
   end
 end

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

@@ -1,5 +1,3 @@
-require 'cloud/vsphere/retry_block'
-
 module VSphereCloud
   class DrsLock
     include RetryBlock

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

@@ -1,7 +1,3 @@
-require 'ruby_vim_sdk'
-require 'cloud/vsphere/drs_rules/drs_lock'
-require 'cloud/vsphere/drs_rules/vm_attribute_manager'
-
 module VSphereCloud
   class DrsRule
     CUSTOM_ATTRIBUTE_NAME = 'drs_rule'

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

@@ -1,5 +1,3 @@
-require 'ruby_vim_sdk'
-
 module VSphereCloud
   class VMAttributeManager
     def initialize(custom_fields_manager, logger)

data/lib/cloud/vsphere/file_provider.rb

@@ -1,5 +1,3 @@
-require 'cloud/vsphere/retry_block'
-
 module VSphereCloud
   class FileProvider
     include VSphereCloud::RetryBlock

data/lib/cloud/vsphere/lease_obtainer.rb

@@ -1,5 +1,3 @@
-require 'ruby_vim_sdk'
-
 module VSphereCloud
   class LeaseObtainer
     include VimSdk

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

@@ -1,3 +1,5 @@
+require 'cloud/vsphere/resources/resource_pool'
+
 module VSphereCloud
   class Resources
     class Cluster
@@ -30,17 +32,18 @@ module VSphereCloud
       # @param [ClusterConfig] config cluster configuration as specified by the
       #   operator.
       # @param [Hash] properties prefetched vSphere properties for the cluster.
-      def initialize(datacenter, cloud_config, cluster_config, properties)
+      def initialize(datacenter, datacenter_datastore_pattern, datacenter_persistent_datastore_pattern, mem_overcommit, cluster_config, properties, logger, client)
         @datacenter = datacenter
-        @logger = cloud_config.logger
-        @client = cloud_config.client
+        @logger = logger
+        @client = client
         @properties = properties
 
         @config = cluster_config
-        @cloud_config = cloud_config
         @mob = properties[:obj]
-        @resource_pool = ResourcePool.new(cloud_config, cluster_config, properties["resourcePool"])
-
+        @resource_pool = ResourcePool.new(@client, @logger, cluster_config, properties["resourcePool"])
+        @datacenter_datastore_pattern = datacenter_datastore_pattern
+        @datacenter_persistent_datastore_pattern = datacenter_persistent_datastore_pattern
+        @mem_overcommit = mem_overcommit
         @allocated_after_sync = 0
       end
 
@@ -56,7 +59,7 @@ module VSphereCloud
       # @return [Integer] amount of free memory in the cluster
       def free_memory
         synced_free_memory -
-          (@allocated_after_sync * cloud_config.mem_overcommit).to_i
+          (@allocated_after_sync * @mem_overcommit).to_i
       end
 
       def total_free_ephemeral_disk_in_mb
@@ -104,16 +107,16 @@ module VSphereCloud
       end
 
       def ephemeral_datastores
-        @ephemeral_datastores ||= select_datastores(cloud_config.datacenter_datastore_pattern)
+        @ephemeral_datastores ||= select_datastores(@datacenter_datastore_pattern)
       end
 
       def persistent_datastores
-        @persistent_datastores ||= select_datastores(cloud_config.datacenter_persistent_datastore_pattern)
+        @persistent_datastores ||= select_datastores(@datacenter_persistent_datastore_pattern)
       end
 
       private
 
-      attr_reader :cloud_config, :config, :client, :properties, :logger
+      attr_reader :config, :client, :properties, :logger
 
       def select_datastores(pattern)
         @datastores ||= Datastore.build_from_client(@client, properties['datastore'])

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

@@ -1,3 +1,5 @@
+require 'cloud/vsphere/resources/cluster'
+
 module VSphereCloud
   class Resources
     class Datacenter
@@ -5,21 +7,32 @@ module VSphereCloud
 
       attr_accessor :config
 
-      def initialize(config)
-        @config = config
-        @client = config.client
+      def initialize(attrs)
+        @client = attrs.fetch(:client)
+        @use_sub_folder = attrs.fetch(:use_sub_folder)
+        @vm_folder = attrs.fetch(:vm_folder)
+        @template_folder = attrs.fetch(:template_folder)
+        @name = attrs.fetch(:name)
+        @disk_path = attrs.fetch(:disk_path)
+        @ephemeral_pattern = attrs.fetch(:ephemeral_pattern)
+        @persistent_pattern = attrs.fetch(:persistent_pattern)
+        @clusters = attrs.fetch(:clusters)
+        @logger = attrs.fetch(:logger)
+        @mem_overcommit = attrs.fetch(:mem_overcommit)
       end
 
+      attr_reader :name, :disk_path, :ephemeral_pattern, :persistent_pattern
+
       def mob
-        mob = @config.client.find_by_inventory_path(name)
+        mob = @client.find_by_inventory_path(name)
         raise "Datacenter: #{name} not found" if mob.nil?
         mob
       end
 
       def vm_folder
-        if @config.datacenter_use_sub_folder
-          folder_path = [@config.datacenter_vm_folder, Bosh::Clouds::Config.uuid].join('/')
-          Folder.new(folder_path, @config)
+        if @use_sub_folder
+          folder_path = [@vm_folder, Bosh::Clouds::Config.uuid].join('/')
+          Folder.new(folder_path, @logger, @client, name)
         else
           master_vm_folder
         end
@@ -30,36 +43,20 @@ module VSphereCloud
       end
 
       def master_vm_folder
-        Folder.new(@config.datacenter_vm_folder, @config)
+        Folder.new(@vm_folder, @logger, @client, name)
       end
 
       def template_folder
-        if @config.datacenter_use_sub_folder
-          folder_path = [@config.datacenter_template_folder, Bosh::Clouds::Config.uuid].join('/')
-          Folder.new(folder_path, @config)
+        if @use_sub_folder
+          folder_path = [@template_folder, Bosh::Clouds::Config.uuid].join('/')
+          Folder.new(folder_path, @logger, @client, name)
         else
           master_template_folder
         end
       end
 
       def master_template_folder
-        Folder.new(@config.datacenter_template_folder, @config)
-      end
-
-      def name
-        @config.datacenter_name
-      end
-
-      def disk_path
-        @config.datacenter_disk_path
-      end
-
-      def ephemeral_pattern
-        @config.datacenter_datastore_pattern
-      end
-
-      def persistent_pattern
-        @config.datacenter_persistent_datastore_pattern
+        Folder.new(@template_folder, @logger, @client, name)
       end
 
       def inspect
@@ -74,14 +71,14 @@ module VSphereCloud
           Cluster::PROPERTIES, :ensure_all => true)
 
         clusters = {}
-        config.datacenter_clusters.each do |cluster_name, cluster_config|
+        @clusters.each do |cluster_name, cluster_config|
           cluster_mob = cluster_mobs[cluster_name]
           raise "Can't find cluster: #{cluster_name}" if cluster_mob.nil?
 
           cluster_properties = clusters_properties[cluster_mob]
           raise "Can't find properties for cluster: #{cluster_name}" if cluster_properties.nil?
 
-          cluster = Cluster.new(self, @config, cluster_config, cluster_properties)
+          cluster = Cluster.new(self, @ephemeral_pattern, @persistent_pattern, @mem_overcommit, cluster_config, cluster_properties, @logger, @client)
           clusters[cluster.name] = cluster
         end
         clusters
@@ -113,7 +110,7 @@ module VSphereCloud
       def cluster_tuples
         cluster_tuples = @client.cloud_searcher.get_managed_objects(
           Vim::ClusterComputeResource, root: mob, include_name: true)
-        cluster_tuples.delete_if { |name, _| !config.datacenter_clusters.has_key?(name) }
+        cluster_tuples.delete_if { |name, _| !@clusters.has_key?(name) }
         cluster_tuples
       end
     end

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

@@ -1,3 +1,5 @@
+require 'cloud/vsphere/resources'
+
 module VSphereCloud
   class Resources
     class Datastore

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

@@ -3,10 +3,11 @@ module VSphereCloud
     class Folder
       attr_reader :mob, :path, :path_components
 
-      def initialize(path, config)
+      def initialize(path, logger, client, datacenter_name)
         @path = path
-        @config = config
-
+        @logger = logger
+        @client = client
+        @datacenter_name = datacenter_name
         @path_components = path.split('/')
 
         @mob = find_or_create_folder(@path_components)
@@ -23,12 +24,12 @@ module VSphereCloud
           parent_folder = find_or_create_folder(path_components[0..-2])
 
           begin
-            @config.logger.debug("Creating folder #{last_component}")
+            @logger.debug("Creating folder #{last_component}")
             folder = parent_folder.create_folder(last_component)
           rescue VimSdk::SoapError => e
             raise e unless VimSdk::Vim::Fault::DuplicateName === e.fault
 
-            @config.logger.debug("Folder already exists #{last_component}")
+            @logger.debug("Folder already exists #{last_component}")
             folder = find_folder(path_components)
           end
         end
@@ -37,11 +38,11 @@ module VSphereCloud
       end
 
       def find_folder(path_components)
-        @config.client.find_by_inventory_path([@config.datacenter_name, 'vm', path_components].flatten)
+        @client.find_by_inventory_path([@datacenter_name, 'vm', path_components].flatten)
       end
 
       def root_vm_folder
-        @config.client.find_by_inventory_path([@config.datacenter_name, 'vm'])
+        @client.find_by_inventory_path([@datacenter_name, 'vm'])
       end
     end
   end

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

@@ -8,10 +8,11 @@ module VSphereCloud
       # @param [Cluster] cluster parent cluster.
       # @param [Vim::ResourcePool] root_resource_pool cluster's root resource
       #   pool.
-      def initialize(cloud_config, cluster_config, root_resource_pool)
-        @cloud_config = cloud_config
+      def initialize(client, logger, cluster_config, root_resource_pool)
         @cluster_config = cluster_config
         @root_resource_pool = root_resource_pool
+        @logger = logger
+        @client = client
       end
 
       def mob
@@ -20,8 +21,8 @@ module VSphereCloud
         if @cluster_config.resource_pool.nil?
           @mob = @root_resource_pool
         else
-          client = @cloud_config.client
-          logger = @cloud_config.logger
+          client = @client
+          logger = @logger
           @mob = client.cloud_searcher.get_managed_object(
             Vim::ResourcePool,
             :root => @root_resource_pool,

data/lib/cloud/vsphere/soap_stub.rb

@@ -1,5 +1,4 @@
 require 'httpclient'
-require 'ruby_vim_sdk'
 
 module VSphereCloud
   class SoapStub

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2881.0'
+      VERSION = '1.2889.0'
     end
   end
 end

data/lib/cloud/vsphere/vm_creator.rb

@@ -1,8 +1,3 @@
-require 'ruby_vim_sdk'
-require 'cloud/vsphere/drs_rules/drs_rule'
-require 'cloud/vsphere/resources/disk/ephemeral_disk'
-require 'cloud/vsphere/resources/vm'
-
 module VSphereCloud
   class VmCreator
     def initialize(memory, disk_size_in_mb, cpu, placer, client, cloud_searcher, logger, cpi, agent_env, file_provider, disk_provider)

data/lib/cloud/vsphere.rb

@@ -2,8 +2,33 @@ require 'forwardable'
 require 'securerandom'
 require 'common/thread_pool'
 require 'common/thread_formatter'
+require 'ruby_vim_sdk'
 
-autoload :VSphereCloud, 'cloud/vsphere/cloud'
+require 'cloud/vsphere/retry_block'
+require 'cloud/vsphere/agent_env'
+require 'cloud/vsphere/client'
+require 'cloud/vsphere/cloud'
+require 'cloud/vsphere/cloud_searcher'
+require 'cloud/vsphere/config'
+require 'cloud/vsphere/cluster_config'
+require 'cloud/vsphere/disk_provider'
+require 'cloud/vsphere/file_provider'
+require 'cloud/vsphere/fixed_cluster_placer'
+require 'cloud/vsphere/lease_obtainer'
+require 'cloud/vsphere/lease_updater'
+require 'cloud/vsphere/path_finder'
+require 'cloud/vsphere/resources/cluster'
+require 'cloud/vsphere/resources/datacenter'
+require 'cloud/vsphere/resources/datastore'
+require 'cloud/vsphere/resources/disk/ephemeral_disk'
+require 'cloud/vsphere/resources/folder'
+require 'cloud/vsphere/resources/vm'
+require 'cloud/vsphere/resources/resource_pool'
+require 'cloud/vsphere/resources/scorer'
+require 'cloud/vsphere/resources/util'
+require 'cloud/vsphere/soap_stub'
+require 'cloud/vsphere/vm_creator_builder'
+require 'cloud/vsphere/vm_provider'
 
 module Bosh
   module Clouds

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2881.0
+  version: 1.2889.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-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.2881.0
+        version: 1.2889.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2881.0
+        version: 1.2889.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2881.0
+        version: 1.2889.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2881.0
+        version: 1.2889.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH VSphere CPI
-  756fc2
+  4200d2
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi