bosh_vsphere_cpi 1.2479.0 → 1.2513.0

data/lib/cloud/vsphere/agent_env.rb

@@ -0,0 +1,88 @@
+module VSphereCloud
+  class AgentEnv
+    include VimSdk
+    include RetryBlock
+
+    def initialize(client, file_provider)
+      @client = client
+      @file_provider = file_provider
+    end
+
+    def get_current_env(location)
+      contents = @file_provider.fetch_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.json")
+      contents ? JSON.load(contents) : nil
+    end
+
+    def set_env(vm, location, env)
+      env_json = JSON.dump(env)
+
+      connect_cdrom(vm, false)
+      @file_provider.upload_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.json", env_json)
+      @file_provider.upload_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.iso", generate_env_iso(env_json))
+      connect_cdrom(vm, true)
+    end
+
+    def configure_env_cdrom(datastore, devices, file_name)
+      backing_info = Vim::Vm::Device::VirtualCdrom::IsoBackingInfo.new
+      backing_info.datastore = datastore
+      backing_info.file_name = file_name
+
+      connect_info = Vim::Vm::Device::VirtualDevice::ConnectInfo.new
+      connect_info.allow_guest_control = false
+      connect_info.start_connected = true
+      connect_info.connected = true
+
+      cdrom = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
+      cdrom.connectable = connect_info
+      cdrom.backing = backing_info
+
+      create_edit_device_spec(cdrom)
+    end
+
+    private
+
+    def connect_cdrom(vm, connected = true)
+      devices = @client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
+      cdrom = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
+
+      if cdrom.connectable.connected != connected
+        cdrom.connectable.connected = connected
+        config = Vim::Vm::ConfigSpec.new
+        config.device_change = [create_edit_device_spec(cdrom)]
+        @client.reconfig_vm(vm, config)
+      end
+    end
+
+    def generate_env_iso(env)
+      Dir.mktmpdir do |path|
+        env_path = File.join(path, 'env')
+        iso_path = File.join(path, 'env.iso')
+        File.open(env_path, 'w') { |f| f.write(env) }
+        output = `#{genisoimage} -o #{iso_path} #{env_path} 2>&1`
+        raise "#{$?.exitstatus} -#{output}" if $?.exitstatus != 0
+        File.open(iso_path, 'r') { |f| f.read }
+      end
+    end
+
+    def which(programs)
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        programs.each do |bin|
+          exe = File.join(path, bin)
+          return exe if File.exists?(exe)
+        end
+      end
+      programs.first
+    end
+
+    def genisoimage
+      @genisoimage ||= which(%w{genisoimage mkisofs})
+    end
+
+    def create_edit_device_spec(device)
+      device_config_spec = Vim::Vm::Device::VirtualDeviceSpec.new
+      device_config_spec.device = device
+      device_config_spec.operation = Vim::Vm::Device::VirtualDeviceSpec::Operation::EDIT
+      device_config_spec
+    end
+  end
+end

data/lib/cloud/vsphere/client.rb

@@ -204,6 +204,25 @@ module VSphereCloud
       tasks.each { |task| wait_for_task(task) }
     end
 
+    def create_folder(name)
+      @service_content.root_folder.create_folder(name)
+    end
+
+    def move_into_folder(folder, objects)
+      task = folder.move_into(objects)
+      wait_for_task(task)
+    end
+
+    def move_into_root_folder(objects)
+      task = @service_content.root_folder.move_into(objects)
+      wait_for_task(task)
+    end
+
+    def delete_folder(folder)
+      task = folder.destroy
+      wait_for_task(task)
+    end
+
     def find_by_inventory_path(path)
       full_path = Array(path).join("/")
       @service_content.search_index.find_by_inventory_path(full_path)

data/lib/cloud/vsphere/cloud.rb

@@ -2,8 +2,11 @@ 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'
@@ -23,6 +26,7 @@ module VSphereCloud
 
   class Cloud < Bosh::Cloud
     include VimSdk
+    include RetryBlock
 
     class TimeoutException < StandardError;
     end
@@ -34,8 +38,9 @@ module VSphereCloud
 
       @logger = config.logger
       @client = config.client
-      @rest_client = config.rest_client
       @resources = Resources.new(config)
+      @file_provider = FileProvider.new(config.rest_client, config.vcenter_host)
+      @agent_env = AgentEnv.new(client, @file_provider)
 
       # Global lock
       @lock = Mutex.new
@@ -167,24 +172,18 @@ module VSphereCloud
 
     def create_vm(agent_id, stemcell, cloud_properties, networks, disk_locality = nil, environment = nil)
       with_thread_name("create_vm(#{agent_id}, ...)") do
-        VmCreatorBuilder.new.build(choose_placer(cloud_properties), cloud_properties, @client, @logger, self).
-          create(agent_id, stemcell, networks, disk_locality, environment)
+        VmCreatorBuilder.new.build(
+          choose_placer(cloud_properties),
+          cloud_properties,
+          @client,
+          @logger,
+          self,
+          @agent_env,
+          @file_provider
+        ).create(agent_id, stemcell, networks, disk_locality, environment)
       end
     end
 
-    def retry_block(num = 2)
-      result = nil
-      num.times do |i|
-        begin
-          result = yield
-          break
-        rescue RuntimeError
-          raise if i + 1 >= num
-        end
-      end
-      result
-    end
-
     def delete_vm(vm_cid)
       with_thread_name("delete_vm(#{vm_cid})") do
         @logger.info("Deleting vm: #{vm_cid}")
@@ -357,14 +356,14 @@ module VSphereCloud
         @client.reconfig_vm(vm, config)
 
         location = get_vm_location(vm, datacenter: datacenter_name)
-        env = get_current_agent_env(location)
+        env = @agent_env.get_current_env(location)
         @logger.debug("Reading current agent env: #{env.pretty_inspect}")
 
         devices = client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
         env['networks'] = generate_network_env(devices, networks, dvs_index)
 
         @logger.debug("Updating agent env to: #{env.pretty_inspect}")
-        set_agent_env(vm, location, env)
+        @agent_env.set_env(vm, location, env)
 
         @logger.debug('Powering the VM back on')
         client.power_on_vm(datacenter, vm)
@@ -414,7 +413,7 @@ module VSphereCloud
         vm = get_vm_by_cid(vm_cid)
 
         datacenter = client.find_parent(vm, Vim::Datacenter)
-        datacenter_name = client.get_property(datacenter, Vim::Datacenter, 'name')
+        datacenter_name = config.datacenter_name
 
         vm_properties = client.get_properties(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
         host_info = get_vm_host_info(vm)
@@ -488,11 +487,11 @@ module VSphereCloud
         fix_device_unit_numbers(devices, config.device_change)
 
         location = get_vm_location(vm, datacenter: datacenter_name)
-        env = get_current_agent_env(location)
+        env = @agent_env.get_current_env(location)
         @logger.info("Reading current agent env: #{env.pretty_inspect}")
         env['disks']['persistent'][disk.uuid] = attached_disk_config.device.unit_number.to_s
         @logger.info("Updating agent env to: #{env.pretty_inspect}")
-        set_agent_env(vm, location, env)
+        @agent_env.set_env(vm, location, env)
         @logger.info('Attaching disk')
         client.reconfig_vm(vm, config)
         @logger.info('Finished attaching disk')
@@ -521,11 +520,11 @@ module VSphereCloud
         config.device_change << create_delete_device_spec(virtual_disk)
 
         location = get_vm_location(vm)
-        env = get_current_agent_env(location)
+        env = @agent_env.get_current_env(location)
         @logger.info("Reading current agent env: #{env.pretty_inspect}")
         env['disks']['persistent'].delete(disk.uuid)
         @logger.info("Updating agent env to: #{env.pretty_inspect}")
-        set_agent_env(vm, location, env)
+        @agent_env.set_env(vm, location, env)
         @logger.info('Detaching disk')
         client.reconfig_vm(vm, config)
 
@@ -568,7 +567,7 @@ module VSphereCloud
         if disk
           if disk.path
             datacenter = client.find_by_inventory_path(disk.datacenter)
-            raise Bosh::Clouds::DiskNotFound.new(true), "disk #{disk_cid} not found" if datacenter.nil? || disk.path.nil?
+            raise Bosh::Clouds::DiskNotFound.new(true), "disk #{disk_cid} not found" if datacenter.nil?
 
             client.delete_disk(datacenter, disk.path)
           end
@@ -704,8 +703,7 @@ module VSphereCloud
       vm_name = options[:vm]
 
       unless datacenter_name
-        datacenter = client.find_parent(vm, Vim::Datacenter)
-        datacenter_name = client.get_property(datacenter, Vim::Datacenter, 'name')
+        datacenter_name = config.datacenter_name
       end
 
       if vm_name.nil? || datastore_name.nil?
@@ -739,103 +737,6 @@ module VSphereCloud
       datastore
     end
 
-    def get_current_agent_env(location)
-      contents = fetch_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.json")
-      contents ? JSON.load(contents) : nil
-    end
-
-    def set_agent_env(vm, location, env)
-      env_json = JSON.dump(env)
-
-      connect_cdrom(vm, false)
-      upload_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.json", env_json)
-      upload_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.iso", generate_env_iso(env_json))
-      connect_cdrom(vm, true)
-    end
-
-    def connect_cdrom(vm, connected = true)
-      devices = client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
-      cdrom = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
-
-      if cdrom.connectable.connected != connected
-        cdrom.connectable.connected = connected
-        config = Vim::Vm::ConfigSpec.new
-        config.device_change = [create_edit_device_spec(cdrom)]
-        client.reconfig_vm(vm, config)
-      end
-    end
-
-    def configure_env_cdrom(datastore, devices, file_name)
-      backing_info = Vim::Vm::Device::VirtualCdrom::IsoBackingInfo.new
-      backing_info.datastore = datastore
-      backing_info.file_name = file_name
-
-      connect_info = Vim::Vm::Device::VirtualDevice::ConnectInfo.new
-      connect_info.allow_guest_control = false
-      connect_info.start_connected = true
-      connect_info.connected = true
-
-      cdrom = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
-      cdrom.connectable = connect_info
-      cdrom.backing = backing_info
-
-      create_edit_device_spec(cdrom)
-    end
-
-    def which(programs)
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        programs.each do |bin|
-          exe = File.join(path, bin)
-          return exe if File.exists?(exe)
-        end
-      end
-      programs.first
-    end
-
-    def genisoimage
-      @genisoimage ||= which(%w{genisoimage mkisofs})
-    end
-
-    def generate_env_iso(env)
-      Dir.mktmpdir do |path|
-        env_path = File.join(path, 'env')
-        iso_path = File.join(path, 'env.iso')
-        File.open(env_path, 'w') { |f| f.write(env) }
-        output = `#{genisoimage} -o #{iso_path} #{env_path} 2>&1`
-        raise "#{$?.exitstatus} -#{output}" if $?.exitstatus != 0
-        File.open(iso_path, 'r') { |f| f.read }
-      end
-    end
-
-    def fetch_file(datacenter_name, datastore_name, path)
-      retry_block do
-        url =
-          "https://#{config.vcenter_host}/folder/#{path}?dcPath=#{URI.escape(datacenter_name)}&dsName=#{URI.escape(datastore_name)}"
-
-        response = @rest_client.get(url)
-
-        if response.code < 400
-          response.body
-        elsif response.code == 404
-          nil
-        else
-          raise "Could not fetch file: #{url}, status code: #{response.code}"
-        end
-      end
-    end
-
-    def upload_file(datacenter_name, datastore_name, path, contents)
-      retry_block do
-        url =
-          "https://#{config.vcenter_host}/folder/#{path}?dcPath=#{URI.escape(datacenter_name)}&dsName=#{URI.escape(datastore_name)}"
-        response = @rest_client.put(url,
-                                    contents,
-                                    { 'Content-Type' => 'application/octet-stream', 'Content-Length' => contents.length })
-
-        raise "Could not upload file: #{url}, status code: #{response.code}" unless response.code < 400
-      end
-    end
-
     def clone_vm(vm, name, folder, resource_pool, options={})
       relocation_spec = Vim::Vm::RelocateSpec.new
       relocation_spec.datastore = options[:datastore] if options[:datastore]
@@ -929,13 +830,6 @@ module VSphereCloud
       device_config_spec
     end
 
-    def create_edit_device_spec(device)
-      device_config_spec = Vim::Vm::Device::VirtualDeviceSpec.new
-      device_config_spec.device = device
-      device_config_spec.operation = Vim::Vm::Device::VirtualDeviceSpec::Operation::EDIT
-      device_config_spec
-    end
-
     def fix_device_unit_numbers(devices, device_changes)
       controllers_available_unit_numbers = Hash.new { |h,k| h[k] = (0..15).to_a }
       devices.each do |device|

data/lib/cloud/vsphere/file_provider.rb

@@ -0,0 +1,43 @@
+module VSphereCloud
+  class FileProvider
+    include RetryBlock
+
+    def initialize(rest_client, vcenter_host)
+      @vcenter_host = vcenter_host
+      @rest_client = rest_client
+    end
+
+    def fetch_file(datacenter_name, datastore_name, path)
+      retry_block do
+        url ="https://#{@vcenter_host}/folder/#{path}?dcPath=#{URI.escape(datacenter_name)}" +
+          "&dsName=#{URI.escape(datastore_name)}"
+
+        response = @rest_client.get(url)
+
+        if response.code < 400
+          response.body
+        elsif response.code == 404
+          nil
+        else
+          raise "Could not fetch file: #{url}, status code: #{response.code}"
+        end
+      end
+    end
+
+    def upload_file(datacenter_name, datastore_name, path, contents)
+      retry_block do
+        url = "https://#{@vcenter_host}/folder/#{path}?dcPath=#{URI.escape(datacenter_name)}" +
+          "&dsName=#{URI.escape(datastore_name)}"
+
+        response = @rest_client.put(
+          url,
+          contents,
+          { 'Content-Type' => 'application/octet-stream', 'Content-Length' => contents.length })
+
+        unless response.code < 400
+          raise "Could not upload file: #{url}, status code: #{response.code}"
+        end
+      end
+    end
+  end
+end

data/lib/cloud/vsphere/retry_block.rb

@@ -0,0 +1,16 @@
+module VSphereCloud
+  module RetryBlock
+    def retry_block(num = 2)
+      result = nil
+      num.times do |i|
+        begin
+          result = yield
+          break
+        rescue RuntimeError
+          raise if i + 1 >= num
+        end
+      end
+      result
+    end
+  end
+end

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2479.0'
+      VERSION = '1.2513.0'
     end
   end
 end

data/lib/cloud/vsphere/vm_creator.rb

@@ -2,7 +2,7 @@ require 'ruby_vim_sdk'
 
 module VSphereCloud
   class VmCreator
-    def initialize(memory, disk, cpu, placer, client, logger, cpi)
+    def initialize(memory, disk, cpu, placer, client, logger, cpi, agent_env, file_provider)
       @placer = placer
       @client = client
       @logger = logger
@@ -10,6 +10,8 @@ module VSphereCloud
       @memory = memory
       @disk = disk
       @cpu = cpu
+      @agent_env = agent_env
+      @file_provider = file_provider
 
       @logger.debug("VM creator initialized with memory: #{@memory}, disk: #{@disk}, cpu: #{@cpu}, placer: #{@placer}")
     end
@@ -80,7 +82,7 @@ module VSphereCloud
       vm = @client.wait_for_task(task)
 
       begin
-        @cpi.upload_file(cluster.datacenter.name, datastore.name, "#{name}/env.iso", '')
+        @file_provider.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']
@@ -89,7 +91,7 @@ module VSphereCloud
         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)
+        cdrom_change = @agent_env.configure_env_cdrom(datastore.mob, devices, file_name)
         config.device_change << cdrom_change
         @client.reconfig_vm(vm, config)
 
@@ -101,7 +103,7 @@ module VSphereCloud
 
         location =
           @cpi.get_vm_location(vm, datacenter: cluster.datacenter.name, datastore: datastore.name, vm: name)
-        @cpi.set_agent_env(vm, location, env)
+        @agent_env.set_env(vm, location, env)
 
         @logger.info("Powering on VM: #{vm} (#{name})")
         @client.power_on_vm(cluster.datacenter.mob, vm)

data/lib/cloud/vsphere/vm_creator_builder.rb

@@ -2,7 +2,7 @@ require 'cloud/vsphere/vm_creator'
 
 module VSphereCloud
   class VmCreatorBuilder
-    def build(resources, cloud_properties, client, logger, cpi)
+    def build(resources, cloud_properties, client, logger, cpi, agent_env, file_provider)
       VmCreator.new(
         cloud_properties.fetch('ram'),
         cloud_properties.fetch('disk'),
@@ -11,6 +11,8 @@ module VSphereCloud
         client,
         logger,
         cpi,
+        agent_env,
+        file_provider,
       )
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2479.0
+  version: 1.2513.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-30 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.2479.0
+        version: 1.2513.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2479.0
+        version: 1.2513.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.2479.0
+        version: 1.2513.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2479.0
+        version: 1.2513.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH VSphere CPI
 
-  fc12be'
+  f90a96'
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi_console
@@ -103,10 +103,12 @@ files:
 - db/migrations/20120123235022_initial.rb
 - db/migrations/20121204174707_add_uuid_to_disks.rb
 - lib/cloud/vsphere.rb
+- lib/cloud/vsphere/agent_env.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/file_provider.rb
 - lib/cloud/vsphere/fixed_cluster_placer.rb
 - lib/cloud/vsphere/lease_obtainer.rb
 - lib/cloud/vsphere/lease_updater.rb
@@ -120,6 +122,7 @@ files:
 - lib/cloud/vsphere/resources/resource_pool.rb
 - lib/cloud/vsphere/resources/scorer.rb
 - lib/cloud/vsphere/resources/util.rb
+- lib/cloud/vsphere/retry_block.rb
 - lib/cloud/vsphere/version.rb
 - lib/cloud/vsphere/vm_creator.rb
 - lib/cloud/vsphere/vm_creator_builder.rb
@@ -172,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2428772607359741887
+      hash: 3707675564135352565
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23