vagrant-unbundled 1.9.1.1 → 1.9.5.1

data/plugins/providers/docker/errors.rb

@@ -9,6 +9,22 @@ module VagrantPlugins
         error_key(:communicator_non_docker)
       end
 
+      class ComposeLockTimeoutError < DockerError
+        error_key(:compose_lock_timeout)
+      end
+
+      class ContainerNotRunningError < DockerError
+        error_key(:not_running)
+      end
+
+      class ContainerNotCreatedError < DockerError
+        error_key(:not_created)
+      end
+
+      class DockerComposeNotInstalledError < DockerError
+        error_key(:docker_compose_not_installed)
+      end
+
       class ExecuteError < DockerError
         error_key(:execute_error)
       end

data/plugins/providers/docker/provider.rb

@@ -31,11 +31,13 @@ module VagrantPlugins
 
       # Returns the driver instance for this provider.
       def driver
-        return @driver if @driver
-        @driver = Driver.new
-
-        # If we are running on a host machine, then we set the executor
-        # to execute remotely.
+        if !@driver
+          if @machine.provider_config.compose
+            @driver = Driver::Compose.new(@machine)
+          else
+            @driver = Driver.new
+          end
+        end
         if host_vm?
           @driver.executor = Executor::Vagrant.new(host_vm)
         end
@@ -136,16 +138,29 @@ module VagrantPlugins
         # If the container isn't running, we can't SSH into it
         return nil if state.id != :running
 
-        network = driver.inspect_container(@machine.id)['NetworkSettings']
-        ip      = network['IPAddress']
+        port_name = "#{@machine.config.ssh.guest_port}/tcp"
+        network   = driver.inspect_container(@machine.id)['NetworkSettings']
+
+        if network["Ports"][port_name].respond_to?(:first)
+          port_info = network["Ports"][port_name].first
+        else
+          ip = network["IpAddress"]
+          port = @machine.config.ssh.guest_port
+          if !ip.to_s.empty?
+            port_info = {
+              "HostIp" => ip,
+              "HostPort" => port
+            }
+          end
+        end
 
         # If we were not able to identify the container's IP, we return nil
         # here and we let Vagrant core deal with it ;)
-        return nil if !ip
+        return nil if port_info.nil? || port_info.empty?
 
         {
-          host: ip,
-          port: @machine.config.ssh.guest_port
+          host: port_info['HostIp'],
+          port: port_info['HostPort']
         }
       end
 

data/plugins/providers/hyperv/action.rb

@@ -64,6 +64,28 @@ module VagrantPlugins
         end
       end
 
+      # This action packages the virtual machine into a single box file.
+      def self.action_package
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use CheckEnabled
+          b.use Call, IsState, :not_created do |env1, b2|
+            if env1[:result]
+              b2.use Message, I18n.t("vagrant_hyperv.message_not_created")
+              next
+            end
+
+            b2.use PackageSetupFolders
+            b2.use PackageSetupFiles
+            b2.use action_halt
+            b2.use SyncedFolderCleanup
+            b2.use Package
+            b2.use PackageVagrantfile
+            b2.use PackageMetadataJson
+            b2.use Export
+          end
+        end
+      end
+
       def self.action_provision
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
@@ -156,14 +178,12 @@ module VagrantPlugins
           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
+              raise Vagrant::Errors::VMNotCreatedError
             end
 
             b2.use Call, IsState, :running do |env1, b3|
               if !env1[:result]
-                b3.use Message, I18n.t("vagrant_hyperv.message_not_running")
-                next
+                raise Vagrant::Errors::VMNotRunningError
               end
 
               b3.use SSHExec
@@ -177,14 +197,12 @@ module VagrantPlugins
           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
+              raise Vagrant::Errors::VMNotCreatedError
             end
 
             b2.use Call, IsState, :running do |env1, b3|
               if !env1[:result]
-                b3.use Message, I18n.t("vagrant_hyperv.message_not_running")
-                next
+                raise Vagrant::Errors::VMNotRunningError
               end
 
               b3.use SSHRun
@@ -261,9 +279,16 @@ module VagrantPlugins
 
       # The autoload farm
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
+      autoload :PackageSetupFolders, action_root.join("package_setup_folders")
+      autoload :PackageSetupFiles, action_root.join("package_setup_files")
+      autoload :PackageVagrantfile, action_root.join("package_vagrantfile")
+      autoload :PackageMetadataJson, action_root.join("package_metadata_json")
+      autoload :Export, action_root.join("export")
+
       autoload :CheckEnabled, action_root.join("check_enabled")
       autoload :DeleteVM, action_root.join("delete_vm")
       autoload :Import, action_root.join("import")
+      autoload :Package, action_root.join("package")
       autoload :IsWindows, action_root.join("is_windows")
       autoload :ReadState, action_root.join("read_state")
       autoload :ResumeVM, action_root.join("resume_vm")

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

@@ -0,0 +1,39 @@
+require "fileutils"
+
+module VagrantPlugins
+  module HyperV
+    module Action
+      class Export
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          @env = env
+
+          @env[:ui].info @env[:machine].state.id.to_s
+
+          raise Vagrant::Errors::VMPowerOffToPackage if
+            @env[:machine].state.id != :off
+
+          export
+
+          @app.call(env)
+        end
+
+        def export
+          @env[:ui].info I18n.t("vagrant.actions.vm.export.exporting")
+          @env[:machine].provider.driver.export(@env["export.temp_dir"]) do |progress|
+            @env[:ui].clear_line
+            @env[:ui].report_progress(progress.percent, 100, false)
+          end
+
+          # Clear the line a final time so the next data can appear
+          # alone on the line.
+          @env[:ui].clear_line
+        end
+
+      end
+    end
+  end
+end

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

@@ -21,10 +21,13 @@ module VagrantPlugins
           differencing_disk = env[:machine].provider_config.differencing_disk
           auto_start_action = env[:machine].provider_config.auto_start_action
           auto_stop_action = env[:machine].provider_config.auto_stop_action
+          enable_virtualization_extensions = env[:machine].provider_config.enable_virtualization_extensions
+          vm_integration_services = env[:machine].provider_config.vm_integration_services
 
           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 enable virtualization extensions is #{enable_virtualization_extensions}") if enable_virtualization_extensions
           env[:ui].output("Configured vmname is #{vmname}") if vmname
           env[:ui].output("Configured differencing disk instead of cloning") if differencing_disk
           env[:ui].output("Configured automatic start action is #{auto_start_action}") if auto_start_action
@@ -38,18 +41,18 @@ module VagrantPlugins
           config_type = nil
           vm_dir.each_child do |f|
             if f.extname.downcase == '.xml'
+              @logger.debug("Found XML config...")
               config_path = f
               config_type = 'xml'
               break
             end
           end
 
-          # Only check for .vmcx if there is no XML found to not
-          # risk breaking older vagrant boxes that added an XML
-          # file manually
-          if config_type == nil
+          vmcx_support = env[:machine].provider.driver.execute("has_vmcx_support.ps1", {})
+          if vmcx_support
             vm_dir.each_child do |f|
               if f.extname.downcase == '.vmcx'
+                @logger.debug("Found VMCX config and support...")
                 config_path = f
                 config_type = 'vmcx'
                 break
@@ -145,9 +148,25 @@ module VagrantPlugins
           options[:auto_start_action] = auto_start_action if auto_start_action
           options[:auto_stop_action] = auto_stop_action if auto_stop_action
           options[:differencing_disk] = differencing_disk if differencing_disk
+          options[:enable_virtualization_extensions] = "$True" if enable_virtualization_extensions and enable_virtualization_extensions == true
 
           env[:ui].detail("Creating and registering the VM...")
           server = env[:machine].provider.driver.import(options)
+
+          env[:ui].detail("Setting VM Integration Services")
+          vm_integration_services.each do |key, value|
+            state = false
+            if value === true
+              state = "enabled"
+            elsif value === false
+              state = "disabled"
+            end
+            env[:ui].output("#{key} is #{state}") if state
+          end
+
+          vm_integration_services[:VmId] = server["id"]
+          env[:machine].provider.driver.set_vm_integration_services(vm_integration_services)
+
           env[:ui].detail("Successfully imported a VM with name: #{server['name']}")
           env[:machine].id = server["id"]
           @app.call(env)

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

@@ -0,0 +1,16 @@
+require_relative "../../../../lib/vagrant/action/general/package"
+
+module VagrantPlugins
+  module HyperV
+    module Action
+      class Package < Vagrant::Action::General::Package
+        # Doing this so that we can test that the parent is properly
+        # called in the unit tests.
+        alias_method :general_call, :call
+        def call(env)
+          general_call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+require "json"
+
+#require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module HyperV
+    module Action
+      class PackageMetadataJson
+        # For TemplateRenderer
+        include Vagrant::Util
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          @env = env
+          create_metadata
+          @app.call(env)
+        end
+
+        # This method creates a metadata.json file to tell vagrant this is a
+        # Hyper V box
+        def create_metadata
+          File.open(File.join(@env["export.temp_dir"], "metadata.json"), "w") do |f|
+            f.write(JSON.generate({
+              provider: "hyperv"
+            }))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+require_relative "../../../../lib/vagrant/action/general/package_setup_files"
+
+module VagrantPlugins
+  module HyperV
+    module Action
+      class PackageSetupFiles < Vagrant::Action::General::PackageSetupFiles
+        # Doing this so that we can test that the parent is properly
+        # called in the unit tests.
+        alias_method :general_call, :call
+        def call(env)
+          general_call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require "fileutils"
+
+require_relative "../../../../lib/vagrant/action/general/package_setup_folders"
+
+module VagrantPlugins
+  module HyperV
+    module Action
+      class PackageSetupFolders < Vagrant::Action::General::PackageSetupFolders
+        # Doing this so that we can test that the parent is properly
+        # called in the unit tests.
+        alias_method :general_call, :call
+        def call(env)
+          general_call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module HyperV
+    module Action
+      class PackageVagrantfile
+        # For TemplateRenderer
+        include Vagrant::Util
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          @env = env
+          create_vagrantfile
+          @app.call(env)
+        end
+
+        # This method creates the auto-generated Vagrantfile at the root of the
+        # box. This Vagrantfile contains the MAC address so that the user doesn't
+        # have to worry about it.
+        def create_vagrantfile
+          File.open(File.join(@env["export.temp_dir"], "Vagrantfile"), "w") do |f|
+            mac_address = @env[:machine].provider.driver.read_mac_address
+            f.write(TemplateRenderer.render("package_Vagrantfile", {
+              base_mac: mac_address["mac"]
+            }))
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/providers/hyperv/config.rb

@@ -3,7 +3,6 @@ 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]
@@ -14,6 +13,8 @@ module VagrantPlugins
       attr_accessor :differencing_disk # Create differencing disk instead of cloning whole VHD [Boolean]
       attr_accessor :auto_start_action #action on automatic start of VM. Values: Nothing, StartIfRunning, Start
       attr_accessor :auto_stop_action #action on automatic stop of VM. Values: ShutDown, TurnOff, Save
+      attr_accessor :enable_virtualization_extensions # Enable virtualization extensions (nested virtualization). Values: true, false
+      attr_accessor :vm_integration_services # Options for VMServiceIntegration [Hash]
 
       def initialize
         @ip_address_timeout = UNSET_VALUE
@@ -21,11 +22,20 @@ module VagrantPlugins
         @maxmemory = UNSET_VALUE
         @cpus = UNSET_VALUE
         @vmname = UNSET_VALUE
-        @vlan_id  = UNSET_VALUE
-        @mac  = UNSET_VALUE
+        @vlan_id = UNSET_VALUE
+        @mac = UNSET_VALUE
         @differencing_disk = UNSET_VALUE
         @auto_start_action = UNSET_VALUE
         @auto_stop_action = UNSET_VALUE
+        @enable_virtualization_extensions = UNSET_VALUE
+        @vm_integration_services = {
+            guest_service_interface: UNSET_VALUE,
+            heartbeat: UNSET_VALUE,
+            key_value_pair_exchange: UNSET_VALUE,
+            shutdown: UNSET_VALUE,
+            time_synchronization: UNSET_VALUE,
+            vss: UNSET_VALUE
+        }
       end
 
       def finalize!
@@ -41,12 +51,18 @@ module VagrantPlugins
         @differencing_disk = false if @differencing_disk == UNSET_VALUE
         @auto_start_action = nil if @auto_start_action == UNSET_VALUE
         @auto_stop_action = nil if @auto_stop_action == UNSET_VALUE
+        @enable_virtualization_extensions = false if @enable_virtualization_extensions == UNSET_VALUE # TODO will this work?
+
+        @vm_integration_services.each { |key, value|
+          @vm_integration_services[key] = nil if value == UNSET_VALUE
+        }
+        @vm_integration_services = nil if @vm_integration_services.length == 0
       end
 
       def validate(machine)
         errors = _detected_errors
 
-        { "Hyper-V" => errors }
+        {"Hyper-V" => errors}
       end
     end
   end