kitchen-hyperv 0.4.1 → 0.5.0

data/spec/support/hyperv.Tests.ps1

@@ -1,160 +1,194 @@
-. $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
-            }
-        }
-    }
-}
-
-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 VlanId is not specified" {
-        New-KitchenVM
-
-        It "Should not set the VlanId for the VM" {
-            Assert-MockCalled Set-VMNetworkAdapterVlan -Times 0
-        }
-    }
-
-    Context "When VlanId is specified" {
-        $testVlanId = 1
-        New-KitchenVM -VlanId $testVlanId
-
-        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
-
-        It "Should not add additional disks to the VM" {
-            Assert-MockCalled Add-VMHardDiskDrive -Times 0
-        }
-    }
-
-    Context "When AdditionalDisks is specified" {
-        $AdditionalDisks = @(".\test1.vhd", ".\test2.vhdx")
-        New-KitchenVM -AdditionalDisks $AdditionalDisks
-
-        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"
-            }
-        }
-    }
-}
+. $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
+            }
+        }
+    }
+}
+
+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 VlanId is not specified" {
+        New-KitchenVM
+
+        It "Should not set the VlanId for the VM" {
+            Assert-MockCalled Set-VMNetworkAdapterVlan -Times 0
+        }
+    }
+
+    Context "When VlanId is specified" {
+        $testVlanId = 1
+        New-KitchenVM -VlanId $testVlanId
+
+        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
+
+        It "Should not add additional disks to the VM" {
+            Assert-MockCalled Add-VMHardDiskDrive -Times 0
+        }
+    }
+
+    Context "When AdditionalDisks is specified" {
+        $AdditionalDisks = @(".\test1.vhd", ".\test2.vhdx")
+        New-KitchenVM -AdditionalDisks $AdditionalDisks
+
+        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"
+            }
+        }
+    }
+}
+
+Describe "New-KitchenVM with StaticMacAddress" {
+    function New-VM {}
+    function Set-VM {}
+    function Set-VMMemory {}
+    function Set-VMNetworkAdapter {param ($VM, $StaticMacAddress)}
+    function Start-VM {}
+  
+    Mock New-VM
+    Mock Set-VM
+    Mock Set-VMMemory
+    Mock Set-VMNetworkAdapter
+    Mock Start-VM
+
+    Context "When StaticMacAddress is not specified" {
+        New-KitchenVM -StaticMacAddress ""
+
+        It "Should not set the StaticMacAddress for the VM" {
+            Assert-MockCalled Set-VMNetworkAdapter -Times 1
+        }
+    }
+
+    Context "When StaticMacAddress is specified" {
+        $testStaticMacAddress = "00155D01B532"
+        New-KitchenVM -StaticMacAddress $testStaticMacAddress
+
+        It "Should set the StaticMacAddress for the VM" {
+            Assert-MockCalled Set-VMNetworkAdapter -Times 1 -ParameterFilter {
+                $VM -eq $VM.VMName -and 
+                $StaticMacAddress -eq $testStaticMacAddress
+            }
+        }
+    }
+}

data/support/hyperv.ps1

@@ -59,6 +59,7 @@ function New-KitchenVM {
         $Generation = 1,
         $DisableSecureBoot,
         $MemoryStartupBytes,
+        $StaticMacAddress,
         $Name,
         $Path,
         $VHDPath,
@@ -74,6 +75,7 @@ function New-KitchenVM {
     )
     $null = $psboundparameters.remove('DisableSecureBoot')    
     $null = $psboundparameters.remove('ProcessorCount')
+    $null = $psboundparameters.remove('StaticMacAddress') 
     $null = $psboundparameters.remove('UseDynamicMemory')
     $null = $psboundparameters.remove('DynamicMemoryMinBytes')
     $null = $psboundparameters.remove('DynamicMemoryMaxBytes')
@@ -97,6 +99,9 @@ function New-KitchenVM {
     if (-not [string]::IsNullOrEmpty($boot_iso_path)) {
         Mount-VMISO -Id $vm.Id -Path $boot_iso_path
     }
+    if ($StaticMacAddress -ne $null) {
+        Set-VMNetworkAdapter -VMName $vm.VMName -StaticMacAddress $StaticMacAddress
+    }
     if ($EnableGuestServices -and (Get-command Enable-VMIntegrationService -ErrorAction SilentlyContinue)) {
         Enable-VMIntegrationService -VM $vm -Name 'Guest Service Interface'
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-hyperv
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-07-05 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.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Hyper-V Driver for Test-Kitchen