kitchen-hyperv 0.2.3 → 0.3.0

data/spec/spec_helper.rb

@@ -1,43 +1,43 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2012, Fletcher Nichol
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-gem "minitest"
-gem "minitest-stub-const"
-
-if ENV["CODECLIMATE_REPO_TOKEN"]
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-elsif ENV["COVERAGE"]
-  require "simplecov"
-  SimpleCov.profiles.define "gem" do
-    command_name "Specs"
-
-    add_filter ".gem/"
-    add_filter "/spec/"
-    add_filter "/lib/vendor/"
-
-    add_group "Libraries", "/lib/"
-  end
-  SimpleCov.start "gem"
-end
-
-require 'minitest'
-require 'minitest/stub_const'
-require "minitest/autorun"
-require "mocha/setup"
-require "tempfile"
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+#
+# Copyright (C) 2012, Fletcher Nichol
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+gem "minitest"
+gem "minitest-stub-const"
+
+if ENV["CODECLIMATE_REPO_TOKEN"]
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+elsif ENV["COVERAGE"]
+  require "simplecov"
+  SimpleCov.profiles.define "gem" do
+    command_name "Specs"
+
+    add_filter ".gem/"
+    add_filter "/spec/"
+    add_filter "/lib/vendor/"
+
+    add_group "Libraries", "/lib/"
+  end
+  SimpleCov.start "gem"
+end
+
+require 'minitest'
+require 'minitest/stub_const'
+require "minitest/autorun"
+require "mocha/setup"
+require "tempfile"

data/spec/support/hyperv.Tests.ps1

@@ -1,43 +1,43 @@
-. $PSScriptRoot\..\..\support\hyperv.ps1
-
-describe 'New-DifferencingDisk' {
-  mock new-vhd -Verifiable -MockWith {}
-
-  context 'mandatory parameters' {
-    mock Test-Path -MockWith {}
-
-    $command = get-command new-differencingDisk
-
-    it 'Path is mandatory' {
-      $Command.Parameters['Path'].Attributes.Mandatory | should be $true
-    }
-    it 'ParentPath is mandatory' {
-      $Command.Parameters['ParentPath'].Attributes.Mandatory | should be $true
-    }
-  }
-
-  context 'when differencing disk exists' {
-    mock Test-Path -ParameterFilter {$Path -eq 'c:\.kitchen\diff.vhd'} -MockWith {$true}
-
-    new-differencingDisk -Path 'c:\.kitchen\diff.vhd' -parentpath 'c:\source.vhd'
-
-    it 'does not create a new vhd' {
-      Assert-MockCalled new-vhd -Times 0
-    }
-  }
-
-  context 'when a differencing disk does not exist' {
-    mock Test-Path -ParameterFilter {$Path -eq 'c:\.kitchen\diff.vhd'} -MockWith {$false}
-
-    new-differencingDisk -Path 'c:\.kitchen\diff.vhd' -parentpath 'c:\source.vhd'
-
-    it 'creates a new differencing disk' {
-      Assert-MockCalled new-vhd -Times 1 -ParameterFilter {
-        $Path -eq 'c:\.kitchen\diff.vhd' -and 
-        $ParentPath -eq 'c:\source.vhd' -and 
-        $Differencing -eq $true
-      }
-    }
-  }
-}
-
+. $PSScriptRoot\..\..\support\hyperv.ps1
+
+describe 'New-DifferencingDisk' {
+  mock new-vhd -Verifiable -MockWith {}
+
+  context 'mandatory parameters' {
+    mock Test-Path -MockWith {}
+
+    $command = get-command new-differencingDisk
+
+    it 'Path is mandatory' {
+      $Command.Parameters['Path'].Attributes.Mandatory | should be $true
+    }
+    it 'ParentPath is mandatory' {
+      $Command.Parameters['ParentPath'].Attributes.Mandatory | should be $true
+    }
+  }
+
+  context 'when differencing disk exists' {
+    mock Test-Path -ParameterFilter {$Path -eq 'c:\.kitchen\diff.vhd'} -MockWith {$true}
+
+    new-differencingDisk -Path 'c:\.kitchen\diff.vhd' -parentpath 'c:\source.vhd'
+
+    it 'does not create a new vhd' {
+      Assert-MockCalled new-vhd -Times 0
+    }
+  }
+
+  context 'when a differencing disk does not exist' {
+    mock Test-Path -ParameterFilter {$Path -eq 'c:\.kitchen\diff.vhd'} -MockWith {$false}
+
+    new-differencingDisk -Path 'c:\.kitchen\diff.vhd' -parentpath 'c:\source.vhd'
+
+    it 'creates a new differencing disk' {
+      Assert-MockCalled new-vhd -Times 1 -ParameterFilter {
+        $Path -eq 'c:\.kitchen\diff.vhd' -and 
+        $ParentPath -eq 'c:\source.vhd' -and 
+        $Differencing -eq $true
+      }
+    }
+  }
+}
+

data/support/hyperv.ps1

@@ -76,14 +76,17 @@ function New-KitchenVM
       $UseDynamicMemory,
       $DynamicMemoryMinBytes,
       $DynamicMemoryMaxBytes,
-      $boot_iso_path
+      $boot_iso_path,
+      $EnableGuestServices
 	  )
 	  $null = $psboundparameters.remove('ProcessorCount')
 	  $null = $psboundparameters.remove('UseDynamicMemory')
 	  $null = $psboundparameters.remove('DynamicMemoryMinBytes')
 	  $null = $psboundparameters.remove('DynamicMemoryMaxBytes')
 	  $null = $psboundparameters.remove('boot_iso_path')
+      $null = $psboundparameters.remove('EnableGuestServices')
 	  $UseDynamicMemory = [Convert]::ToBoolean($UseDynamicMemory)
+	  $null = [bool]::TryParse($EnableGuestServices,[ref]$EnableGuestServices)
 
 	  $vm = new-vm @psboundparameters |
 	    Set-Vm -ProcessorCount $ProcessorCount -passthru
@@ -95,6 +98,9 @@ function New-KitchenVM
     }
       if (-not [string]::IsNullOrEmpty($boot_iso_path)) {
         Mount-VMISO -Id $vm.Id -Path $boot_iso_path
+      }
+      if ($EnableGuestServices -and (Get-command Enable-VMIntegrationService -ErrorAction SilentlyContinue)) {
+        Enable-VMIntegrationService -VM $vm -Name 'Guest Service Interface'
       }
 	  $vm | Start-Vm -passthru |
 	    foreach {
@@ -211,5 +217,11 @@ function Mount-VMISO
     [cmdletbinding()]
     param($Id, $Path)
 
-    set-VMDvdDrive -VMName (Get-VM -Id $Id).Name -Path $Path
+    if ((Get-VM -Id $Id).Generation -eq 2)
+    {
+        Add-VMDvdDrive (Get-VM -Id $Id).Name | Set-VMDvdDrive -VMName (Get-VM -Id $Id).Name -Path $Path
+    }
+
+    Set-VMDvdDrive -VMName (Get-VM -Id $Id).Name -Path $Path
 }
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-hyperv
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Hyper-V Driver for Test-Kitchen
@@ -187,4 +187,3 @@ test_files:
 - spec/kitchen/driver/hyperv_spec.rb
 - spec/spec_helper.rb
 - spec/support/hyperv.Tests.ps1
-has_rdoc: