clc-chef-metal-vsphere 0.3.53 → 0.3.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1569eb531cf6e5e16b3ce7b0df3548fb4d62e61
-  data.tar.gz: 90f2adcfb6746f1608d85319fa39baec0bd5681f
+  metadata.gz: 1cdf54d237686265e3ff0e7b24bcc2c64d5f2577
+  data.tar.gz: a1aa849d6f42a5af24956b71a29dd315401c645b
 SHA512:
-  metadata.gz: ddb6857f682b6a2231bc447d51bfffb8b2f6d744dc23d2e2441fcc5862b8f757dc87b350ca08b05e899542021668184adb9008f6d69371fcba7260837c16b2eb
-  data.tar.gz: 8cc91c2cde4736008b1ccbdb03349d10170fec2cc38da9215214318128fc3c14bd3e17c62c5299d3ff8220c1bd774e636aee478707a9bb8fdd9849858bf2d433
+  metadata.gz: 359d208bb49fb37174e174fc042edaf4cc578120f5b9557536d4128c824dd0662ea163d39821864208d903b4a1f1aabc520f4538d9a531d98efba6325bdbc0a4
+  data.tar.gz: a0c97b7093f83345d737c45d18e7ee63b140f5ded43804b70e670ad6cac3ee315fb4f1f442e01517586f6eb3a2fe2762d5e13f295d52ebb60bf785497cc0d67d

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.53'
+  VERSION = '0.3.54'
 end

data/lib/kitchen/driver/vsphere.rb

@@ -1,8 +1,10 @@
-require 'kitchen/driver/vsphere_common'
+require 'kitchen'
+require 'chef_metal_vsphere/vsphere_driver'
+require 'chef_metal/chef_machine_spec'
 
 module Kitchen
   module Driver
-    class Vsphere < Kitchen::Driver::SSHBase
+    class Vsphere < Kitchen::Driver::Base
 
       default_config :machine_options,
         :start_timeout => 600,
@@ -21,7 +23,44 @@ module Kitchen
           }
         }
 
-      include Kitchen::Driver::VsphereCommon
+      def create(state)
+        config[:server_name] ||= "kitchen-#{SecureRandom.hex}-#{instance.name}"
+        state[:username] = config[:machine_options][:bootstrap_options][:ssh][:user]
+        state[:password] = config[:machine_options][:bootstrap_options][:ssh][:password]
+        
+        machine = with_metal_driver(config[:server_name]) do | action_handler, driver, machine_spec|
+          driver.allocate_machine(action_handler, machine_spec, config[:machine_options])
+          driver.ready_machine(action_handler, machine_spec, config[:machine_options])
+          state[:server_id] = machine_spec.location['server_id']
+          state[:hostname] = machine_spec.location['ipaddress']
+          state[:vsphere_name] = config[:server_name]
+        end
+      end
+
+      def destroy(state)
+        return if state[:server_id].nil?
+
+        with_metal_driver(state[:vsphere_name]) do | action_handler, driver, machine_spec|
+          machine_spec.location = { 'driver_url' => driver.driver_url,
+                        'server_id' => state[:server_id]}
+          driver.destroy_machine(action_handler, machine_spec, config[:machine_options])
+        end
+
+        state.delete(:server_id)
+        state.delete(:hostname)
+        state.delete(:vsphere_name)
+      end
+
+      def with_metal_driver(name, &block)
+        Cheffish.honor_local_mode do
+          chef_server = Cheffish.default_chef_server(Cheffish.profiled_config)
+          config[:machine_options][:convergence_options] = {:chef_server => chef_server}
+          machine_spec = ChefMetal::ChefMachineSpec.new({'name' => name}, chef_server)
+          driver = ChefMetal.driver_for_url("vsphere://#{config[:driver_options][:host]}", config)
+          action_handler = ChefMetal::ActionHandler.new
+          block.call(action_handler, driver, machine_spec)
+        end
+      end
 
     end
   end

data/spec/integration_tests/config.rb

@@ -12,8 +12,8 @@
         :bootstrap_options => {
         :use_linked_clone => true,
   		:datacenter => 'QA1',
-  		#:template_name => 'UBUNTU-12-64-TEMPLATE',
-  		:template_name => 'WINDEVOPS2012R2',
+  		:template_name => 'UBUNTU-12-64-TEMPLATE',
+  		#:template_name => 'WINDEVOPS2012R2',
   		:vm_folder => 'DLAB',
   		:datastore => 'QA1-2-SFIRE-01',
   		:num_cpus => 2,
@@ -24,8 +24,8 @@
   		:resource_pool => 'CLSTR02/DLAB',
   		:additional_disk_size_gb => 50,
 	  	:ssh => {
-	  		#:user => 'root',
-	  		:user => 'administrator',
+	  		:user => 'root',
+	  		#:user => 'administrator',
 	  		:password => 'Password123',
 	  		:paranoid => false,
 	  		:port => 22

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.53
+  version: 0.3.54
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -110,8 +110,6 @@ files:
 - lib/chef_metal_vsphere/vsphere_helpers.rb
 - lib/chef_metal_vsphere/vsphere_url.rb
 - lib/kitchen/driver/vsphere.rb
-- lib/kitchen/driver/vsphere_common.rb
-- lib/kitchen/driver/vsphere_windows.rb
 - spec/integration_tests/.gitignore
 - spec/integration_tests/config.rb
 - spec/integration_tests/vsphere_driver_spec.rb

data/lib/kitchen/driver/vsphere_common.rb

@@ -1,49 +0,0 @@
-require 'benchmark'
-require 'kitchen'
-require 'chef_metal_vsphere/vsphere_driver'
-require 'chef_metal/chef_machine_spec'
-
-module Kitchen
-  module Driver
-  	module VsphereCommon
-      def create(state)
-        config[:server_name] ||= "kitchen-#{SecureRandom.hex}-#{instance.name}"
-        state[:username] = config[:machine_options][:bootstrap_options][:ssh][:user]
-        state[:password] = config[:machine_options][:bootstrap_options][:ssh][:password]
-        
-        machine = with_metal_driver(config[:server_name]) do | action_handler, driver, machine_spec|
-      	  driver.allocate_machine(action_handler, machine_spec, config[:machine_options])
-      	  driver.ready_machine(action_handler, machine_spec, config[:machine_options])
-          state[:server_id] = machine_spec.location['server_id']
-          state[:hostname] = machine_spec.location['ipaddress']
-          state[:vsphere_name] = config[:server_name]
-        end
-      end
-
-      def destroy(state)
-        return if state[:server_id].nil?
-
-        with_metal_driver(state[:vsphere_name]) do | action_handler, driver, machine_spec|
-          machine_spec.location = { 'driver_url' => driver.driver_url,
-                        'server_id' => state[:server_id]}
-          driver.destroy_machine(action_handler, machine_spec, config[:machine_options])
-        end
-
-        state.delete(:server_id)
-        state.delete(:hostname)
-        state.delete(:vsphere_name)
-      end
-
-      def with_metal_driver(name, &block)
-        Cheffish.honor_local_mode do
-          chef_server = Cheffish.default_chef_server(Cheffish.profiled_config)
-          config[:machine_options][:convergence_options] = {:chef_server => chef_server}
-          machine_spec = ChefMetal::ChefMachineSpec.new({'name' => name}, chef_server)
-          driver = ChefMetal.driver_for_url("vsphere://#{config[:driver_options][:host]}", config)
-          action_handler = ChefMetal::ActionHandler.new
-          block.call(action_handler, driver, machine_spec)
-        end
-      end
-  	end
-  end
-end

data/lib/kitchen/driver/vsphere_windows.rb

@@ -1,129 +0,0 @@
-require 'kitchen/driver/vsphere_common'
-require 'zip'
-
-module Kitchen
-  module Driver
-    class VsphereWindows < Kitchen::Driver::WinRMBase
-
-      default_config :machine_options,
-        :start_timeout => 600,
-        :create_timeout => 600,
-        :ready_timeout => 90,
-        :bootstrap_options => {
-          :use_linked_clone => true,
-          :ssh => {
-            :user => 'administrator',
-          },
-          :convergence_options => {},
-          :customization_spec => {
-            :domain => 'local',
-            :org_name => 'Tier3',
-            :product_id => 'W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9',
-            :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