bosh_vsphere_cpi 1.1868.0 → 1.1975.0

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

@@ -1,85 +1,75 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module VSphereCloud
   class Resources
-
-    # Datacenter resource.
     class Datacenter
       include VimSdk
 
-      # @!attribute mob
-      #   @return [Vim::Datacenter] datacenter vSphere MOB.
-      attr_accessor :mob
-
-      # @!attribute clusters
-      #   @return [Hash<String, Cluster>] hash of cluster names to clusters.
-      attr_accessor :clusters
-
-      # @!attribute vm_folder
-      #   @return [Folder] inventory folder for VMs.
-      attr_accessor :vm_folder
-
-      # @!attribute template_folder
-      #   @return [Folder] inventory folder for stemcells/templates.
-      attr_accessor :template_folder
-
-      # @!attribute config
-      #   @return [DatacenterConfig] datacenter config.
       attr_accessor :config
 
-      # Creates a new Datacenter resource from the operator provided datacenter
-      # configuration.
-      #
-      # This traverses the provided datacenter/resource pools/datastores and
-      # builds the underlying resources and utilization.
-      #
-      # @param [DatacenterConfig] config datacenter configuration.
       def initialize(config)
-        client = Config.client
         @config = config
-        @mob = client.find_by_inventory_path(name)
-        raise "Datacenter: #{name} not found" if @mob.nil?
-
-        @vm_folder = Folder.new(self, config.folders.vm,
-                                config.folders.shared)
-        @template_folder = Folder.new(self, config.folders.template,
-                                      config.folders.shared)
+      end
 
-        cluster_mobs = client.get_managed_objects(
-            Vim::ClusterComputeResource, :root => @mob, :include_name => true)
-        cluster_mobs.delete_if { |name, _| !config.clusters.has_key?(name) }
-        cluster_mobs = Hash[*cluster_mobs.flatten]
+      def mob
+        mob = @config.client.find_by_inventory_path(name)
+        raise "Datacenter: #{name} not found" if mob.nil?
+        mob
+      end
 
-        clusters_properties = client.get_properties(
-            cluster_mobs.values, Vim::ClusterComputeResource,
-            Cluster::PROPERTIES, :ensure_all => true)
+      def vm_folder
+        Folder.new(@config.datacenter_vm_folder, @config)
+      end
 
-        @clusters = {}
-        config.clusters.each do |name, cluster_config|
-          cluster_mob = cluster_mobs[name]
-          raise "Can't find cluster: #{name}" if cluster_mob.nil?
-          cluster_properties = clusters_properties[cluster_mob]
-          if cluster_properties.nil?
-            raise "Can't find properties for cluster: #{name}"
-          end
-          cluster = Cluster.new(self, cluster_config, cluster_properties)
-          @clusters[cluster.name] = cluster
-        end
+      def template_folder
+        Folder.new(@config.datacenter_template_folder, @config)
       end
 
-      # @return [String] datacenter name.
       def name
-        @config.name
+        @config.datacenter_name
       end
 
-      # @return [String] vCenter path/namespace for VMDKs.
       def disk_path
-        @config.datastores.disk_path
+        @config.datacenter_disk_path
+      end
+
+      def ephemeral_pattern
+        @config.datacenter_datastore_pattern
+      end
+
+      def persistent_pattern
+        @config.datacenter_persistent_datastore_pattern
+      end
+
+      def allow_mixed
+        @config.datacenter_allow_mixed_datastores
       end
 
-      # @return [String] debug datacenter information.
       def inspect
-        "<Datacenter: #@mob / #{@config.name}>"
+        "<Datacenter: #{mob} / #{name}>"
+      end
+
+      def clusters
+        client = @config.client
+        cluster_mobs = client.get_managed_objects(
+          Vim::ClusterComputeResource, root: mob, include_name: true)
+        cluster_mobs.delete_if { |name, _| !config.datacenter_clusters.has_key?(name) }
+        cluster_mobs = Hash[*cluster_mobs.flatten]
+
+        clusters_properties = client.get_properties(
+          cluster_mobs.values, Vim::ClusterComputeResource,
+          Cluster::PROPERTIES, :ensure_all => true)
+
+        clusters = {}
+        config.datacenter_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)
+          clusters[cluster.name] = cluster
+        end
+        clusters
       end
     end
   end

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

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module VSphereCloud
   class Resources
 
@@ -58,4 +56,4 @@ module VSphereCloud
       end
     end
   end
-end
+end

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

@@ -1,54 +1,54 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module VSphereCloud
+
   class Resources
 
-    # Folder resource.
     class Folder
+      attr_reader :mob
+      attr_reader :name
 
-      # @!attribute mob
-      #   @return [Vim::Folder] folder vSphere MOB.
-      attr_accessor :mob
-
-      # @!attribute name
-      #   @return [String] folder name.
-      attr_accessor :name
-
-      # Creates a new Folder resource given the parent datacenter and folder
-      #   name.
-      #
-      # @param [Datacenter] datacenter parent datacenter.
-      # @param [String] name folder name.
-      # @param [true, false] shared flag signaling to use the director guid as
-      #   the namespace for multi tenancy.
-      def initialize(datacenter, name, shared)
-        client = Config.client
-        logger = Config.logger
-
-        folder = client.find_by_inventory_path([datacenter.name, "vm", name])
-        raise "Missing folder: #{name}" if folder.nil?
-
-        if shared
-          shared_folder = folder
-
-          uuid = Bosh::Clouds::Config.uuid
-          name = [name, uuid]
-
-          logger.debug("Search for folder #{name.join("/")}")
-          folder = client.find_by_inventory_path([datacenter.name, "vm", name])
-          if folder.nil?
-            logger.debug("Creating folder #{name.join("/")}")
-            folder = shared_folder.create_folder(uuid)
-          end
-          logger.debug("Found folder #{name.join("/")}: #{folder}")
+      def initialize(name, config)
+        @name = name
+        @config = config
 
-          @mob = folder
-          @name = name
+        find_or_create_folder
+      end
+
+      private
+
+      def find_or_create_folder
+        folder = find_folder
+
+        if @config.datacenter_use_sub_folder
+          @name, @mob = find_or_create_sub_folder(folder)
         else
           @mob = folder
-          @name = name
         end
       end
+
+      def find_folder
+        folder = @config.client.find_by_inventory_path([@config.datacenter_name, 'vm', @name])
+        raise "Missing folder: #{@name}" if folder.nil?
+        folder
+      end
+
+      def find_or_create_sub_folder(folder)
+        parent_folder = folder
+        uuid = Bosh::Clouds::Config.uuid
+
+        sub_folder_name = [@name, uuid]
+        name_join = sub_folder_name.join("/")
+
+        @config.logger.debug("Search for folder #{name_join}")
+        sub_folder = @config.client.find_by_inventory_path([@config.datacenter_name, 'vm', sub_folder_name])
+        if sub_folder.nil?
+          @config.logger.debug("Creating folder #{name_join}")
+          sub_folder = parent_folder.create_folder(uuid)
+        end
+        @config.logger.debug("Found folder #{name_join}: #{sub_folder}")
+
+        [sub_folder_name, sub_folder]
+      end
+
     end
   end
 end

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

@@ -12,16 +12,16 @@ module VSphereCloud
       # @param [Cluster] cluster parent cluster.
       # @param [Vim::ResourcePool] root_resource_pool cluster's root resource
       #   pool.
-      def initialize(cluster, root_resource_pool)
-        if cluster.config.resource_pool.nil?
+      def initialize(cloud_config, cluster_config, root_resource_pool)
+        if cluster_config.resource_pool.nil?
           @mob = root_resource_pool
         else
-          client = Config.client
-          logger = Config.logger
+          client = cloud_config.client
+          logger = cloud_config.logger
           @mob = client.get_managed_object(
               Vim::ResourcePool,
               :root => root_resource_pool,
-              :name => cluster.config.resource_pool)
+              :name => cluster_config.resource_pool)
           logger.debug("Found requested resource pool: #@mob")
         end
       end
@@ -32,4 +32,4 @@ module VSphereCloud
       end
     end
   end
-end
+end

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

@@ -13,8 +13,8 @@ module VSphereCloud
       # @param [Array<Integer>] ephemeral list of required ephemeral disk sizes.
       # @param [Array<Integer>] persistent list of required persistent disk
       #   sizes.
-      def initialize(cluster, memory, ephemeral, persistent)
-        @logger = Config.logger
+      def initialize(config, cluster, memory, ephemeral, persistent)
+        @logger = config.logger
         @cluster = cluster
         @memory = memory
         @ephemeral = ephemeral

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.1868.0'
+      VERSION = '1.1975.0'
     end
   end
 end

data/lib/cloud/vsphere/vm_creator.rb

@@ -0,0 +1,116 @@
+require 'ruby_vim_sdk'
+
+module VSphereCloud
+  class VmCreator
+    def initialize(memory, disk, cpu, placer, client, logger, cpi)
+      @placer = placer
+      @client = client
+      @logger = logger
+      @cpi = cpi
+      @memory = memory
+      @disk = disk
+      @cpu = cpu
+
+      @logger.debug("VM creator initialized with memory: #{@memory}, disk: #{@disk}, cpu: #{@cpu}, placer: #{@placer}")
+    end
+
+    def create(agent_id, stemcell_cid, networks, disk_cids, environment)
+      # Make sure number of cores is a power of 2. kb.vmware.com/kb/2003484
+      if @cpu & @cpu - 1 != 0
+        raise "Number of vCPUs: #{@cpu} is not a power of 2."
+      end
+
+      stemcell_vm = @cpi.stemcell_vm(stemcell_cid)
+      raise "Could not find stemcell: #{stemcell_cid}" if stemcell_vm.nil?
+
+      stemcell_size =
+        @client.get_property(stemcell_vm, VimSdk::Vim::VirtualMachine, 'summary.storage.committed', ensure_all: true)
+      stemcell_size /= 1024 * 1024
+
+      disks = @cpi.disk_spec(disk_cids)
+      # need to include swap and linked clone log
+      ephemeral = @disk + @memory + stemcell_size
+      cluster, datastore = @placer.place(@memory, ephemeral, disks)
+
+      name = "vm-#{@cpi.generate_unique_name}"
+      @logger.info("Creating vm: #{name} on #{cluster.mob} stored in #{datastore.mob}")
+
+      replicated_stemcell_vm = @cpi.replicate_stemcell(cluster, datastore, stemcell_cid)
+      replicated_stemcell_properties = @client.get_properties(replicated_stemcell_vm, VimSdk::Vim::VirtualMachine,
+                                                             ['config.hardware.device', 'snapshot'],
+                                                             ensure_all: true)
+
+      devices = replicated_stemcell_properties['config.hardware.device']
+      snapshot = replicated_stemcell_properties['snapshot']
+
+      config = VimSdk::Vim::Vm::ConfigSpec.new(memory_mb: @memory, num_cpus: @cpu)
+      config.device_change = []
+
+      system_disk = devices.find { |device| device.kind_of?(VimSdk::Vim::Vm::Device::VirtualDisk) }
+      pci_controller = devices.find { |device| device.kind_of?(VimSdk::Vim::Vm::Device::VirtualPCIController) }
+
+      file_name = "[#{datastore.name}] #{name}/ephemeral_disk.vmdk"
+      ephemeral_disk_config =
+        @cpi.create_disk_config_spec(datastore.mob, file_name, system_disk.controller_key, @disk, create: true)
+      config.device_change << ephemeral_disk_config
+
+      dvs_index = {}
+      networks.each_value do |network|
+        v_network_name = network['cloud_properties']['name']
+        network_mob = @client.find_by_inventory_path([cluster.datacenter.name, 'network', v_network_name])
+        nic_config = @cpi.create_nic_config_spec(v_network_name, network_mob, pci_controller.key, dvs_index)
+        config.device_change << nic_config
+      end
+
+      nics = devices.select { |device| device.kind_of?(VimSdk::Vim::Vm::Device::VirtualEthernetCard) }
+      nics.each do |nic|
+        nic_config = @cpi.create_delete_device_spec(nic)
+        config.device_change << nic_config
+      end
+
+      @cpi.fix_device_unit_numbers(devices, config.device_change)
+
+      @logger.info("Cloning vm: #{replicated_stemcell_vm} to #{name}")
+
+      task = @cpi.clone_vm(replicated_stemcell_vm,
+                      name,
+                      cluster.datacenter.vm_folder.mob,
+                      cluster.resource_pool.mob,
+                      datastore: datastore.mob, linked: true, snapshot: snapshot.current_snapshot, config: config)
+      vm = @client.wait_for_task(task)
+
+      begin
+        @cpi.upload_file(cluster.datacenter.name, datastore.name, "#{name}/env.iso", '')
+
+        vm_properties = @client.get_properties(vm, VimSdk::Vim::VirtualMachine, ['config.hardware.device'], ensure_all: true)
+        devices = vm_properties['config.hardware.device']
+
+        # Configure the ENV CDROM
+        config = VimSdk::Vim::Vm::ConfigSpec.new
+        config.device_change = []
+        file_name = "[#{datastore.name}] #{name}/env.iso"
+        cdrom_change = @cpi.configure_env_cdrom(datastore.mob, devices, file_name)
+        config.device_change << cdrom_change
+        @client.reconfig_vm(vm, config)
+
+        network_env = @cpi.generate_network_env(devices, networks, dvs_index)
+        disk_env = @cpi.generate_disk_env(system_disk, ephemeral_disk_config.device)
+        env = @cpi.generate_agent_env(name, vm, agent_id, network_env, disk_env)
+        env['env'] = environment
+        @logger.info("Setting VM env: #{env.pretty_inspect}")
+
+        location =
+          @cpi.get_vm_location(vm, datacenter: cluster.datacenter.name, datastore: datastore.name, vm: name)
+        @cpi.set_agent_env(vm, location, env)
+
+        @logger.info("Powering on VM: #{vm} (#{name})")
+        @client.power_on_vm(cluster.datacenter.mob, vm)
+      rescue => e
+        @logger.info("#{e} - #{e.backtrace.join("\n")}")
+        @cpi.delete_vm(name)
+        raise e
+      end
+      name
+    end
+  end
+end

data/lib/cloud/vsphere/vm_creator_builder.rb

@@ -0,0 +1,17 @@
+require 'cloud/vsphere/vm_creator'
+
+module VSphereCloud
+  class VmCreatorBuilder
+    def build(resources, cloud_properties, client, logger, cpi)
+      VmCreator.new(
+        cloud_properties.fetch('ram'),
+        cloud_properties.fetch('disk'),
+        cloud_properties.fetch('cpu'),
+        resources,
+        client,
+        logger,
+        cpi,
+      )
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.1868.0
+  version: 1.1975.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH VSphere CPI
 
-  f69423'
+  9c66c4'
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi_console
@@ -105,7 +105,9 @@ files:
 - lib/cloud/vsphere.rb
 - lib/cloud/vsphere/client.rb
 - lib/cloud/vsphere/cloud.rb
+- lib/cloud/vsphere/cluster_config.rb
 - lib/cloud/vsphere/config.rb
+- lib/cloud/vsphere/fixed_cluster_placer.rb
 - lib/cloud/vsphere/lease_obtainer.rb
 - lib/cloud/vsphere/lease_updater.rb
 - lib/cloud/vsphere/models/disk.rb
@@ -119,6 +121,8 @@ files:
 - lib/cloud/vsphere/resources/scorer.rb
 - lib/cloud/vsphere/resources/util.rb
 - lib/cloud/vsphere/version.rb
+- lib/cloud/vsphere/vm_creator.rb
+- lib/cloud/vsphere/vm_creator_builder.rb
 - lib/ruby_vim_sdk.rb
 - lib/ruby_vim_sdk/base_type.rb
 - lib/ruby_vim_sdk/const.rb
@@ -168,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 57486718049377902
+      hash: -1519667824114885807
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23