bosh_vsphere_cpi 1.2962.0 → 1.2968.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3ca370cda454ae8a8b61c5ea8ae2e39c22c6202
-  data.tar.gz: 3b5079885117a157273b91ac77d4ae222fc2ffd4
+  metadata.gz: b21d5e6a2fd3f2d76712418bcdf2bdd91e9374fc
+  data.tar.gz: ee8bf9eac292090e597a343409d75c8d1f51b382
 SHA512:
-  metadata.gz: b3f571670b4c301433dbe971c8d36a32d6a4a1c277ca0b94444a7ddecaec8b310bef3f942f1c27c822825946a13e0b9cf5e7447f5b6463d7d62bfb1b6bd46329
-  data.tar.gz: 3e1edffbab7088f30b85d72a9c8737d22238c373e41dfb245819fcde44ac1d1d29aa7048a1534c1b622a17220cc6e19c3cfac15330d4e7621051da81d2f010fa
+  metadata.gz: 2b9fe21f6393b697ca844c0a6f101ce7382f85de43bd449cdaba6d80e8df2fede323b04b1ec7600872fcc3c669848ef2d3c6b3d817d2dd6965f2a0729eb169f4
+  data.tar.gz: 08e59c03f9f3a7bbde3cd7c8b4a697da1fddb5e0fd9c6f7cde29e3ddefe10c468932ca7578903174dc2a1c3d23ff05f0f0d6600fe5ae2331b40853b137324bc0

data/lib/cloud/vsphere.rb

@@ -17,6 +17,7 @@ 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_provider'
 require 'cloud/vsphere/resources/cluster'
 require 'cloud/vsphere/resources/datacenter'
 require 'cloud/vsphere/resources/datastore'

data/lib/cloud/vsphere/client.rb

@@ -100,11 +100,11 @@ module VSphereCloud
       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))
+      base_dest_path = dest_path.chomp(File.extname(dest_path))
       [".vmdk", "-flat.vmdk"].each do |extension|
         tasks << @service_content.file_manager.move_file(
-          "#{base_source_path}#{extension}", source_datacenter,
-          "#{base_dest_path}#{extension}", dest_datacenter, false
+          "#{base_source_path}#{extension}", source_datacenter.mob,
+          "#{base_dest_path}#{extension}", dest_datacenter.mob, false
         )
       end
 

data/lib/cloud/vsphere/cloud.rb

@@ -299,9 +299,9 @@ module VSphereCloud
         @logger.info("Attaching disk: #{disk_cid} on vm: #{vm_cid}")
 
         vm = vm_provider.find(vm_cid)
-
         cluster = @datacenter.clusters[vm.cluster]
-        disk = disk_provider.find_and_move(disk_cid, cluster, @datacenter.name, vm.accessible_datastores)
+
+        disk = disk_provider.find_and_move(disk_cid, cluster, @datacenter, vm.accessible_datastores)
         disk_config_spec = disk.attach_spec(vm.system_disk.controller_key)
 
         vm_config = Vim::Vm::ConfigSpec.new
@@ -366,10 +366,17 @@ module VSphereCloud
       end
     end
 
-    def create_disk(size_in_mb, cloud_properties, _ = nil)
+    def create_disk(size_in_mb, cloud_properties, vm_cid = nil)
       with_thread_name("create_disk(#{size_in_mb}, _)") do
         @logger.info("Creating disk with size: #{size_in_mb}")
-        disk = disk_provider.create(size_in_mb)
+
+        cluster = nil
+        if vm_cid
+          vm = vm_provider.find(vm_cid)
+          cluster = @datacenter.clusters[vm.cluster]
+        end
+
+        disk = disk_provider.create(size_in_mb, cluster)
         @logger.info("Created disk: #{disk.inspect}")
         disk.cid
       end
@@ -708,19 +715,16 @@ module VSphereCloud
 
       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', [])
+        spec = cluster_spec.values.first
+        cluster_config = ClusterConfig.new(cluster_name, spec)
+        cluster = Resources::ClusterProvider.new(@datacenter, @client, @logger).find(cluster_name, cluster_config)
+        drs_rules = spec.fetch('drs_rules', [])
         placer = FixedClusterPlacer.new(cluster, drs_rules)
       end
 
       placer.nil? ? @resources : placer
     end
 
-    def find_cluster(cluster_name)
-      @datacenter.clusters[cluster_name]
-    end
-
     attr_reader :config
   end
 end

data/lib/cloud/vsphere/disk_provider.rb

@@ -12,19 +12,23 @@ module VSphereCloud
       @logger = logger
     end
 
-    def create(disk_size_in_mb)
-      datastore = @datacenter.pick_persistent_datastore(disk_size_in_mb)
+    def create(disk_size_in_mb, cluster)
+      if cluster
+        datastore = @resources.pick_persistent_datastore_in_cluster(cluster.name, disk_size_in_mb)
+      else
+        datastore = @datacenter.pick_persistent_datastore(disk_size_in_mb)
+      end
       disk_cid = "disk-#{SecureRandom.uuid}"
       @logger.debug("Creating disk '#{disk_cid}' in datastore '#{datastore.name}'")
 
       @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)
+    def find_and_move(disk_cid, cluster, datacenter, accessible_datastores)
       disk = find(disk_cid)
       return disk if accessible_datastores.include?(disk.datastore.name)
 
-      destination_datastore = @resources.pick_persistent_datastore_in_cluster(cluster, disk.size_in_mb)
+      destination_datastore = @resources.pick_persistent_datastore_in_cluster(cluster.name, disk.size_in_mb)
 
       unless accessible_datastores.include?(destination_datastore.name)
         raise "Datastore '#{destination_datastore.name}' is not accessible to cluster '#{cluster.name}'"
@@ -32,13 +36,15 @@ module VSphereCloud
 
       destination_path = path(destination_datastore, disk_cid)
       @logger.info("Moving #{disk.path} to #{destination_path}")
-      @client.move_disk(datacenter_name, disk.path, datacenter_name, destination_path) #TODO: return the new disk
+      @client.move_disk(datacenter, disk.path, datacenter, destination_path)
       @logger.info('Moved disk successfully')
       Resources::Disk.new(disk_cid, disk.size_in_mb, destination_datastore, destination_path)
     end
 
     def find(disk_cid)
-      @datacenter.persistent_datastores.each do |_, datastore|
+      persistent_datastores = @datacenter.persistent_datastores
+      @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)
         return disk unless disk.nil?
       end

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

@@ -0,0 +1,46 @@
+module VSphereCloud
+  class Resources
+    class ClusterProvider
+      def initialize(datacenter, client, logger)
+        @datacenter = datacenter
+        @client = client
+        @logger = logger
+      end
+
+      def find(name, config)
+        cluster_mob = cluster_mobs[name]
+        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?
+
+        Cluster.new(
+          @datacenter,
+          @datacenter.ephemeral_pattern,
+          @datacenter.persistent_pattern,
+          @datacenter.mem_overcommit,
+          config,
+          cluster_properties,
+          @logger,
+          @client
+        )
+      end
+
+      private
+
+      def cluster_mobs
+        @cluster_mobs ||= begin
+          cluster_tuples = @client.cloud_searcher.get_managed_objects(
+            VimSdk::Vim::ClusterComputeResource,
+            root: @datacenter.mob,
+            include_name: true
+          )
+          Hash[*(cluster_tuples.flatten)]
+        end
+      end
+    end
+  end
+end

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

@@ -19,9 +19,11 @@ module VSphereCloud
         @clusters = attrs.fetch(:clusters)
         @logger = attrs.fetch(:logger)
         @mem_overcommit = attrs.fetch(:mem_overcommit)
+
+        @cluster_provider = ClusterProvider.new(self, @client, @logger)
       end
 
-      attr_reader :name, :disk_path, :ephemeral_pattern, :persistent_pattern
+      attr_reader :name, :disk_path, :ephemeral_pattern, :persistent_pattern, :mem_overcommit
 
       def mob
         mob = @client.find_by_inventory_path(name)
@@ -64,23 +66,9 @@ module VSphereCloud
       end
 
       def clusters
-        cluster_mobs = get_cluster_mobs
-
-        clusters_properties = @client.cloud_searcher.get_properties(
-          cluster_mobs.values, Vim::ClusterComputeResource,
-          Cluster::PROPERTIES, :ensure_all => true
-        )
-
         clusters = {}
         @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, @ephemeral_pattern, @persistent_pattern, @mem_overcommit, cluster_config, cluster_properties, @logger, @client)
-          clusters[cluster.name] = cluster
+          clusters[cluster_name] = @cluster_provider.find(cluster_name, cluster_config)
         end
         clusters
       end
@@ -118,16 +106,6 @@ module VSphereCloud
         end
         selected_datastore
       end
-
-      private
-
-      def get_cluster_mobs
-        cluster_tuples = @client.cloud_searcher.get_managed_objects(
-          Vim::ClusterComputeResource, root: mob, include_name: true
-        )
-        non_clusters = cluster_tuples.reject { |name, _| !@clusters.has_key?(name) }
-        Hash[*(non_clusters.flatten)]
-      end
     end
   end
 end

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

@@ -22,6 +22,10 @@ module VSphereCloud
         cluster['name']
       end
 
+      def resource_pool
+        properties['resourcePool'].name
+      end
+
       def accessible_datastores
         host_properties['datastore'].map do |store|
           ds = cloud_searcher.get_properties(store, Vim::Datastore, 'info', ensure_all: true)
@@ -163,7 +167,7 @@ module VSphereCloud
         @properties ||= cloud_searcher.get_properties(
           @mob,
           Vim::VirtualMachine,
-          ['runtime.powerState', 'runtime.question', 'config.hardware.device', 'name', 'runtime'],
+          ['runtime.powerState', 'runtime.question', 'config.hardware.device', 'name', 'runtime', 'resourcePool'],
           ensure: ['config.hardware.device', 'runtime']
         )
       end

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2962.0'
+      VERSION = '1.2968.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2962.0
+  version: 1.2968.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-05-06 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.2962.0
+        version: 1.2968.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2962.0
+        version: 1.2968.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2962.0
+        version: 1.2968.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2962.0
+        version: 1.2968.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH VSphere CPI
-  74c57f
+  237575
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi
@@ -236,6 +236,7 @@ files:
 - lib/cloud/vsphere/path_finder.rb
 - lib/cloud/vsphere/resources.rb
 - lib/cloud/vsphere/resources/cluster.rb
+- lib/cloud/vsphere/resources/cluster_provider.rb
 - lib/cloud/vsphere/resources/datacenter.rb
 - lib/cloud/vsphere/resources/datastore.rb
 - lib/cloud/vsphere/resources/disk.rb