kitchen-hyperv 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e5069fa03e4ad0ae44ac50547e6d2e72a78e15c
-  data.tar.gz: ffc236de0552e5d2a05a823e5940cf71d08d39b2
+  metadata.gz: 00ebbd881261a4c181dd20609af6dbe637e31a9f
+  data.tar.gz: f72840dd9fe7aa7656f587a308f2083ad367f3be
 SHA512:
-  metadata.gz: 256beb5a5e5162a66ef21e27ef0c9545f983e9ccefadafbff39e76b580e3a6fe9f15bd74deadbbe5636cd0c93c78613410b7b280b9ecf5bf91228afcbb90c54c
-  data.tar.gz: 840a6623091d82276080c80589438500dd56031efc0f81e33f32b41f704d596136688124c8671a6c2fafdfbebd5a2a7bf3943e476ec07c44be4b2ba05774ee03
+  metadata.gz: 3570223eaed7e14b5de2d3882e5c92db9ed7794253c5fcece900cd5285cd4a623188fe493342201431961a6e8742406f59c92015a61843ae35bb257ab0095e86
+  data.tar.gz: 96186575c571efaae757e730d5eb6c674cdd6414264bdd386a97d66a1a0220dca8a361541976028d96e7e791cae85f2649232b25e73c4f5d767998a76d384d57

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.1.8 / 12-03-2015
+
+* [PR #15](https://github.com/test-kitchen/kitchen-hyperv/pull/15) : Dynamic Memory support
+* [PR #17](https://github.com/test-kitchen/kitchen-hyperv/pull/17) : File copy support
+* [PR #19](https://github.com/test-kitchen/kitchen-hyperv/pull/19) : Explict import of hyper-v module and delay in getting ip  (wait for DHCP)
+* [PR #20](https://github.com/test-kitchen/kitchen-hyperv/pull/20) : Doc the required WinRM Settings
+
 # 0.1.7 / 07-14-2015
 
 * [PR #8](https://github.com/test-kitchen/kitchen-hyperv/pull/8) : Add support for 64 bit ruby

data/README.md

@@ -33,6 +33,10 @@ driver:
   * amount of RAM to assign to each virtual machine.  Defaults to 536,870,912.
 * processor_count
   * number of virtual processors to assign to each virtual machine. Defaults to 2.
+* dynamic_memory
+  * if true, the amount of memory allocated to a virtual machine is adjusted by Hyper-V dynamically. Defaults to false.
+* dynamic_memory_min_bytes / dynamic_memory_max_bytes
+  * The minimum and maximum amount of memory Hyper-V will allocate to a virtual machine if dynamic_memory is enabled. Defaults to 536,870,912 and 2,147,483,648 (512MB-2GB)
 * ip_address
   * IP address for the virtual machine.  If the VM is not on a network with DHCP, this can be used to assign an IP that can be reached from the host machine.
 * vm_switch
@@ -44,6 +48,17 @@ driver:
 * disk_type
   * The type of virtual disk to create, .VHD or .VHDX.  Defaults to the file extension of the parent virtual hard drive.
 
+## Image Configuration
+
+ The following changes need to be made to a Windows image that is going to be used for testing.  This is not an exhaustive list and, your milage may vary.
+
+#### WinRM
+
+```powershell
+winrm set winrm/config/client/auth @{Basic="true"}
+winrm set winrm/config/service/auth @{Basic="true"}
+winrm set winrm/config/service @{AllowUnencrypted="true"}
+ ```
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/kitchen-hyperv/fork )

data/lib/kitchen/driver/hyperv.rb

@@ -37,12 +37,15 @@ module Kitchen
       default_config :parent_vhd_folder
       default_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
+      default_config :dynamic_memory, false
       default_config :processor_count, 2
       default_config :ip_address
       default_config :vm_switch
       default_config :iso_path
       default_config :vm_generation, 1
-      default_config :disk_type do |driver| 
+      default_config :disk_type do |driver|
         File.extname(driver[:parent_vhd_name])
       end
 
@@ -56,6 +59,7 @@ module Kitchen
         update_state
         mount_virtual_machine_iso
         instance.transport.connection(@state).wait_until_ready
+        copy_vm_files
         info("Hyper-V instance #{instance.to_str} created.")
       end
 
@@ -80,6 +84,13 @@ module Kitchen
       def validate_vm_settings
         raise "Missing parent_vhd_folder" unless config[:parent_vhd_folder]
         raise "Missing parent_vhd_name" unless config[:parent_vhd_name]
+        if config[:dynamic_memory]
+          startup_bytes = config[:memory_startup_bytes]
+          min = config[:dynamic_memory_min_bytes]
+          max = config[:dynamic_memory_max_bytes]
+          memory_valid = startup_bytes.between?(min, max)
+          raise "memory_startup_bytes (#{startup_bytes}) must fall within dynamic memory range (#{min}-#{max})" unless memory_valid
+        end
         return if config[:vm_switch]
         config[:vm_switch] = (run_ps vm_default_switch_ps)['Name']
       end
@@ -100,8 +111,9 @@ module Kitchen
         info('Checking for existing virtual machine.')
         return false unless @state.key?(:id) && !@state[:id].nil?
         existing_vm = run_ps ensure_vm_running_ps
+        return false if existing_vm.nil? || existing_vm['Id'].nil?
         info("Found an exising VM with an ID: #{existing_vm['Id']}")
-        return true unless existing_vm.nil? || existing_vm['Id'].nil?
+        return true
         #fail('Failed to start existing VM.')
       end
 
@@ -131,6 +143,16 @@ module Kitchen
         @state[:id] = new_vm_object['Id']
         info("Created virtual machine for #{instance.name}.")
       end
+      
+      def copy_vm_files
+        
+        return if config[:copy_vm_files].nil?
+        info("Copying files to virtual machine")
+        config[:copy_vm_files].each do |file_info|
+          run_ps copy_vm_file_ps(file_info[:source], file_info[:dest])
+        end
+        info("Copied files to virtual machine")
+      end
 
       def update_state
         vm_details

data/lib/kitchen/driver/hyperv_version.rb

@@ -17,6 +17,6 @@
 
 module Kitchen
   module Driver
-      HYPERV_VERSION = '0.1.7'
+      HYPERV_VERSION = '0.1.8'
   end
 end

data/lib/kitchen/driver/powershell.rb

@@ -99,6 +99,9 @@ module Kitchen
             VHDPath = "#{differencing_disk_path}"
             SwitchName = "#{config[:vm_switch]}"
             ProcessorCount = #{config[:processor_count]}
+            UseDynamicMemory = "#{config[:dynamic_memory]}"
+            DynamicMemoryMinBytes = #{config[:dynamic_memory_min_bytes]}
+            DynamicMemoryMaxBytes = #{config[:dynamic_memory_max_bytes]}
           }
           New-KitchenVM @NewVMParams | ConvertTo-Json
         NEWVM
@@ -141,6 +144,41 @@ module Kitchen
           mount-vmiso -id "#{@state[:id]}" -Path #{config[:iso_path]}
         MOUNTISO
       end
+      
+      def copy_vm_file_ps(source, dest)
+        <<-FILECOPY
+          Function CopyFile ($VM, [string]$SourcePath, [string]$DestPath) {
+              #Write-Host "Copying file to VM - Source: $SourcePath Destination $DestPath"
+              $VM | Copy-VMFile -SourcePath $SourcePath -DestinationPath $DestPath -CreateFullPath -FileSource Host -Force
+          }
+          
+          $sourceLocation = '#{source}'
+          $destinationLocation = '#{dest}'
+          $vmId = '#{@state[:id]}'
+          If (Test-Path $sourceLocation) {
+              $vm = Get-VM -ID $vmId
+              $service = 'Guest Service Interface'
+              
+              If ((Get-VMIntegrationService -Name $service -VM $vm).Enabled -ne $true) {
+                  Enable-VMIntegrationService -Name $service -VM $vm
+                  Start-Sleep -Seconds 3
+              }
+              
+              If ((Get-Item $sourceLocation) -is [System.IO.DirectoryInfo]) {
+                  ForEach ($item in (Get-ChildItem -Path $sourceLocation -File)) {
+                      $destFullPath = (Join-Path $destinationLocation $item.Name)
+                      CopyFile $vm $item.FullName $destFullPath
+                  }
+              }
+              Else {
+                CopyFile $vm $sourceLocation $destinationLocation
+              }
+          }
+          else {
+              Write-Error "Source file path does not exist: $sourceLocation"
+          } 
+        FILECOPY
+      end
     end
   end
 end

data/support/hyperv.ps1

@@ -1,60 +1,90 @@
+#requires -Version 2 -Modules Hyper-V
 
-$ProgressPreference = "SilentlyContinue"
+#implicitly import hyperv module to avoid powercli cmdlets
+if((Get-Module -Name hyperv) -ne $null)
+{
+    Remove-Module -Name hyperv
+    Import-Module -Name hyperv
+}
+else
+{
+    Import-Module -Name hyperv
+}
+
+$ProgressPreference = 'SilentlyContinue'
 
 
 function New-DifferencingDisk
 {
-	[cmdletbinding()]
-	param ([string[]]$Path, [string]$ParentPath)
-	if (-not (test-path $Path))
+    [cmdletbinding()]
+    param ([string[]]$Path, [string]$ParentPath)
+    if (-not (Test-Path $Path))
     {
-      $null = new-vhd @psboundparameters -Differencing
+        $null = new-vhd @psboundparameters -Differencing
     }
 }
 
 function Assert-VmRunning
 {
-	[cmdletbinding()]
-	param([string]$Id)
+    [cmdletbinding()]
+    param([string]$Id)
 
-    if ([string]::IsNullOrEmpty($ID))
+    if ([string]::IsNullOrEmpty($Id))
     {
-      $Output = [pscustomobject]@{Name = '';State =''}
+        $Output = [pscustomobject]@{
+            Name  = ''
+            State = ''
+        }
     }
     else
     {
-      $Output = Get-VM -Id $ID |
-        foreach {
-          if ($_.State -notlike 'Running')
-          {
-            $_ | start-vm -passthru
-          }
-          else
-          {
-            $_
-          }
+        $Output = Get-VM -Id $Id |
+        ForEach-Object -Process {
+            if ($_.State -notlike 'Running')
+            {
+                $_ |
+                Start-VM -passthru
+            }
+            else
+            {
+                $_
+            }
         } |
-        select Name, Id, State
+        Select-Object -Property Name, Id, State
     }
-    $output
+    $Output
 }
 
 function New-KitchenVM
 {
-	[cmdletbinding()]
-	param (
-        $Generation = 1,
+    [cmdletbinding()]
+    param (
+      $Generation = 1,
 	    $MemoryStartupBytes,
 	    $Name,
 	    $Path,
 	    $VHDPath,
 	    $SwitchName,
-	    $ProcessorCount
+	    $ProcessorCount,
+      $UseDynamicMemory,
+      $DynamicMemoryMinBytes,
+      $DynamicMemoryMaxBytes
 	  )
 	  $null = $psboundparameters.remove('ProcessorCount')
+	  $null = $psboundparameters.remove('UseDynamicMemory')
+	  $null = $psboundparameters.remove('DynamicMemoryMinBytes')
+	  $null = $psboundparameters.remove('DynamicMemoryMaxBytes')
+	  $UseDynamicMemory = [Convert]::ToBoolean($UseDynamicMemory)
+
 	  $vm = new-vm @psboundparameters |
 	    Set-Vm -ProcessorCount $ProcessorCount -passthru
-    $vm | Set-VMMemory -DynamicMemoryEnabled $false 
+    if ($UseDynamicMemory) {
+      $vm | Set-VMMemory -DynamicMemoryEnabled $true -MinimumBytes $DynamicMemoryMinBytes -MaximumBytes $DynamicMemoryMaxBytes
+    }
+    else {
+      $vm | Set-VMMemory -DynamicMemoryEnabled $false
+    }
+	  
 	  $vm | Start-Vm -passthru |
 	    foreach {
 	      $vm = $_
@@ -68,9 +98,12 @@ function New-KitchenVM
 
 function Get-VmIP($vm)
 {
-	$vm.networkadapters.ipaddresses |
-	  where {$_ -match '^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$'} |
-	  select -first 1
+    start-sleep -seconds 10
+    $vm.networkadapters.ipaddresses |
+    Where-Object {
+        $_ -match '^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$'
+    } |
+    Select-Object -First 1
 }
 
 Function Set-VMNetworkConfiguration
@@ -79,18 +112,24 @@ Function Set-VMNetworkConfiguration
     Param (
         [parameter(valuefrompipeline)]
         [object]$NetworkAdapter,
-        [String[]]$IPAddress=@(),
-        [String[]]$Subnet=@()
+        [String[]]$IPAddress = @(),
+        [String[]]$Subnet = @()
     )
 
-    $VM = Get-WmiObject -Namespace 'root\virtualization\v2' -Class 'Msvm_ComputerSystem' | Where-Object { $_.ElementName -eq $NetworkAdapter.VMName }
-    $VMSettings = $vm.GetRelated('Msvm_VirtualSystemSettingData') | Where-Object { $_.VirtualSystemType -eq 'Microsoft:Hyper-V:System:Realized' }
+    $vm = Get-WmiObject -Namespace 'root\virtualization\v2' -Class 'Msvm_ComputerSystem' | Where-Object {
+        $_.ElementName -eq $NetworkAdapter.VMName 
+    }
+    $VMSettings = $vm.GetRelated('Msvm_VirtualSystemSettingData') | Where-Object {
+        $_.VirtualSystemType -eq 'Microsoft:Hyper-V:System:Realized' 
+    }
     $VMNetAdapters = $VMSettings.GetRelated('Msvm_SyntheticEthernetPortSettingData')
 
     $NetworkSettings = @()
-    foreach ($NetAdapter in $VMNetAdapters) {
-        if ($NetAdapter.Address -eq $NetworkAdapter.MacAddress) {
-            $NetworkSettings = $NetworkSettings + $NetAdapter.GetRelated("Msvm_GuestNetworkAdapterConfiguration")
+    foreach ($NetAdapter in $VMNetAdapters) 
+    {
+        if ($NetAdapter.Address -eq $NetworkAdapter.MacAddress) 
+        {
+            $NetworkSettings = $NetworkSettings + $NetAdapter.GetRelated('Msvm_GuestNetworkAdapterConfiguration')
         }
     }
 
@@ -100,53 +139,65 @@ Function Set-VMNetworkConfiguration
     $NetworkSettings[0].DHCPEnabled = $false
 
 
-    $Service = Get-WmiObject -Class "Msvm_VirtualSystemManagementService" -Namespace "root\virtualization\v2"
-    $setIP = $Service.SetGuestNetworkAdapterConfiguration($VM, $NetworkSettings[0].GetText(1))
+    $Service = Get-WmiObject -Class 'Msvm_VirtualSystemManagementService' -Namespace 'root\virtualization\v2'
+    $setIP = $Service.SetGuestNetworkAdapterConfiguration($vm, $NetworkSettings[0].GetText(1))
 
-    if ($setip.ReturnValue -eq 4096) {
-        $job=[WMI]$setip.job
+    if ($setIP.ReturnValue -eq 4096) 
+    {
+        $job = [WMI]$setIP.job
 
-        while ($job.JobState -eq 3 -or $job.JobState -eq 4) {
-            start-sleep 1
-            $job=[WMI]$setip.job
+        while ($job.JobState -eq 3 -or $job.JobState -eq 4) 
+        {
+            Start-Sleep 1
+            $job = [WMI]$setIP.job
         }
 
-        if ($job.JobState -ne 7) {
+        if ($job.JobState -ne 7) 
+        {
             $job.GetError()
         }
     }
-    (Get-VM -id $NetworkAdapter.VmId).NetworkAdapter | select Name, IpAddress
+    (Get-VM -Id $NetworkAdapter.VmId).NetworkAdapter | Select-Object Name, IpAddress
 }
 
 function Get-VmDetail
 {
-	[cmdletbinding()]
-	param($Id)
+    [cmdletbinding()]
+    param($Id)
+
+    Get-VM -Id $Id |
+    ForEach-Object {
+        $vm = $_
+        do 
+        {
+            Start-Sleep -Seconds 1
+        }
+        while (-not (Get-VmIP $vm))
 
-	get-vm -id $Id |
-	    foreach {
-	      $vm = $_
-	      do {
-	        start-sleep -seconds 1
-	      } while (-not (Get-VmIP $vm))
-
-	      [pscustomobject]@{
-	        Name = $vm.name
-	        Id = $vm.ID
-	        IpAddress = (Get-VmIP $vm)
-	      }
-	    }
+        [pscustomobject]@{
+            Name      = $vm.name
+            Id        = $vm.ID
+            IpAddress = (Get-VmIP $vm)
+        }
+    }
 }
 
 function Get-DefaultVMSwitch
 {
-    Get-VMSwitch | Select -First 1 | Select Name, Id
+    Get-VMSwitch |
+    Select-Object -First 1 |
+    Select-Object Name, Id
 }
 
-function Mount-VMISO {
+function Mount-VMISO 
+{
     [cmdletbinding()]
     param($Id, $Path)
 
+<<<<<<< HEAD
+    set-VMDvdDrive -VMName (Get-VM -Id $Id).Name -Path $Path
+=======
     set-VMDvdDrive -VMName (get-vm -id $Id).Name -Path $Path
 
-}
+>>>>>>> brantb/dynamic-memory
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-hyperv
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Hyper-V Driver for Test-Kitchen