kitchen-hyperv 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77de7e7e7c1ef9e2beccf916a5d2cfa43944e21a20c5f20b7b05fdccf6fbe7f1
-  data.tar.gz: 56e1414348b16545ca9352c2f8412f646357d722eb734ce6d63fba284ba0d70c
+  metadata.gz: 21905b2f2c54db8a9414e98231c4eaa08c66cfa8aab926bf41248a8159663b29
+  data.tar.gz: 2ae8c16b86ee2933635c59f5e8403c42507d9ea2461c4c581c3468e409967c89
 SHA512:
-  metadata.gz: bc98efd324d739c4acbc8a8f94126af271e93b0b0221eed758011cbd6e62e7e208faa9db97d7af2a9bc636fdc0dcd01bc2e405e98794093c60603ae2f32043e7
-  data.tar.gz: 7bf53cdba391cf217b1e178a3c6150c6a4aa69b8dc100aba62d2f8360c67e65973f83936ec15967e7bb95b7ed0ee0082f3f951499673097c3a199ec7ff3c72eb
+  metadata.gz: 171d1d798fad06869c129086e5b72a093b3457ed4149cfb0ddc971756e70590f5359149a042519bc0d208381b61c9ebffc6b2c5c16f28c63f128ee14edf8815c
+  data.tar.gz: c7ff58b26dda26b67289a8acf66ae3bbdd152862b85e6bb9b2ed592833b0c2e44e980e3c4b8e17d24d1a108fe734820ed1da241778713c6d74819c9cd04ad8e0

data/Rakefile

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require "bundler/gem_tasks"
 require "kitchen/driver/hyperv_version"
 

data/kitchen-hyperv.gemspec

@@ -1,5 +1,4 @@
-# encoding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "kitchen/driver/hyperv_version"
@@ -23,4 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "mocha", "~> 1.1"
 
   spec.add_dependency "test-kitchen", ">= 1.4", "< 4"
+  spec.add_dependency "train", "~> 3.5"
+  spec.add_dependency "train-winrm", "~> 0.2"
 end

data/lib/kitchen/driver/hyperv.rb

@@ -23,6 +23,8 @@ require_relative "powershell"
 require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 require "fileutils" unless defined?(FileUtils)
 require "json" unless defined?(JSON)
+require "train" unless defined?(Train)
+require "train-winrm" unless defined?(TrainPlugins::WinRM)
 
 module Kitchen
 
@@ -34,8 +36,9 @@ module Kitchen
       kitchen_driver_api_version 2
       plugin_version Kitchen::Driver::HYPERV_VERSION
 
-      default_config :parent_vhd_folder
-      default_config :parent_vhd_name
+      required_config :parent_vhd_folder
+      required_config :parent_vhd_name
+
       default_config :memory_startup_bytes, 536_870_912
       default_config :dynamic_memory_min_bytes, 536_870_912
       default_config :dynamic_memory_max_bytes, 2_147_483_648
@@ -60,6 +63,13 @@ module Kitchen
         File.extname(driver[:parent_vhd_name])
       end
 
+      default_config :hyperv_server, nil
+      default_config :hyperv_username, nil
+      default_config :hyperv_password, nil
+      default_config :hyperv_ssl, false
+      default_config :hyperv_insecure, true
+      default_config :remote_vm_path, 'C:\Users\Public\Documents\Hyper-V'
+
       include Kitchen::Driver::PowerShellScripts
 
       def create(state)
@@ -94,8 +104,8 @@ module Kitchen
       private
 
       def validate_vm_settings
-        raise "Missing parent_vhd_folder" unless vhd_folder?
-        raise "Missing parent_vhd_name" unless vhd?
+        raise "Missing parent_vhd_folder" unless vhd_folder? || remote_hyperv
+        raise "Missing parent_vhd_name" unless vhd? || remote_hyperv
 
         if config[:dynamic_memory]
           startup_bytes = config[:memory_startup_bytes]
@@ -160,6 +170,7 @@ module Kitchen
 
         info("Creating virtual machine for #{instance.name}.")
         new_vm_object = run_ps new_vm_ps
+        raise "Unable to create virtual machine for #{instance.name}." if new_vm_object.nil?
         @state[:id] = new_vm_object["Id"]
         info("Created virtual machine for #{instance.name}.")
       end
@@ -244,6 +255,8 @@ module Kitchen
       end
 
       def remove_differencing_disk
+        return unless differencing_disk_exists
+
         info("Removing the differencing disk for #{instance.name}.")
         FileUtils.rm(differencing_disk_path)
         info("Removed the differencing disk for #{instance.name}.")
@@ -269,12 +282,18 @@ module Kitchen
         @kitchen_vm_path ||= File.join(config[:kitchen_root], ".kitchen/#{instance.name}")
       end
 
+      def remote_kitchen_vm_path
+        config[:remote_vm_path]
+      end
+
       def boot_iso_path
         @boot_iso_path ||= config[:boot_iso_path]
       end
 
       def differencing_disk_path
-        @differencing_disk_path ||= File.join(kitchen_vm_path, "diff" + "#{config[:disk_type]}")
+        kitchen_vm_base = remote_hyperv ? remote_kitchen_vm_path : kitchen_vm_path
+
+        @differencing_disk_path ||= File.join(kitchen_vm_base, "diff" + "#{config[:disk_type]}")
       end
 
       def additional_disk_path(disk_name, disk_type)
@@ -292,6 +311,44 @@ module Kitchen
       def vhd?
         config[:parent_vhd_name] && File.exist?(parent_vhd_path)
       end
+
+      def remote_hyperv
+        !!config[:hyperv_server]
+      end
+
+      def connection
+        return @connection if @connection
+
+        backend = remote_hyperv ? "winrm" : "local"
+
+        train = Train.create(backend, {
+                              host:        config[:hyperv_server],
+                              user:        config[:hyperv_username],
+                              password:    config[:hyperv_password],
+                              ssl:         config[:hyperv_ssl],
+                              self_signed: config[:hyperv_insecure],
+                            })
+        @connection = train.connection
+
+        # Copy support PS1
+        @connection.upload(local_script_path, remote_script_path)
+
+        @connection
+      end
+
+      def base_script_path
+        return remote_script_path if remote_hyperv
+
+        local_script_path
+      end
+
+      def local_script_path
+        File.join(File.dirname(__FILE__), "/../../../support/hyperv.ps1")
+      end
+
+      def remote_script_path
+        File.join(config[:kitchen_root], "kitchen-hyperv", "hyperv.ps1")
+      end
     end
   end
 end

data/lib/kitchen/driver/hyperv_version.rb

@@ -17,6 +17,6 @@
 
 module Kitchen
   module Driver
-    HYPERV_VERSION = "0.6.0".freeze
+    HYPERV_VERSION = "0.7.0".freeze
   end
 end

data/lib/kitchen/driver/powershell.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 
 require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require "benchmark" unless defined?(Benchmark)
 require "fileutils" unless defined?(FileUtils)
 require "json" unless defined?(JSON)
 
@@ -28,6 +29,8 @@ module Kitchen
       end
 
       def is_64bit?
+        return true if remote_hyperv
+
         os_arch = ENV["PROCESSOR_ARCHITEW6432"] || ENV["PROCESSOR_ARCHITECTURE"]
         ruby_arch = ["foo"].pack("p").size == 4 ? 32 : 64
         os_arch == "AMD64" && ruby_arch == 64
@@ -48,7 +51,6 @@ module Kitchen
       end
 
       def wrap_command(script)
-        base_script_path = File.join(File.dirname(__FILE__), "/../../../support/hyperv.ps1")
         debug("Loading functions from #{base_script_path}")
         new_script = [ ". #{base_script_path}", "#{script}" ].join(";\n")
         debug("Wrapped script: #{new_script}")
@@ -71,11 +73,15 @@ module Kitchen
       end
 
       def execute_command(cmd, options = {})
-        debug("#Local Command BEGIN (#{cmd})")
-        sh = Mixlib::ShellOut.new(cmd, options)
-        sh.run_command
-        debug("Local Command END #{Util.duration(sh.execution_time)}")
-        raise "Failed: #{sh.stderr}" if sh.error?
+        debug("#Command BEGIN (#{cmd})")
+
+        sh = nil
+        bm = Benchmark.measure do
+          sh = connection.run_command(cmd, options)
+        end
+
+        debug("Command END #{Util.duration(bm.total)}")
+        raise "Failed: #{sh.stderr}" if sh.exit_status != 0
 
         stdout = sanitize_stdout(sh.stdout)
         JSON.parse(stdout) if stdout.length > 2
@@ -113,7 +119,7 @@ module Kitchen
             Generation = #{config[:vm_generation]}
             DisableSecureBoot = "#{config[:disable_secureboot]}"
             MemoryStartupBytes = #{config[:memory_startup_bytes]}
-            StaticMacAddress = "#{config[:static_mac_address]}"
+            StaticMacAddress = "#{config[:static_mac_address].to_s}"
             Name = "#{instance.name}"
             Path = "#{kitchen_vm_path}"
             VHDPath = "#{differencing_disk_path}"
@@ -139,6 +145,7 @@ module Kitchen
         EOH
       end
 
+      # TODO: Report if VM has no IP address instead of silently waiting forever
       def vm_details_ps
         <<-DETAILS
 

data/support/hyperv.ps1

@@ -18,8 +18,8 @@ function New-DifferencingDisk {
         [parameter(Mandatory)]
         [ValidateNotNullOrEmpty()]
         [string[]]$Path,
-        [parameter(Mandatory)]        
-        [ValidateNotNullOrEmpty()] 
+        [parameter(Mandatory)]
+        [ValidateNotNullOrEmpty()]
         [string]$ParentPath
     )
     if (-not (Test-Path $Path)) {
@@ -73,9 +73,9 @@ function New-KitchenVM {
         $EnableGuestServices,
         $AdditionalDisks
     )
-    $null = $psboundparameters.remove('DisableSecureBoot')    
+    $null = $psboundparameters.remove('DisableSecureBoot')
     $null = $psboundparameters.remove('ProcessorCount')
-    $null = $psboundparameters.remove('StaticMacAddress') 
+    $null = $psboundparameters.remove('StaticMacAddress')
     $null = $psboundparameters.remove('UseDynamicMemory')
     $null = $psboundparameters.remove('DynamicMemoryMinBytes')
     $null = $psboundparameters.remove('DynamicMemoryMaxBytes')
@@ -99,7 +99,7 @@ function New-KitchenVM {
     if (-not [string]::IsNullOrEmpty($boot_iso_path)) {
         Mount-VMISO -Id $vm.Id -Path $boot_iso_path
     }
-    if ($StaticMacAddress -ne $null) {
+    if (-not [string]::IsNullOrEmpty($StaticMacAddress)) {
         Set-VMNetworkAdapter -VMName $vm.VMName -StaticMacAddress $StaticMacAddress
     }
     if ($EnableGuestServices -and (Get-command Enable-VMIntegrationService -ErrorAction SilentlyContinue)) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-hyperv
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Steven Murawski
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,6 +92,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: train
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: train-winrm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: Hyper-V Driver for Test-Kitchen
 email:
 - steven.murawski@gmail.com
@@ -111,7 +139,7 @@ homepage: https://github.com/test-kitchen/kitchen-hyperv
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -126,8 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Hyper-V Driver for Test-Kitchen
 test_files: []