kitchen-hyperv 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1487a387bfe733bc51dbb0e2e791df21f3cbba4
-  data.tar.gz: 7bccbbc392b003eb4e829b53244c8bc5669384bf
+  metadata.gz: bc2c3434848b858549e45714e5828f52182159f5
+  data.tar.gz: 79cb0919ca938194aca1446c14fa899a01b4a141
 SHA512:
-  metadata.gz: a966a187860dfb50208b282938aac5193300e8410b56faa5cf97caedbd9eda08c8a846b24d4a7f0a6b55da87cc27c12ce24c6c7bbdcbaf85053d7b96f61bf3ad
-  data.tar.gz: c7717e133cabc5a5852b5bbf5d9963b71059d25574c404554bccc17c5e4069b1d7fbbb97f8a0ae9da9396645cc38a01d7985a12dbc4cc4ed4bbafabb4e848f38
+  metadata.gz: c67ce7d0ce7789ccfea65bc7cff15552cde8bc8f6902d2845e36ed0748d56756147ba869f76de36b3a0df8261e9e282c0395a88724119b3c3aca1d6992bc8333
+  data.tar.gz: 2ed67e5ae88901c540d6371670b8dea20df6cf1a093af90ba26de0431b9b47046d15ae1795d6275487e6f89fba009b8e8c7fb3c8b5037f35473ddb2b04bf2b9d

data/.cane

@@ -1,2 +1,2 @@
---no-doc
+--no-doc
 --style-measure 100

data/.gitignore

@@ -1,15 +1,15 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-*.gem
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+*.gem

data/CHANGELOG.md

@@ -1,93 +1,93 @@
-# Change Log
-
-## [v0.3.0](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.3.0) (2016-11-28)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.2.3...v0.3.0)
-
-**Merged pull requests:**
-
-- Support setting VM notes [\#39](https://github.com/test-kitchen/kitchen-hyperv/pull/39) ([watsonlu](https://github.com/watsonlu))
-- Fix mounting iso on Gen 2 VM [\#38](https://github.com/test-kitchen/kitchen-hyperv/pull/38) ([mahsoud](https://github.com/mahsoud))
-- Adding support for HyperV Guest Interface Services [\#34](https://github.com/test-kitchen/kitchen-hyperv/pull/34) ([gaelcolas](https://github.com/gaelcolas))
-- Fix line continuation syntax [\#32](https://github.com/test-kitchen/kitchen-hyperv/pull/32) ([brantb](https://github.com/brantb))
-
-## [v0.2.3](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.2.3) (2016-06-10)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.2.2...v0.2.3)
-
-**Merged pull requests:**
-
-- Support PowerShell v5.1 on the Insider Preview - updated [\#31](https://github.com/test-kitchen/kitchen-hyperv/pull/31) ([smurawski](https://github.com/smurawski))
-
-## [v0.2.2](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.2.2) (2016-06-10)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.2.1...v0.2.2)
-
-**Merged pull requests:**
-
-- Support PowerShell v5.1 on the Insider Preview [\#30](https://github.com/test-kitchen/kitchen-hyperv/pull/30) ([smurawski](https://github.com/smurawski))
-
-## [v0.2.1](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.2.1) (2016-05-25)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.20...v0.2.1)
-
-## [v0.1.20](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.20) (2016-05-17)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.10...v0.1.20)
-
-**Merged pull requests:**
-
-- More Configurable VM Networking [\#27](https://github.com/test-kitchen/kitchen-hyperv/pull/27) ([svmastersamurai](https://github.com/svmastersamurai))
-- Add -noprofile to powershell executions to prevent users' custom prof… [\#23](https://github.com/test-kitchen/kitchen-hyperv/pull/23) ([kriszentner](https://github.com/kriszentner))
-
-## [v0.1.10](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.10) (2015-12-03)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.9...v0.1.10)
-
-**Merged pull requests:**
-
-- update incorrect module name [\#21](https://github.com/test-kitchen/kitchen-hyperv/pull/21) ([jbruettcva](https://github.com/jbruettcva))
-
-## [v0.1.9](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.9) (2015-12-03)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.8...v0.1.9)
-
-## [v0.1.8](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.8) (2015-12-03)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.7...v0.1.8)
-
-**Merged pull requests:**
-
-- Updating readme.md to include image configuration, specifically winrm… [\#20](https://github.com/test-kitchen/kitchen-hyperv/pull/20) ([jbruettcva](https://github.com/jbruettcva))
-- Hyper-V module and Get-VMIP delay fix [\#19](https://github.com/test-kitchen/kitchen-hyperv/pull/19) ([jbruettcva](https://github.com/jbruettcva))
-- File copy feature [\#17](https://github.com/test-kitchen/kitchen-hyperv/pull/17) ([dpiessens](https://github.com/dpiessens))
-- Fixed NilClass exception if VM does not exist [\#16](https://github.com/test-kitchen/kitchen-hyperv/pull/16) ([dpiessens](https://github.com/dpiessens))
-- Add support for dynamic memory [\#15](https://github.com/test-kitchen/kitchen-hyperv/pull/15) ([brantb](https://github.com/brantb))
-
-## [v0.1.7](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.7) (2015-07-14)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.6...v0.1.7)
-
-**Merged pull requests:**
-
-- 64-bit windows support [\#8](https://github.com/test-kitchen/kitchen-hyperv/pull/8) ([ksubrama](https://github.com/ksubrama))
-
-## [v0.1.6](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.6) (2015-06-25)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.5...v0.1.6)
-
-## [v0.1.5](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.5) (2015-06-24)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.2...v0.1.5)
-
-**Merged pull requests:**
-
-- Adding support for mounting ISOs [\#6](https://github.com/test-kitchen/kitchen-hyperv/pull/6) ([smurawski](https://github.com/smurawski))
-
-## [v0.1.2](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.2) (2015-05-20)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.1...v0.1.2)
-
-**Merged pull requests:**
-
-- Smurawski/updating metadata [\#4](https://github.com/test-kitchen/kitchen-hyperv/pull/4) ([smurawski](https://github.com/smurawski))
-
-## [v0.1.1](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.1) (2015-05-20)
-[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.0...v0.1.1)
-
-## [v0.1.0](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.0) (2015-05-20)
-**Merged pull requests:**
-
-- Prepping for release [\#3](https://github.com/test-kitchen/kitchen-hyperv/pull/3) ([smurawski](https://github.com/smurawski))
-
-
-
+# Change Log
+
+## [v0.3.0](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.3.0) (2016-11-28)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.2.3...v0.3.0)
+
+**Merged pull requests:**
+
+- Support setting VM notes [\#39](https://github.com/test-kitchen/kitchen-hyperv/pull/39) ([watsonlu](https://github.com/watsonlu))
+- Fix mounting iso on Gen 2 VM [\#38](https://github.com/test-kitchen/kitchen-hyperv/pull/38) ([mahsoud](https://github.com/mahsoud))
+- Adding support for HyperV Guest Interface Services [\#34](https://github.com/test-kitchen/kitchen-hyperv/pull/34) ([gaelcolas](https://github.com/gaelcolas))
+- Fix line continuation syntax [\#32](https://github.com/test-kitchen/kitchen-hyperv/pull/32) ([brantb](https://github.com/brantb))
+
+## [v0.2.3](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.2.3) (2016-06-10)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.2.2...v0.2.3)
+
+**Merged pull requests:**
+
+- Support PowerShell v5.1 on the Insider Preview - updated [\#31](https://github.com/test-kitchen/kitchen-hyperv/pull/31) ([smurawski](https://github.com/smurawski))
+
+## [v0.2.2](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.2.2) (2016-06-10)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.2.1...v0.2.2)
+
+**Merged pull requests:**
+
+- Support PowerShell v5.1 on the Insider Preview [\#30](https://github.com/test-kitchen/kitchen-hyperv/pull/30) ([smurawski](https://github.com/smurawski))
+
+## [v0.2.1](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.2.1) (2016-05-25)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.20...v0.2.1)
+
+## [v0.1.20](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.20) (2016-05-17)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.10...v0.1.20)
+
+**Merged pull requests:**
+
+- More Configurable VM Networking [\#27](https://github.com/test-kitchen/kitchen-hyperv/pull/27) ([svmastersamurai](https://github.com/svmastersamurai))
+- Add -noprofile to powershell executions to prevent users' custom prof… [\#23](https://github.com/test-kitchen/kitchen-hyperv/pull/23) ([kriszentner](https://github.com/kriszentner))
+
+## [v0.1.10](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.10) (2015-12-03)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.9...v0.1.10)
+
+**Merged pull requests:**
+
+- update incorrect module name [\#21](https://github.com/test-kitchen/kitchen-hyperv/pull/21) ([jbruettcva](https://github.com/jbruettcva))
+
+## [v0.1.9](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.9) (2015-12-03)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.8...v0.1.9)
+
+## [v0.1.8](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.8) (2015-12-03)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.7...v0.1.8)
+
+**Merged pull requests:**
+
+- Updating readme.md to include image configuration, specifically winrm… [\#20](https://github.com/test-kitchen/kitchen-hyperv/pull/20) ([jbruettcva](https://github.com/jbruettcva))
+- Hyper-V module and Get-VMIP delay fix [\#19](https://github.com/test-kitchen/kitchen-hyperv/pull/19) ([jbruettcva](https://github.com/jbruettcva))
+- File copy feature [\#17](https://github.com/test-kitchen/kitchen-hyperv/pull/17) ([dpiessens](https://github.com/dpiessens))
+- Fixed NilClass exception if VM does not exist [\#16](https://github.com/test-kitchen/kitchen-hyperv/pull/16) ([dpiessens](https://github.com/dpiessens))
+- Add support for dynamic memory [\#15](https://github.com/test-kitchen/kitchen-hyperv/pull/15) ([brantb](https://github.com/brantb))
+
+## [v0.1.7](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.7) (2015-07-14)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.6...v0.1.7)
+
+**Merged pull requests:**
+
+- 64-bit windows support [\#8](https://github.com/test-kitchen/kitchen-hyperv/pull/8) ([ksubrama](https://github.com/ksubrama))
+
+## [v0.1.6](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.6) (2015-06-25)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.5...v0.1.6)
+
+## [v0.1.5](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.5) (2015-06-24)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.2...v0.1.5)
+
+**Merged pull requests:**
+
+- Adding support for mounting ISOs [\#6](https://github.com/test-kitchen/kitchen-hyperv/pull/6) ([smurawski](https://github.com/smurawski))
+
+## [v0.1.2](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.2) (2015-05-20)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.1...v0.1.2)
+
+**Merged pull requests:**
+
+- Smurawski/updating metadata [\#4](https://github.com/test-kitchen/kitchen-hyperv/pull/4) ([smurawski](https://github.com/smurawski))
+
+## [v0.1.1](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.1) (2015-05-20)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.0...v0.1.1)
+
+## [v0.1.0](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.0) (2015-05-20)
+**Merged pull requests:**
+
+- Prepping for release [\#3](https://github.com/test-kitchen/kitchen-hyperv/pull/3) ([smurawski](https://github.com/smurawski))
+
+
+
 \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2015 Steven Murawski
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2015 Steven Murawski
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -47,30 +47,67 @@ driver:
   * A list of DNS Servers that can be reached on the virtual network.
 * vm_switch
   * The virtual switch to attach the guest VMs.  Defaults to the first switch returned from Get-VMSwitch.
+* vm_vlan_id
+  * The VLAN ID to assign the virtual network adapter on the VM (Valid values: 1-4094).  Defaults to untagged.
 * iso_path
   * Path on the host to the ISO to mount on the VMs.
 * boot_iso_path
   * Path on the host to the ISO to mount before starting the VMs.
 * vm_generation
   * The generation for the hyper-v VM.  Defaults to 1.
+* disable_secureboot
+  * Boolean.  If true, will disable secure boot for the VM.  Only applies if `vm_generation=2`.  Defaults to false.
 * enable_guest_services
   * Enable the Hyper-V Integration Guest services for the VM before starting it. Hyper-V defauls is false (true|false)
 * disk_type
   * The type of virtual disk to create, .VHD or .VHDX.  Defaults to the file extension of the parent virtual hard drive.
+* resize_vhd
+  * Resize the disk to the specified size. Leave empty to keep the original size. Only works on newly created VM's. Defaults to empty.
+* additional_disks
+  * An array of hashes (`name`,`size_gb`, and `type`) of additional disks to attach to the VM.
+  * **Required parameters:**
+    * name
+      * Unique name for the virtual disk.
+  * **Optional parameters:**
+    * size_gb
+      * Integer. If not provided, will default to 5.
+    * type
+      * The type of virtual disk to create, .VHD or .VHDX.  Defaults to the file extension of the parent virtual hard drive.
+  * Example: 
+  
+```yaml
+driver:
+  name: hyperv
+  parent_vhd_folder: 'D:\Hyper-V\Virtual Hard Disks'
+  parent_vhd_name: tk_test.vhdx
+  additional_disks:
+    - name: disk1
+      size_gb: 10
+    - name: disk2
+      size_gb: 50
+      type: .VHD
+```
 * vm_note
   * A note to add to the VM's note field. Defaults to empty.
+* copy_vm_files
+  * An array of hashes (`source` and `dest`) of files or directories to copy over to the sytem under test.
+  * example: 
+  
+```
+driver:
+  name: hyperv
+  copy_vm_files:
+    - source: c:/users/steven/downloads/chef-client-12.19.36-1-x64.msi
+      dest: c:/users/administrator/appdata/local/temp/chef-client-12.19.36-1-x64.msi
+```
+
 
 ## 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.
+ 
+* Guest VMs should have the latest Integration Components installed.  See https://support.microsoft.com/en-us/help/3063109/hyper-v-integration-components-update-for-windows-virtual-machines-that-are-running-on-a-windows-10-based-host
 
-#### 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/Rakefile

@@ -21,36 +21,7 @@ task :stats do
   sh "countloc -r spec"
 end
 
-require "finstyle"
-require "rubocop/rake_task"
-RuboCop::RakeTask.new(:style) do |task|
-  task.options << "--display-cop-names"
-  task.options << "--lint"
-  task.options << '--config' << '.rubocop.yml'
-  task.patterns = ['lib/**/*.rb']
-end
-
-require "cane/rake_task"
-desc "Run cane to check quality metrics"
-Cane::RakeTask.new do |cane|
-  cane.canefile = "./.cane"
-end
-
-desc "Run all quality tasks"
-task :quality => [:cane, :style, :stats]
-
-require "yard"
-YARD::Rake::YardocTask.new
-
-desc "Generate gem dependency graph"
-task :viz do
-  Bundler.with_clean_env do
-    sh "bundle viz --without test development guard " \
-      "--requirements --version"
-  end
-end
-
-task :default => [:test, :quality]
+task :default => [:test]
 
 begin
   require "github_changelog_generator/task"

data/lib/kitchen/driver/hyperv.rb

@@ -46,11 +46,14 @@ module Kitchen
       default_config :dns_servers
       default_config :subnet, '255.255.255.0'
       default_config :vm_switch
+      default_config :vm_vlan_id
       default_config :iso_path
       default_config :boot_iso_path
       default_config :enable_guest_services
       default_config :vm_note
+      default_config :resize_vhd
       default_config :vm_generation, 1
+      default_config :disable_secureboot, false
       default_config :disk_type do |driver|
         File.extname(driver[:parent_vhd_name])
       end
@@ -61,6 +64,7 @@ module Kitchen
         @state = state
         validate_vm_settings
         create_new_differencing_disk
+        create_additional_disks
         create_virtual_machine
         set_virtual_machine_note
         update_state
@@ -76,6 +80,7 @@ module Kitchen
         instance.transport.connection(state).close
         remove_virtual_machine
         remove_differencing_disk
+        remove_additional_disks
         info("The Hyper-V instance #{instance.to_str} has been removed.")
         state.delete(:id)
       end
@@ -95,6 +100,15 @@ module Kitchen
           raise warning unless memory_valid
         end
         config[:vm_switch] = vm_switch
+        if config[:vm_vlan_id]
+          vm_vlan_id = config[:vm_vlan_id]
+          vm_vlan_id_min = 1
+          vm_vlan_id_max = 4094
+          vm_vlan_id_valid = vm_vlan_id.between?(vm_vlan_id_min, vm_vlan_id_max)
+          vm_vlan_id_warning = "vm_vlan_id (#{vm_vlan_id}) must be a valid 802.1Q" \
+                               " VLAN ID between (#{vm_vlan_id_min}-#{vm_vlan_id_max})"
+          raise vm_vlan_id_warning unless vm_vlan_id_valid
+        end
       end
 
       def create_new_differencing_disk
@@ -102,6 +116,23 @@ module Kitchen
         info("Creating differencing disk for #{instance.name}.")
         run_ps new_differencing_disk_ps
         info("Created differencing disk for #{instance.name}.")
+        set_new_vhd_size
+      end
+
+      def create_additional_disks
+        return if config[:additional_disks].nil?
+        @additional_disk_objects = []
+        config[:additional_disks].each do |additional_disk|
+          raise "Missing name for additional disk" unless additional_disk[:name]
+          disk_type = additional_disk[:type] || config[:disk_type]
+          disk_path = additional_disk_path(additional_disk[:name], disk_type)
+          raise "Additional disk file already exists: #{disk_path}" unless !File.exist?(disk_path)
+          disk_size = additional_disk[:size_gb] || 5
+          info("Creating additional disk #{additional_disk[:name]} for #{instance.name}.")
+          run_ps new_additional_disk_ps(disk_path, disk_size)
+          info("Created additional disk #{additional_disk[:name]} for #{instance.name}.")
+          @additional_disk_objects.push(disk_path)
+        end
       end
 
       def vm_switch
@@ -140,6 +171,14 @@ module Kitchen
         run_ps mount_vm_iso
         info("Done mounting #{config[:iso_path]}")
       end
+
+      def set_new_vhd_size
+        return unless config[:resize_vhd]
+        info("Resizing differencing disk for #{instance.name}.")
+        run_ps resize_vhd
+        info("Resized differencing disk for #{instance.name}.")
+      end
+
       def set_virtual_machine_note
         return unless config[:vm_note]
         info("Adding note to VM: '#{config[:vm_note]}'")
@@ -176,6 +215,20 @@ module Kitchen
         info("Removed the differencing disk for #{instance.name}.")
       end
 
+      def remove_additional_disks
+        return if config[:additional_disks].nil?
+        config[:additional_disks].each do |additional_disk|
+          raise "Missing name for additional disk" unless additional_disk[:name]
+          disk_type = additional_disk[:type] || config[:disk_type]
+          disk_path = additional_disk_path(additional_disk[:name], disk_type)
+          if File.exist?(disk_path)
+            info("Removing additional disk #{additional_disk[:name]} for #{instance.name}.")
+            FileUtils.rm(disk_path)
+            info("Removed additional disk #{additional_disk[:name]} for #{instance.name}.")
+          end
+        end
+      end
+
       def kitchen_vm_path
         @kitchen_vm_path ||= File.join(config[:kitchen_root], ".kitchen/#{instance.name}")
       end
@@ -188,6 +241,10 @@ module Kitchen
         @differencing_disk_path ||= File.join(kitchen_vm_path, "diff" + "#{config[:disk_type]}")
       end
 
+      def additional_disk_path(disk_name, disk_type)
+        File.join(kitchen_vm_path, disk_name + disk_type)
+      end
+
       def parent_vhd_path
         @parent_vhd_path ||= File.join(config[:parent_vhd_folder], config[:parent_vhd_name])
       end