vagrant-unbundled 1.8.1.2 → 1.8.4.1

data/plugins/providers/docker/errors.rb

@@ -13,6 +13,10 @@ module VagrantPlugins
         error_key(:execute_error)
       end
 
+      class ExecCommandRequired < DockerError
+        error_key(:exec_command_required)
+      end
+
       class HostVMCommunicatorNotReady < DockerError
         error_key(:host_vm_communicator_not_ready)
       end

data/plugins/providers/docker/plugin.rb

@@ -22,6 +22,12 @@ module VagrantPlugins
         Provider
       end
 
+      command("docker-exec", primary: false) do
+        require_relative "command/exec"
+        init!
+        Command::Exec
+      end
+
       command("docker-logs", primary: false) do
         require_relative "command/logs"
         init!

data/plugins/providers/docker/provider.rb

@@ -128,8 +128,7 @@ module VagrantPlugins
       # rather than directly on our system. Docker needs to run in a VM
       # when we're not on Linux, or not on a Linux that supports Docker.
       def host_vm?
-        @machine.provider_config.force_host_vm ||
-          !Vagrant::Util::Platform.linux?
+        @machine.provider_config.force_host_vm
       end
 
       # Returns the SSH info for accessing the Container.

data/plugins/providers/hyperv/action.rb

@@ -106,7 +106,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use Call, IsState, :running do |env1, b1|
             if env1[:result]
-              b1.use Message, I18n.t("vagrant_hyperv.message_already_running")
+              b1.use action_provision
               next
             end
 
@@ -207,6 +207,58 @@ module VagrantPlugins
         end
       end
 
+      def self.action_snapshot_delete
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsState, :not_created do |env, b2|
+            if env[:result]
+              b2.use Message, I18n.t("vagrant_hyperv.message_not_created")
+              next
+            end
+
+            b2.use SnapshotDelete
+
+          end
+        end
+      end
+
+      def self.action_snapshot_restore
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsState, :not_created do |env, b2|
+            if env[:result]
+              b2.use Message, I18n.t("vagrant_hyperv.message_not_created")
+              next
+            end
+
+            b2.use action_halt
+            b2.use SnapshotRestore
+
+            b2.use Call, IsEnvSet, :snapshot_delete do |env2, b3|
+              if env2[:result]
+                b3.use action_snapshot_delete
+              end
+            end
+
+            b2.use action_start
+
+          end
+        end
+      end
+
+      def self.action_snapshot_save
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsState, :not_created do |env, b2|
+            if env[:result]
+              b2.use Message, I18n.t("vagrant_hyperv.message_not_created")
+              next
+            end
+            b2.use SnapshotSave
+          end
+        end
+      end
+
       # The autoload farm
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :CheckEnabled, action_root.join("check_enabled")
@@ -222,6 +274,9 @@ module VagrantPlugins
       autoload :NetSetVLan, action_root.join("net_set_vlan")
       autoload :NetSetMac, action_root.join("net_set_mac")
       autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")
+      autoload :SnapshotDelete, action_root.join("snapshot_delete")
+      autoload :SnapshotRestore, action_root.join("snapshot_restore")
+      autoload :SnapshotSave, action_root.join("snapshot_save")
     end
   end
 end

data/plugins/providers/hyperv/action/import.rb

@@ -18,11 +18,13 @@ module VagrantPlugins
           maxmemory = env[:machine].provider_config.maxmemory
           cpus = env[:machine].provider_config.cpus
           vmname = env[:machine].provider_config.vmname
+          differencing_disk = env[:machine].provider_config.differencing_disk
 
-          env[:ui].output("Configured Dynamical memory allocation, maxmemory is #{maxmemory}") if maxmemory
+          env[:ui].output("Configured Dynamic memory allocation, maxmemory is #{maxmemory}") if maxmemory
           env[:ui].output("Configured startup memory is #{memory}") if memory
           env[:ui].output("Configured cpus number is #{cpus}") if cpus
           env[:ui].output("Configured vmname is #{vmname}") if vmname
+          env[:ui].output("Configured differencing disk instead of cloning") if differencing_disk
 
           if !vm_dir.directory? || !hd_dir.directory?
             raise Errors::BoxInvalid
@@ -38,10 +40,12 @@ module VagrantPlugins
 
           image_path = nil
           image_ext = nil
+          image_filename = nil
           hd_dir.each_child do |f|
             if %w{.vhd .vhdx}.include?(f.extname.downcase)
               image_path = f
               image_ext = f.extname.downcase
+              image_filename = File.basename(f,image_ext)
               break
             end
           end
@@ -92,8 +96,12 @@ module VagrantPlugins
 
           env[:ui].detail("Cloning virtual hard drive...")
           source_path = image_path.to_s
-          dest_path   = env[:machine].data_dir.join("disk#{image_ext}").to_s
-          FileUtils.cp(source_path, dest_path)
+          dest_path   = env[:machine].data_dir.join("#{image_filename}#{image_ext}").to_s
+          if differencing_disk
+            env[:machine].provider.driver.execute("clone_vhd.ps1", {Source: source_path, Destination: dest_path})
+          else
+            FileUtils.cp(source_path, dest_path)
+          end
           image_path = dest_path
 
           # We have to normalize the paths to be Windows paths since
@@ -103,10 +111,10 @@ module VagrantPlugins
             image_path:      image_path.to_s.gsub("/", "\\")
           }
           options[:switchname] = switch if switch
-          options[:memory] = memory if memory 
+          options[:memory] = memory if memory
           options[:maxmemory] = maxmemory if maxmemory
           options[:cpus] = cpus if cpus
-          options[:vmname] = vmname if vmname 
+          options[:vmname] = vmname if vmname
 
           env[:ui].detail("Creating and registering the VM...")
           server = env[:machine].provider.driver.import(options)

data/plugins/providers/hyperv/action/snapshot_delete.rb

@@ -0,0 +1,27 @@
+module VagrantPlugins
+  module HyperV
+    module Action
+      class SnapshotDelete
+        def initialize(app, env)
+          @app    = app
+        end
+
+        def call(env)
+
+          env[:ui].info(I18n.t(
+            "vagrant.actions.vm.snapshot.deleting",
+            name: env[:snapshot_name]))
+
+          env[:machine].provider.driver.delete_snapshot(env[:snapshot_name])
+
+          env[:ui].success(I18n.t(
+            "vagrant.actions.vm.snapshot.deleted",
+            name: env[:snapshot_name]))
+
+          @app.call(env)
+
+        end
+      end
+    end
+  end
+end

data/plugins/providers/hyperv/action/snapshot_restore.rb

@@ -0,0 +1,23 @@
+module VagrantPlugins
+  module HyperV
+    module Action
+      class SnapshotRestore
+        def initialize(app, env)
+          @app    = app
+        end
+
+        def call(env)
+
+          env[:ui].info(I18n.t(
+            "vagrant.actions.vm.snapshot.restoring",
+            name: env[:snapshot_name]))
+
+          env[:machine].provider.driver.restore_snapshot(env[:snapshot_name])
+
+          @app.call(env)
+
+        end
+      end
+    end
+  end
+end

data/plugins/providers/hyperv/action/snapshot_save.rb

@@ -0,0 +1,27 @@
+module VagrantPlugins
+  module HyperV
+    module Action
+      class SnapshotSave
+        def initialize(app, env)
+          @app    = app
+        end
+
+        def call(env)
+
+          env[:ui].info(I18n.t(
+            "vagrant.actions.vm.snapshot.saving",
+            name: env[:snapshot_name]))
+
+          env[:machine].provider.driver.create_snapshot(env[:snapshot_name])
+
+          env[:ui].success(I18n.t(
+            "vagrant.actions.vm.snapshot.saved",
+            name: env[:snapshot_name]))
+
+          @app.call(env)
+
+        end
+      end
+    end
+  end
+end

data/plugins/providers/hyperv/cap/snapshot_list.rb

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module HyperV
+    module Cap
+      module SnapshotList
+        def self.snapshot_list(machine)
+          machine.provider.driver.list_snapshots
+        end
+      end
+    end
+  end
+end

data/plugins/providers/hyperv/config.rb

@@ -3,7 +3,7 @@ require "vagrant"
 module VagrantPlugins
   module HyperV
     class Config < Vagrant.plugin("2", :config)
-      
+
       attr_accessor :ip_address_timeout # Time to wait for an IP address when booting, in seconds @return [Integer]
       attr_accessor :memory #  Memory size in mb @return [Integer]
       attr_accessor :maxmemory # Maximal memory size in mb enables dynamical memory allocation @return [Integer]
@@ -11,6 +11,7 @@ module VagrantPlugins
       attr_accessor :vmname # Name that will be shoen in Hyperv Manager @return [String]
       attr_accessor :vlan_id # VLAN ID for network interface for the virtual machine. @return [Integer]
       attr_accessor :mac # MAC address for network interface for the virtual machine. @return [String]
+      attr_accessor :differencing_disk # Create differencing disk instead of cloning whole VHD [Boolean]
 
       def initialize
         @ip_address_timeout = UNSET_VALUE
@@ -20,6 +21,7 @@ module VagrantPlugins
         @vmname = UNSET_VALUE
         @vlan_id  = UNSET_VALUE
         @mac  = UNSET_VALUE
+        @differencing_disk = UNSET_VALUE
       end
 
       def finalize!
@@ -28,10 +30,11 @@ module VagrantPlugins
         end
         @memory = nil if @memory == UNSET_VALUE
         @maxmemory = nil if @maxmemory == UNSET_VALUE
-        @cpus = nil if @cpus == UNSET_VALUE 
+        @cpus = nil if @cpus == UNSET_VALUE
         @vmname = nil if @vmname == UNSET_VALUE
         @vlan_id = nil if @vlan_id == UNSET_VALUE
         @mac = nil if @mac == UNSET_VALUE
+        @differencing_disk = false if @differencing_disk == UNSET_VALUE
       end
 
       def validate(machine)

data/plugins/providers/hyperv/driver.rb

@@ -84,7 +84,24 @@ module VagrantPlugins
        def net_set_mac(mac_addr)
           execute("set_network_mac.ps1", { VmId: vm_id, Mac: mac_addr })
        end
-       
+
+       def create_snapshot(snapshot_name)
+          execute("create_snapshot.ps1", { VmId: vm_id, SnapName: (snapshot_name) } )
+       end
+
+       def restore_snapshot(snapshot_name)
+          execute("restore_snapshot.ps1", { VmId: vm_id,  SnapName: (snapshot_name) } )
+       end
+
+       def list_snapshots()
+          snaps = execute("list_snapshots.ps1", { VmID: vm_id } )
+          snaps.map { |s| s['Name'] }
+       end
+
+       def delete_snapshot(snapshot_name)
+          execute("delete_snapshot.ps1", {VmID: vm_id, SnapName: snapshot_name})
+       end
+
       protected
 
       def execute_powershell(path, options, &block)

data/plugins/providers/hyperv/plugin.rb

@@ -27,6 +27,11 @@ module VagrantPlugins
         Cap::PublicAddress
       end
 
+      provider_capability("hyperv", "snapshot_list") do
+        require_relative "cap/snapshot_list"
+        Cap::SnapshotList
+      end
+
       protected
 
       def self.init!

data/plugins/providers/hyperv/scripts/clone_vhd.ps1

@@ -0,0 +1,9 @@
+Param(
+    [Parameter(Mandatory=$true)]
+    [string]$Source,
+
+    [Parameter(Mandatory=$true)]
+    [string]$Destination
+)
+
+New-VHD -Path $Destination -ParentPath $Source -ErrorAction Stop

data/plugins/providers/hyperv/scripts/create_snapshot.ps1

@@ -0,0 +1,8 @@
+Param(
+    [Parameter(Mandatory=$true)]
+    [string]$VmId,
+    [string]$SnapName
+)
+
+$VM = Get-VM -Id $VmId -ErrorAction "Stop"
+Checkpoint-VM $VM -SnapshotName $SnapName 

data/plugins/providers/hyperv/scripts/delete_snapshot.ps1

@@ -0,0 +1,8 @@
+Param(
+    [Parameter(Mandatory=$true)]
+    [string]$VmId,
+    [string]$SnapName
+)
+
+$VM = Get-VM -Id $VmId -ErrorAction "Stop"
+Remove-VMSnapshot $VM -Name $SnapName 

data/plugins/providers/hyperv/scripts/get_vm_status.ps1

@@ -7,12 +7,18 @@ Param(
 $Dir = Split-Path $script:MyInvocation.MyCommand.Path
 . ([System.IO.Path]::Combine($Dir, "utils\write_messages.ps1"))
 
-# Get the VM with the given name
+
+if($PSVersionTable.PSVersion.Major -le 4) {
+  $ExceptionType = [Microsoft.HyperV.PowerShell.VirtualizationOperationFailedException]
+} else {
+  $ExceptionType = [Microsoft.HyperV.PowerShell.VirtualizationException]
+}
+
 try {
     $VM = Get-VM -Id $VmId -ErrorAction "Stop"
     $State = $VM.state
     $Status = $VM.status
-} catch [Microsoft.HyperV.PowerShell.VirtualizationException] {
+} catch $ExceptionType {
     $State = "not_created"
     $Status = $State
 }

data/plugins/providers/hyperv/scripts/import_vm.ps1

@@ -107,7 +107,6 @@ $secure_boot_enabled = (Select-Xml -xml $vmconfig -XPath "//secure_boot_enabled"
 
 $vm_params = @{
     Name = $vm_name
-    Generation = $generation
     NoVHD = $True
     MemoryStartupBytes = $MemoryStartupBytes
     SwitchName = $switchname
@@ -115,6 +114,11 @@ $vm_params = @{
     ErrorAction = "Stop"
 }
 
+# Generation parameter was added in ps v4
+if((get-command New-VM).Parameters.Keys.Contains("generation")) {
+    $vm_params.Generation = $generation
+}
+
 # Create the VM using the values in the hash map
 
 $vm = New-VM @vm_params

data/plugins/providers/hyperv/scripts/list_snapshots.ps1

@@ -0,0 +1,12 @@
+Param(
+    [Parameter(Mandatory=$true)]
+    [string]$VmId
+)
+
+$VM = Get-VM -Id $VmId -ErrorAction "Stop"
+$Snapshots = @(Get-VMSnapshot $VM | Select-Object Name)
+$result = ConvertTo-json $Snapshots
+
+Write-Host "===Begin-Output==="
+Write-Host $result
+Write-Host "===End-Output==="

data/plugins/providers/hyperv/scripts/restore_snapshot.ps1

@@ -0,0 +1,8 @@
+Param(
+    [Parameter(Mandatory=$true)]
+    [string]$VmId,
+    [string]$SnapName
+)
+
+$VM = Get-VM -Id $VmId -ErrorAction "Stop"
+Restore-VMSnapshot $VM -Name $SnapName -Confirm:$false

data/plugins/providers/virtualbox/action.rb

@@ -33,6 +33,8 @@ module VagrantPlugins
       autoload :Network, File.expand_path("../action/network", __FILE__)
       autoload :NetworkFixIPv6, File.expand_path("../action/network_fix_ipv6", __FILE__)
       autoload :Package, File.expand_path("../action/package", __FILE__)
+      autoload :PackageSetupFiles, File.expand_path("../action/package_setup_files", __FILE__)
+      autoload :PackageSetupFolders, File.expand_path("../action/package_setup_folders", __FILE__)
       autoload :PackageVagrantfile, File.expand_path("../action/package_vagrantfile", __FILE__)
       autoload :PrepareCloneSnapshot, File.expand_path("../action/prepare_clone_snapshot", __FILE__)
       autoload :PrepareNFSSettings, File.expand_path("../action/prepare_nfs_settings", __FILE__)
@@ -41,12 +43,14 @@ module VagrantPlugins
       autoload :Resume, File.expand_path("../action/resume", __FILE__)
       autoload :SaneDefaults, File.expand_path("../action/sane_defaults", __FILE__)
       autoload :SetName, File.expand_path("../action/set_name", __FILE__)
-      autoload :SetupPackageFiles, File.expand_path("../action/setup_package_files", __FILE__)
       autoload :SnapshotDelete, File.expand_path("../action/snapshot_delete", __FILE__)
       autoload :SnapshotRestore, File.expand_path("../action/snapshot_restore", __FILE__)
       autoload :SnapshotSave, File.expand_path("../action/snapshot_save", __FILE__)
       autoload :Suspend, File.expand_path("../action/suspend", __FILE__)
 
+      # @deprecated use {PackageSetupFiles} instead
+      autoload :SetupPackageFiles, File.expand_path("../action/setup_package_files", __FILE__)
+
       # Include the built-in modules so that we can use them as top-level
       # things.
       include Vagrant::Action::Builtin
@@ -150,7 +154,8 @@ module VagrantPlugins
               next
             end
 
-            b2.use SetupPackageFiles
+            b2.use PackageSetupFolders
+            b2.use PackageSetupFiles
             b2.use CheckAccessible
             b2.use action_halt
             b2.use ClearForwardedPorts
@@ -310,9 +315,9 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use BoxCheckOutdated
           b.use Call, IsRunning do |env, b2|
-            # If the VM is running, then our work here is done, exit
+            # If the VM is running, run the necessary provisioners
             if env[:result]
-              b2.use MessageAlreadyRunning
+              b2.use action_provision
               next
             end