kitchen-hyperv 0.3.0 → 0.4.0

data/lib/kitchen/driver/hyperv_version.rb

@@ -17,6 +17,6 @@
 
 module Kitchen
   module Driver
-    HYPERV_VERSION = '0.3.0'.freeze
+    HYPERV_VERSION = '0.4.0'.freeze
   end
 end

data/lib/kitchen/driver/powershell.rb

@@ -91,6 +91,13 @@ module Kitchen
         DIFF
       end
 
+      def new_additional_disk_ps(disk_path, disk_size)
+        <<-ADDDISK
+
+          New-VHD -Path "#{disk_path}" -SizeBytes #{disk_size}GB | Out-Null
+        ADDDISK
+      end
+
       def ensure_vm_running_ps
         <<-RUNNING
 
@@ -103,17 +110,20 @@ module Kitchen
 
           $NewVMParams = @{
             Generation = #{config[:vm_generation]}
+            DisableSecureBoot = "#{config[:disable_secureboot]}"
             MemoryStartupBytes = #{config[:memory_startup_bytes]}
             Name = "#{instance.name}"
             Path = "#{kitchen_vm_path}"
             VHDPath = "#{differencing_disk_path}"
             SwitchName = "#{config[:vm_switch]}"
+            VlanId = #{config[:vm_vlan_id] || '$null'}
             ProcessorCount = #{config[:processor_count]}
             UseDynamicMemory = "#{config[:dynamic_memory]}"
             DynamicMemoryMinBytes = #{config[:dynamic_memory_min_bytes]}
             DynamicMemoryMaxBytes = #{config[:dynamic_memory_max_bytes]}
             boot_iso_path = "#{boot_iso_path}"
             EnableGuestServices = "#{config[:enable_guest_services]}"
+            AdditionalDisks = @("#{@additional_disk_objects.join('","') || ''}")
           }
           New-KitchenVM @NewVMParams | ConvertTo-Json
         NEWVM
@@ -159,6 +169,12 @@ module Kitchen
         MOUNTISO
       end
 
+      def resize_vhd
+        <<-VMNOTE
+          Resize-VHD -Path "#{parent_vhd_path}" -Size #{config[:resize_vhd]}
+        VMNOTE
+      end
+
       def set_vm_note
         <<-VMNOTE
           Set-VM -Name (Get-VM | Where-Object{ $_.ID -eq "#{@state[:id]}"}).Name -Note "#{config[:vm_note]}"

data/spec/kitchen/driver/hyperv_spec.rb

@@ -1,70 +1,70 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2015, 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.
-
-require_relative "../../spec_helper"
-
-require "logger"
-require "stringio"
-require "kitchen"
-require 'kitchen/driver/hyperv_version'
-require "kitchen/driver/hyperv"
-require "kitchen/provisioner/dummy"
-require "kitchen/transport/dummy"
-require "kitchen/verifier/dummy"
-
-describe Kitchen::Driver::Hyperv do
-
-  let(:logged_output) { StringIO.new }
-  let(:logger)        { Logger.new(logged_output) }
-  let(:config)        { { :kitchen_root => "c:/test_root" } }
-  let(:platform)      { Kitchen::Platform.new(:name => "fooos-99") }
-  let(:suite)         { Kitchen::Suite.new(:name => "suitey") }
-  let(:verifier)      { Kitchen::Verifier::Dummy.new }
-  let(:provisioner)   { Kitchen::Provisioner::Dummy.new }
-  let(:transport)     { Kitchen::Transport::Dummy.new }
-  let(:state_file)    { stub("state_file") }
-  let(:state)         { Hash.new }
-  let(:env)           { Hash.new }
-
-  let(:driver_object) { Kitchen::Driver::Hyperv.new(config) }
-
-  let(:driver) do
-    d = driver_object
-    instance
-    d
-  end
-
-  let(:instance) do
-    Kitchen::Instance.new(
-      :verifier => verifier,
-      :driver => driver_object,
-      :logger => logger,
-      :suite => suite,
-      :platform => platform,
-      :provisioner => provisioner,
-      :transport => transport,
-      :state_file => state_file
-    )
-  end
-
-  #before { stub_const("ENV", env) }
-
-  it 'driver api_version is 2' do
-    driver.diagnose_plugin[:api_version].must_equal(2)
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher (<fnichol@nichol.ca>)
+#
+# Copyright (C) 2015, 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.
+
+require_relative "../../spec_helper"
+
+require "logger"
+require "stringio"
+require "kitchen"
+require 'kitchen/driver/hyperv_version'
+require "kitchen/driver/hyperv"
+require "kitchen/provisioner/dummy"
+require "kitchen/transport/dummy"
+require "kitchen/verifier/dummy"
+
+describe Kitchen::Driver::Hyperv do
+
+  let(:logged_output) { StringIO.new }
+  let(:logger)        { Logger.new(logged_output) }
+  let(:config)        { { :kitchen_root => "c:/test_root" } }
+  let(:platform)      { Kitchen::Platform.new(:name => "fooos-99") }
+  let(:suite)         { Kitchen::Suite.new(:name => "suitey") }
+  let(:verifier)      { Kitchen::Verifier::Dummy.new }
+  let(:provisioner)   { Kitchen::Provisioner::Dummy.new }
+  let(:transport)     { Kitchen::Transport::Dummy.new }
+  let(:state_file)    { stub("state_file") }
+  let(:state)         { Hash.new }
+  let(:env)           { Hash.new }
+
+  let(:driver_object) { Kitchen::Driver::Hyperv.new(config) }
+
+  let(:driver) do
+    d = driver_object
+    instance
+    d
+  end
+
+  let(:instance) do
+    Kitchen::Instance.new(
+      :verifier => verifier,
+      :driver => driver_object,
+      :logger => logger,
+      :suite => suite,
+      :platform => platform,
+      :provisioner => provisioner,
+      :transport => transport,
+      :state_file => state_file
+    )
+  end
+
+  #before { stub_const("ENV", env) }
+
+  it 'driver api_version is 2' do
+    driver.diagnose_plugin[:api_version].must_equal(2)
+  end
+end

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,160 @@
 . $PSScriptRoot\..\..\support\hyperv.ps1
 
 describe 'New-DifferencingDisk' {
-  mock new-vhd -Verifiable -MockWith {}
+    mock new-vhd -Verifiable -MockWith {}
 
-  context 'mandatory parameters' {
-    mock Test-Path -MockWith {}
+    context 'mandatory parameters' {
+        mock Test-Path -MockWith {}
 
-    $command = get-command new-differencingDisk
+        $command = get-command new-differencingDisk
 
-    it 'Path is mandatory' {
-      $Command.Parameters['Path'].Attributes.Mandatory | should be $true
+        it 'Path is mandatory' {
+            $Command.Parameters['Path'].Attributes.Mandatory | should be $true
+        }
+        it 'ParentPath is mandatory' {
+            $Command.Parameters['ParentPath'].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
+            }
+        }
     }
-  }
+}
+
+Describe "New-KitchenVM with VlanId" {
+    function New-VM {}
+    function Set-VM {}
+    function Set-VMMemory {}
+    function Set-VMNetworkAdapterVlan {param ($VM, [Switch]$Access, $VlanId)}
+    function Start-VM {}
+  
+    Mock New-VM
+    Mock Set-VM
+    Mock Set-VMMemory
+    Mock Set-VMNetworkAdapterVlan
+    Mock Start-VM
 
-  context 'when differencing disk exists' {
-    mock Test-Path -ParameterFilter {$Path -eq 'c:\.kitchen\diff.vhd'} -MockWith {$true}
+    Context "When VlanId is not specified" {
+        New-KitchenVM
+
+        It "Should not set the VlanId for the VM" {
+            Assert-MockCalled Set-VMNetworkAdapterVlan -Times 0
+        }
+    }
 
-    new-differencingDisk -Path 'c:\.kitchen\diff.vhd' -parentpath 'c:\source.vhd'
+    Context "When VlanId is specified" {
+        $testVlanId = 1
+        New-KitchenVM -VlanId $testVlanId
 
-    it 'does not create a new vhd' {
-      Assert-MockCalled new-vhd -Times 0
+        It "Should set the VlanId for the VM" {
+            Assert-MockCalled Set-VMNetworkAdapterVlan -Times 1 -ParameterFilter {
+                $VM -eq $null -and 
+                $Access -eq $true -and 
+                $VlanId -eq $testVlanId
+            }
+        }
     }
-  }
+}
+
+Describe "New-KitchenVM with AdditionalDisks" {
+    function New-VM {}
+    function Set-VM {}
+    function Set-VMMemory {}
+    function Add-VMHardDiskDrive {param ($Path)}
+    function Start-VM {}
+  
+    Mock New-VM
+    Mock Set-VM
+    Mock Set-VMMemory
+    Mock Add-VMHardDiskDrive
+    Mock Start-VM
+
+    Context "When AdditionalDisks is not specified" {
+        New-KitchenVM
 
-  context 'when a differencing disk does not exist' {
-    mock Test-Path -ParameterFilter {$Path -eq 'c:\.kitchen\diff.vhd'} -MockWith {$false}
+        It "Should not add additional disks to the VM" {
+            Assert-MockCalled Add-VMHardDiskDrive -Times 0
+        }
+    }
 
-    new-differencingDisk -Path 'c:\.kitchen\diff.vhd' -parentpath 'c:\source.vhd'
+    Context "When AdditionalDisks is specified" {
+        $AdditionalDisks = @(".\test1.vhd", ".\test2.vhdx")
+        New-KitchenVM -AdditionalDisks $AdditionalDisks
 
-    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
-      }
+        It "Should add additinoal disks to the VM" {
+            Assert-MockCalled Add-VMHardDiskDrive -Times $AdditionalDisks.Count -ParameterFilter {
+                $VM -eq $null -and 
+                $Path -in $AdditionalDisks
+            }
+        }
     }
-  }
 }
 
+Describe "New-KitchenVM with DisableSecureBoot" {
+    function New-VM {}
+    function Set-VM {}
+    function Set-VMMemory {}
+    function Set-VMFirmware {param ($EnableSecureBoot)}
+    function Start-VM {}
+  
+    Mock New-VM
+    Mock Set-VM
+    Mock Set-VMMemory
+    Mock Set-VMFirmware
+    Mock Start-VM
+
+    Context "When DisableSecureBoot is not specified" {
+        New-KitchenVM
+
+        It "Should not set firmware settings on the VM" {
+            Assert-MockCalled Set-VMFirmware -Times 0
+        }
+    }
+
+    Context "When DisableSecureBoot is False" {
+        New-KitchenVM -DisableSecureBoot $false
+
+        It "Should not set firmware settings on the VM" {
+            Assert-MockCalled Set-VMFirmware -Times 0
+        }
+    }
+
+    Context "When DisableSecureBoot is True and Generation is 1" {
+        New-KitchenVM -Generation 1 -DisableSecureBoot $true
+
+        It "Should not set firmware settings on the VM" {
+            Assert-MockCalled Set-VMFirmware -Times 0
+        }
+    }
+
+    Context "When DisableSecureBoot is True and Generation is 2" {
+        New-KitchenVM -Generation 2 -DisableSecureBoot $true
+
+        It "Should disable secure boot on the VM" {
+            Assert-MockCalled Set-VMFirmware -Times 1 -ParameterFilter {
+                $VM -eq $null -and 
+                $EnableSecureBoot -eq "Off"
+            }
+        }
+    }
+}