clc-chef-metal-vsphere 0.3.38 → 0.3.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47586963a6feb866d9aa8d60c156c7064f0b9e1e
-  data.tar.gz: fbef1ff90a768e55d9f2fc5afd49951573fbe7d1
+  metadata.gz: ffeed2248d274feab53dbbf62adced7b1ecd6d05
+  data.tar.gz: 3e6b3f078c8f292fecae21681bd25d420ce62754
 SHA512:
-  metadata.gz: b93b258ab67cb89ce5be9954d9d35247cb98b4ff517112c846275bd4b5e16a8f0820033071709bc7912ea981e5de1770fd9ba5fc8dc63f3339baeffb42b01588
-  data.tar.gz: 595817d3b1199f6230629ce720701039d754e888bd1dbd1b4a70de0c79df9378ab04a0285a882aaaa5614683f20c3d8debe69da904716b6a63b1556dac946cf0
+  metadata.gz: 5aa22207d144995dd61205bfbd0e4fe121bc82671ef44643ccc48cf0623efae4feea1e02d478fe40bd0a58426813bfaf6577d34f58f510a6be6ab7e1fb00d745
+  data.tar.gz: f409f5497804cbe31725bb60dd3cc444c984867559d672e6e9e756edb828faaf3d21b939cb8908e977f10bba15049ee96e0d69a1fc49ace54c36739c8e57bc84

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.38'
+  VERSION = '0.3.39'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -212,6 +212,7 @@ module ChefMetalVsphere
 
         until (Time.now.utc - now) > machine_options[:ready_timeout] || (vm.guest.net.map { |net| net.ipAddress}.flatten).include?(vm_ip) do
           action_handler.report_progress "IP addresses on #{machine_spec.name} are #{vm.guest.net.map { |net| net.ipAddress}.flatten}"
+          vm_ip = ip_for(bootstrap_options, vm) if vm_ip.nil?
           sleep 5
         end
         if !(vm.guest.net.map { |net| net.ipAddress}.flatten).include?(vm_ip)

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -4,8 +4,12 @@ module ChefMetalVsphere
   module Helpers
 
     def vim(options = connect_options)
-      # reconnect on every call - connections may silently timeout during long operations (e.g. cloning)
-      RbVmomi::VIM.connect options
+      if @current_connection.nil? or @current_connection.serviceContent.sessionManager.currentSession.nil?
+        puts "establishing connection to #{options[:host]}"
+        @current_connection = RbVmomi::VIM.connect options
+      end
+
+      @current_connection
     end
 
     def find_vm(dc_name, vm_folder, vm_name)
@@ -426,5 +430,31 @@ module ChefMetalVsphere
       raise "Customization Spec not found [#{customization_spec}]" if spec.nil?
       spec
     end
+
+    def upload_file_to_vm(vm, username, password, local, remote)
+      auth = RbVmomi::VIM::NamePasswordAuthentication({:username => username, :password => password, :interactiveSession => false})
+      size = File.size(local)
+      endpoint = vim.serviceContent.guestOperationsManager.fileManager.InitiateFileTransferToGuest(
+        :vm => vm, 
+        :auth => auth, 
+        :guestFilePath => remote,
+        :overwrite => true,
+        :fileAttributes => RbVmomi::VIM::GuestWindowsFileAttributes.new,
+        :fileSize => size)
+
+        uri = URI.parse(endpoint)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        
+        req = Net::HTTP::Put.new("#{uri.path}?#{uri.query}")
+        req.body_stream = File.open(local)
+        req["Content-Type"] = "application/octet-stream"
+        req["Content-Length"] = size
+        res = http.request(req) 
+        unless res.kind_of?(Net::HTTPSuccess)
+          raise "Error: #{res.inspect} :: #{res.body} :: sending #{local} to #{remote} at #{vm.name} via #{endpoint} with a size of #{size}"
+        end
+    end
   end
 end

data/lib/kitchen/driver/vsphere_windows.rb

@@ -1,4 +1,5 @@
 require 'kitchen/driver/vsphere_common'
+require 'zip'
 
 module Kitchen
   module Driver
@@ -21,9 +22,108 @@ module Kitchen
             :win_time_zone => 4
           }
         }
+      
+      attr_reader :connect_options
 
       include Kitchen::Driver::VsphereCommon
+      include ChefMetalVsphere::Helpers
 
+      def initialize(config = {})
+        super
+
+        @connect_options = config[:driver_options]
+      end
+
+      # We are overriding the stock test-kitchen winrm implementation
+      # and leveraging vsphere's ability to upload files to the guest.
+      # We zip, then send through vsphere and unzip over winrm
+      def upload!(local, remote, winrm_connection)
+        debug("Upload: #{local} -> #{remote}")
+        if File.directory?(local)
+          upload_directory(local, remote, winrm_connection)
+        else
+          upload_file(local, File.join(remote, File.basename(local)), winrm_connection)
+        end
+      end
+
+      private
+
+      def sanitize_path(path, connection)
+        command = <<-EOH
+          $dest_file_path = [System.IO.Path]::GetFullPath('#{path}')
+
+          if (!(Test-Path $dest_file_path)) {
+            $dest_dir = ([System.IO.Path]::GetDirectoryName($dest_file_path))
+            New-Item -ItemType directory -Force -Path $dest_dir | Out-Null
+          }
+
+          $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath("#{path}")
+        EOH
+
+        send_winrm(connection, command)
+      end
+
+      def upload_file(local, remote, connection)
+        if connection.should_upload_file?(local, remote)
+          remote = sanitize_path(remote, connection).strip
+          vm = vim.searchIndex.FindByIp(:ip => connection.hostname, :vmSearch => true)
+          upload_file_to_vm(vm,connection.username, connection.options[:password], local, remote)
+        end
+      end
+
+      def upload_directory(local, remote, connection)
+        zipped = zip_path(local)
+        return if !File.exist?(zipped)
+        remote_zip = File.join(remote, File.basename(zipped))
+        debug "uploading #{zipped} to #{remote_zip}"
+        upload_file(zipped, remote_zip, connection)
+        extract_zip(remote_zip, connection)
+      end
+
+      def extract_zip(remote_zip, connection)
+        debug "extracting #{remote_zip} to #{remote_zip.gsub('/','\\').gsub('.zip','')}"
+        command = <<-EOH
+          $shellApplication = new-object -com shell.application 
+          $zip_path = "$($env:systemDrive)#{remote_zip.gsub('/','\\')}"
+          $zipPackage = $shellApplication.NameSpace($zip_path) 
+          $dest_path = "$($env:systemDrive)#{remote_zip.gsub('/','\\').gsub('.zip','')}"
+          mkdir $dest_path -ErrorAction SilentlyContinue
+          $destinationFolder = $shellApplication.NameSpace($dest_path) 
+          $destinationFolder.CopyHere($zipPackage.Items(),0x10)
+          Remove-Item $zip_path
+        EOH
+
+        send_winrm(connection, command)
+      end
+
+      def zip_path(path)
+        path.sub!(%r[/$],'')
+        archive = File.join(path,File.basename(path))+'.zip'
+        FileUtils.rm archive, :force=>true
+
+        Zip::File.open(archive, 'w') do |zipfile|
+          Dir["#{path}/**/**"].reject{|f|f==archive}.each do |file|
+            zipfile.add(file.sub(path+'/',''),file)
+          end
+        end
+
+        archive
+      end
+
+      def send_winrm(connection, command)
+        cmd = connection.powershell("$ProgressPreference='SilentlyContinue';" + command)
+        stdout = (cmd[:data].map {|out| out[:stdout]}).join
+        stderr = (cmd[:data].map {|out| out[:stderr]}).join
+
+        if cmd[:exitcode] != 0 || ! stderr.empty?
+          raise WinRMFailed,
+            "WinRM exited (#{cmd[:exitcode]}) for
+              command: [#{command}]\nREMOTE ERROR:\n" +
+              stderr
+        end
+
+        stdout
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.38
+  version: 0.3.39
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement