bosh_vsphere_cpi 1.2801.0 → 1.2807.0

data/lib/cloud/vsphere/client.rb

@@ -129,6 +129,10 @@ module VSphereCloud
       tasks.each { |task| wait_for_task(task) }
     end
 
+    def create_datastore_folder(folder_path, datacenter)
+      @service_content.file_manager.make_directory(folder_path, datacenter, true)
+    end
+
     def create_folder(name)
       @service_content.root_folder.create_folder(name)
     end

data/lib/cloud/vsphere/cloud.rb

@@ -14,6 +14,7 @@ require 'cloud/vsphere/resources/cluster'
 require 'cloud/vsphere/resources/datacenter'
 require 'cloud/vsphere/resources/datastore'
 require 'cloud/vsphere/resources/folder'
+require 'cloud/vsphere/resources/disk/persistent_disk'
 require 'cloud/vsphere/resources/resource_pool'
 require 'cloud/vsphere/resources/scorer'
 require 'cloud/vsphere/resources/util'
@@ -380,8 +381,8 @@ module VSphereCloud
     end
 
     def get_vm_host_info(vm_ref)
-      vm = @cloud_searcher.get_properties(vm_ref, Vim::VirtualMachine, 'runtime')
-      vm_runtime = vm['runtime']
+      vm_properties = @cloud_searcher.get_properties(vm_ref, Vim::VirtualMachine, 'runtime')
+      vm_runtime = vm_properties['runtime']
 
       properties = @cloud_searcher.get_properties(vm_runtime.host, Vim::HostSystem, ['datastore', 'parent'], ensure_all: true)
 
@@ -398,112 +399,37 @@ module VSphereCloud
       { 'cluster' => cluster['name'], 'datastores' => datastores_accessible }
     end
 
-    def find_persistent_datastore(datacenter_name, host_info, disk_size)
-      # Find datastore
-      datastore = @resources.place_persistent_datastore(datacenter_name, host_info['cluster'], disk_size)
-
-      if datastore.nil?
-        raise Bosh::Clouds::NoDiskSpace.new(true), "Not enough persistent space on cluster #{host_info['cluster']}, #{disk_size}"
-      end
-
-      # Sanity check, verify that the vm's host can access this datastore
-      unless host_info['datastores'].include?(datastore.name)
-        raise "Datastore not accessible to host, #{datastore.name}, #{host_info['datastores']}"
-      end
-      datastore
-    end
-
     def attach_disk(vm_cid, disk_cid)
       with_thread_name("attach_disk(#{vm_cid}, #{disk_cid})") do
         @logger.info("Attaching disk: #{disk_cid} on vm: #{vm_cid}")
-        disk = Models::Disk.first(uuid: disk_cid)
-        raise "Disk not found: #{disk_cid}" if disk.nil?
 
         vm = get_vm_by_cid(vm_cid)
 
-        datacenter = client.find_parent(vm, Vim::Datacenter)
         datacenter_name = config.datacenter_name
 
         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
-        if disk.path
-
-          disk_in_correct_datacenter =
-            (disk.datacenter == datacenter_name &&
-              @resources.validate_persistent_datastore(datacenter_name, disk.datastore) &&
-              host_info['datastores'].include?(disk.datastore))
-
-          if disk_in_correct_datacenter
-            @logger.info("Disk already in the right datastore #{datacenter_name} #{disk.datastore}")
-            persistent_datastore =
-              @resources.persistent_datastore(datacenter_name, host_info['cluster'], disk.datastore)
-            @logger.debug("Datastore: #{persistent_datastore}")
-          else
-            @logger.info("Disk needs to move from #{datacenter_name} #{disk.datastore}")
-            # Find the destination datastore
-            persistent_datastore = find_persistent_datastore(datacenter_name, host_info, disk.size)
-
-            # Need to move disk to right datastore
-            source_datacenter = client.find_by_inventory_path(disk.datacenter)
-            source_path = disk.path
-            datacenter_disk_path = @resources.datacenters[disk.datacenter].disk_path
-
-            destination_path = "[#{persistent_datastore.name}] #{datacenter_disk_path}/#{disk.uuid}"
-            @logger.info("Moving #{disk.datacenter}/#{source_path} to #{datacenter_name}/#{destination_path}")
-
-            if config.copy_disks
-              client.copy_disk(source_datacenter, source_path, datacenter, destination_path)
-              @logger.info('Copied disk successfully')
-            else
-              client.move_disk(source_datacenter, source_path, datacenter, destination_path)
-              @logger.info('Moved disk successfully')
-            end
-
-            disk.datacenter = datacenter_name
-            disk.datastore = persistent_datastore.name
-            disk.path = destination_path
-            disk.save
-          end
-        else
-          @logger.info('Need to create disk')
-
-          # Find the destination datastore
-          persistent_datastore = find_persistent_datastore(datacenter_name, host_info, disk.size)
-
-          # Need to create disk
-          disk.datacenter = datacenter_name
-          disk.datastore = persistent_datastore.name
-          datacenter_disk_path = @resources.datacenters[disk.datacenter].disk_path
-          disk.path = "[#{disk.datastore}] #{datacenter_disk_path}/#{disk.uuid}"
-          disk.save
-          create_disk = true
-        end
-
         devices = vm_properties['config.hardware.device']
         system_disk = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualDisk) }
 
-        vmdk_path = "#{disk.path}.vmdk"
-        attached_disk_config = create_disk_config_spec(persistent_datastore.mob,
-                                                       vmdk_path,
-                                                       system_disk.controller_key,
-                                                       disk.size.to_i,
-                                                       create: create_disk, independent: true)
-        config = Vim::Vm::ConfigSpec.new
-        config.device_change = []
-        config.device_change << attached_disk_config
-        fix_device_unit_numbers(devices, config.device_change)
+        disk = PersistentDisk.new(disk_cid, @cloud_searcher, @resources, @client, @logger)
+        disk_config_spec = disk.create_spec(datacenter_name, host_info, system_disk.controller_key, @config.copy_disks)
+
+        vm_config = Vim::Vm::ConfigSpec.new
+        vm_config.device_change = []
+        vm_config.device_change << disk_config_spec
+        fix_device_unit_numbers(devices, vm_config.device_change)
 
         env = @agent_env.get_current_env(vm, datacenter_name)
         @logger.info("Reading current agent env: #{env.pretty_inspect}")
-        env['disks']['persistent'][disk.uuid] = attached_disk_config.device.unit_number.to_s
+        env['disks']['persistent'][disk_cid] = disk_config_spec.device.unit_number.to_s
         @logger.info("Updating agent env to: #{env.pretty_inspect}")
 
         location = get_vm_location(vm, datacenter: datacenter_name)
         @agent_env.set_env(vm, location, env)
         @logger.info('Attaching disk')
-        client.reconfig_vm(vm, config)
+        client.reconfig_vm(vm, vm_config)
         @logger.info('Finished attaching disk')
       end
     end
@@ -774,28 +700,7 @@ module VSphereCloud
     end
 
     def create_disk_config_spec(datastore, file_name, controller_key, space, options = {})
-      backing_info = Vim::Vm::Device::VirtualDisk::FlatVer2BackingInfo.new
-      backing_info.datastore = datastore
-      if options[:independent]
-        backing_info.disk_mode = Vim::Vm::Device::VirtualDiskOption::DiskMode::INDEPENDENT_PERSISTENT
-      else
-        backing_info.disk_mode = Vim::Vm::Device::VirtualDiskOption::DiskMode::PERSISTENT
-      end
-      backing_info.file_name = file_name
 
-      virtual_disk = Vim::Vm::Device::VirtualDisk.new
-      virtual_disk.key = -1
-      virtual_disk.controller_key = controller_key
-      virtual_disk.backing = backing_info
-      virtual_disk.capacity_in_kb = space * 1024
-
-      device_config_spec = Vim::Vm::Device::VirtualDeviceSpec.new
-      device_config_spec.device = virtual_disk
-      device_config_spec.operation = Vim::Vm::Device::VirtualDeviceSpec::Operation::ADD
-      if options[:create]
-        device_config_spec.file_operation = Vim::Vm::Device::VirtualDeviceSpec::FileOperation::CREATE
-      end
-      device_config_spec
     end
 
     def create_nic_config_spec(v_network_name, network, controller_key, dvs_index)

data/lib/cloud/vsphere/resources/disk/disk_config.rb

@@ -0,0 +1,35 @@
+module VSphereCloud
+  class DiskConfig
+    def initialize(datastore, filename, controller_key, size)
+      @datastore = datastore
+      @filename = filename
+      @controller_key = controller_key
+      @size = size
+    end
+
+    def spec(options)
+      backing_info = VimSdk::Vim::Vm::Device::VirtualDisk::FlatVer2BackingInfo.new
+      backing_info.datastore = @datastore
+      if options[:independent]
+        backing_info.disk_mode = VimSdk::Vim::Vm::Device::VirtualDiskOption::DiskMode::INDEPENDENT_PERSISTENT
+      else
+        backing_info.disk_mode = VimSdk::Vim::Vm::Device::VirtualDiskOption::DiskMode::PERSISTENT
+      end
+      backing_info.file_name = @filename
+
+      virtual_disk = VimSdk::Vim::Vm::Device::VirtualDisk.new
+      virtual_disk.key = -1
+      virtual_disk.controller_key = @controller_key
+      virtual_disk.backing = backing_info
+      virtual_disk.capacity_in_kb = @size * 1024
+
+      device_config_spec = VimSdk::Vim::Vm::Device::VirtualDeviceSpec.new
+      device_config_spec.device = virtual_disk
+      device_config_spec.operation = VimSdk::Vim::Vm::Device::VirtualDeviceSpec::Operation::ADD
+      if options[:create]
+        device_config_spec.file_operation = VimSdk::Vim::Vm::Device::VirtualDeviceSpec::FileOperation::CREATE
+      end
+      device_config_spec
+    end
+  end
+end

data/lib/cloud/vsphere/resources/disk/ephemeral_disk.rb

@@ -0,0 +1,21 @@
+require 'cloud/vsphere/resources/disk/disk_config'
+
+module VSphereCloud
+  class EphemeralDisk
+    def initialize(size, folder_name, datastore)
+      @folder_name = folder_name
+      @datastore = datastore
+      @size = size
+    end
+
+    def create_spec(controller_key)
+      DiskConfig.new(@datastore.mob, filename, controller_key, @size).spec(create: true)
+    end
+
+    private
+
+    def filename
+      "[#{@datastore.name}] #{@folder_name}/ephemeral_disk.vmdk"
+    end
+  end
+end

data/lib/cloud/vsphere/resources/disk/persistent_disk.rb

@@ -0,0 +1,110 @@
+require 'cloud/vsphere/resources/disk/disk_config'
+
+module VSphereCloud
+  class PersistentDisk
+    def initialize(disk_cid, cloud_searcher, resources, client, logger)
+      @model = Models::Disk.first(uuid: disk_cid)
+      raise "Disk not found: #{disk_cid}" if @model.nil?
+
+      @disk_size = @model.size.to_i
+
+      @cloud_searcher = cloud_searcher
+      @resources = resources
+      @client = client
+      @logger = logger
+    end
+
+    def create_spec(datacenter_name, host_info, controller_key, copy_disks)
+      need_to_create_disk = !disk_exists?
+
+      destination_datacenter = @resources.datacenters[datacenter_name]
+
+      if disk_exists?
+        if disk_in_correct_datacenter?(destination_datacenter.name, host_info)
+          @logger.info("Disk already in the right datastore #{destination_datacenter.name} #{@model.datastore}")
+
+          persistent_datastore = @resources.persistent_datastore(@model.datacenter, host_info['cluster'], @model.datastore)
+        else
+          @logger.info("Disk needs to move from #{@model.datacenter} to #{destination_datacenter.name}")
+
+          persistent_datastore = find_datastore(destination_datacenter, host_info)
+          move_disk(persistent_datastore, destination_datacenter, copy_disks)
+          update(persistent_datastore, destination_datacenter)
+        end
+      else
+        @logger.info('Need to create disk')
+
+        persistent_datastore = find_datastore(destination_datacenter, host_info)
+        create_parent_folder(persistent_datastore.name, destination_datacenter)
+        update(persistent_datastore, destination_datacenter)
+      end
+
+      DiskConfig.new(persistent_datastore, filename, controller_key, @disk_size).
+        spec(independent: true, create: need_to_create_disk)
+    end
+
+    private
+
+    def filename
+      "#{@model.path}.vmdk"
+    end
+
+    def datastore_disk_path(datastore_name, datacenter)
+      "[#{datastore_name}] #{datacenter.disk_path}/#{@model.uuid}"
+    end
+
+    def disk_exists?
+      !!@model.path
+    end
+
+    def disk_in_correct_datacenter?(destination_datacenter_name, host_info)
+      (@model.datacenter == destination_datacenter_name &&
+        @resources.validate_persistent_datastore(destination_datacenter_name, @model.datastore) &&
+        host_info['datastores'].include?(@model.datastore))
+    end
+
+    def find_datastore(datacenter, host_info)
+      datastore = @resources.place_persistent_datastore(datacenter.name, host_info['cluster'], @disk_size)
+
+      if datastore.nil?
+        raise Bosh::Clouds::NoDiskSpace.new(true), "Not enough persistent space on cluster #{host_info['cluster']}, #{@disk_size}"
+      end
+
+      # Sanity check, verify that the vm's host can access this datastore
+      unless host_info['datastores'].include?(datastore.name)
+        raise "Datastore not accessible to host, #{datastore.name}, #{host_info['datastores']}"
+      end
+
+      datastore
+    end
+
+    def update(new_datastore, new_datacenter)
+      # Need to create disk
+      @model.datacenter = new_datacenter.name
+      @model.datastore = new_datastore.name
+      @model.path = datastore_disk_path(new_datastore.name, new_datacenter)
+      @model.save
+    end
+
+    def move_disk(destination_datastore, destination_datacenter, copy_disks)
+      source_datacenter = @client.find_by_inventory_path(@model.datacenter)
+      destination_path = datastore_disk_path(destination_datastore.name, destination_datacenter)
+      @logger.info("Moving #{@model.path} to #{destination_path}")
+
+      create_parent_folder(destination_datastore.name, destination_datacenter)
+
+      if copy_disks
+        @client.copy_disk(source_datacenter, @model.path, destination_datacenter, destination_path)
+        @logger.info('Copied disk successfully')
+      else
+        @client.move_disk(source_datacenter, @model.path, destination_datacenter, destination_path)
+        @logger.info('Moved disk successfully')
+      end
+    end
+
+    def create_parent_folder(datastore_name, datacenter)
+      destination_folder = File.dirname(datastore_disk_path(datastore_name, datacenter))
+      @client.create_datastore_folder(destination_folder, datacenter.mob)
+    end
+  end
+end

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2801.0'
+      VERSION = '1.2807.0'
     end
   end
 end

data/lib/cloud/vsphere/vm_creator.rb

@@ -1,16 +1,17 @@
 require 'ruby_vim_sdk'
 require 'cloud/vsphere/drs_rules/drs_rule'
+require 'cloud/vsphere/resources/disk/ephemeral_disk'
 
 module VSphereCloud
   class VmCreator
-    def initialize(memory, disk, cpu, placer, client, cloud_searcher, logger, cpi, agent_env, file_provider)
+    def initialize(memory, disk_size, cpu, placer, client, cloud_searcher, logger, cpi, agent_env, file_provider)
       @placer = placer
       @client = client
       @cloud_searcher = cloud_searcher
       @logger = logger
       @cpi = cpi
       @memory = memory
-      @disk = disk
+      @disk_size = disk_size
       @cpu = cpu
       @agent_env = agent_env
       @file_provider = file_provider
@@ -28,7 +29,7 @@ module VSphereCloud
 
       disks = @cpi.disk_spec(disk_cids)
       # need to include swap and linked clone log
-      ephemeral = @disk + @memory + stemcell_size
+      ephemeral = @disk_size + @memory + stemcell_size
       cluster, datastore = @placer.place(@memory, ephemeral, disks)
 
       name = "vm-#{@cpi.generate_unique_name}"
@@ -48,9 +49,8 @@ module VSphereCloud
       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)
+      ephemeral_disk = VSphereCloud::EphemeralDisk.new(@disk_size, name, datastore)
+      ephemeral_disk_config = ephemeral_disk.create_spec(system_disk.controller_key)
       config.device_change << ephemeral_disk_config
 
       dvs_index = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2801.0
+  version: 1.2807.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2014-12-25 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.2801.0
+        version: 1.2807.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2801.0
+        version: 1.2807.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.2801.0
+        version: 1.2807.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2801.0
+        version: 1.2807.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,7 @@ dependencies:
         version: 0.7.1
 description: ! 'BOSH VSphere CPI
 
-  7d6c56'
+  0b041c'
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi
@@ -203,6 +203,9 @@ files:
 - lib/cloud/vsphere/resources/cluster.rb
 - lib/cloud/vsphere/resources/datacenter.rb
 - lib/cloud/vsphere/resources/datastore.rb
+- lib/cloud/vsphere/resources/disk/disk_config.rb
+- lib/cloud/vsphere/resources/disk/ephemeral_disk.rb
+- lib/cloud/vsphere/resources/disk/persistent_disk.rb
 - lib/cloud/vsphere/resources/folder.rb
 - lib/cloud/vsphere/resources/resource_pool.rb
 - lib/cloud/vsphere/resources/scorer.rb
@@ -260,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4276721379970132912
+      hash: -1305819405151799674
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23