vagrant-libvirt 0.8.2 → 0.10.1

data/lib/vagrant-libvirt/driver.rb

@@ -32,16 +32,17 @@ module VagrantPlugins
         config = @machine.provider_config
         uri = config.uri
 
-        conn_attr = {}
-        conn_attr[:provider] = 'libvirt'
-        conn_attr[:libvirt_uri] = uri
-        conn_attr[:libvirt_username] = config.username if config.username
-        conn_attr[:libvirt_password] = config.password if config.password
-
         # Setup command for retrieving IP address for newly created machine
         # with some MAC address. Get it from dnsmasq leases table
         ip_command = %q( awk "/$mac/ {print \$1}" /proc/net/arp )
-        conn_attr[:libvirt_ip_command] = ip_command
+
+        conn_attr = {
+          provider: 'libvirt',
+          libvirt_uri: uri,
+          libvirt_ip_command: ip_command,
+        }
+        conn_attr[:libvirt_username] = config.username if config.username
+        conn_attr[:libvirt_password] = config.password if config.password
 
         @logger.info("Connecting to Libvirt (#{uri}) ...")
         begin
@@ -61,7 +62,7 @@ module VagrantPlugins
 
         config = @machine.provider_config
 
-        @system_connection = Libvirt::open_read_only(config.system_uri)
+        @system_connection = Libvirt.open_read_only(config.system_uri)
         @system_connection
       end
 
@@ -69,12 +70,10 @@ module VagrantPlugins
         begin
           domain = connection.servers.get(machine.id)
         rescue Libvirt::RetrieveError => e
-          if e.libvirt_code == ProviderLibvirt::Util::ErrorCodes::VIR_ERR_NO_DOMAIN
-            @logger.debug("machine #{machine.name} domain not found #{e}.")
-            return nil
-          else
-            raise e
-          end
+          raise e unless e.libvirt_code == ProviderLibvirt::Util::ErrorCodes::VIR_ERR_NO_DOMAIN
+
+          @logger.debug("machine #{machine.name} domain not found #{e}.")
+          return nil
         end
 
         domain
@@ -99,32 +98,82 @@ module VagrantPlugins
 
       def get_domain_ipaddress(machine, domain)
         # attempt to get ip address from qemu agent
-        if @machine.provider_config.qemu_use_agent == true
+        if machine.provider_config.qemu_use_agent == true
           @logger.info('Get IP via qemu agent')
-          return get_ipaddress_from_qemu_agent(domain, machine.id)
+          return get_ipaddress_from_qemu_agent(domain, machine.id, machine.config.vm.boot_timeout)
         end
 
-        if @machine.provider_config.qemu_use_session
-          return get_ipaddress_from_system domain.mac
-        end
+        return get_ipaddress_from_system domain.mac if machine.provider_config.qemu_use_session
 
         # Get IP address from dhcp leases table
         begin
           ip_address = get_ipaddress_from_domain(domain)
         rescue Fog::Errors::TimeoutError
-          @logger.info('Timeout at waiting for an ip address for machine %s' % machine.name)
+          @logger.info("Timeout at waiting for an ip address for machine #{machine.name}")
 
           raise
         end
 
         unless ip_address
-          @logger.info('No arp table entry found for machine %s' % machine.name)
+          @logger.info("No arp table entry found for machine #{machine.name}")
           return nil
         end
 
         ip_address
       end
 
+      def restore_snapshot(machine, snapshot_name)
+        domain = get_libvirt_domain(machine)
+        snapshot = get_snapshot_if_exists(machine, snapshot_name)
+        begin
+          # 4 is VIR_DOMAIN_SNAPSHOT_REVERT_FORCE
+          # needed due to https://bugzilla.redhat.com/show_bug.cgi?id=1006886
+          domain.revert_to_snapshot(snapshot, 4)
+        rescue Fog::Errors::Error => e
+          raise Errors::SnapshotReversionError, error_message: e.message
+        end
+      end
+
+      def list_snapshots(machine)
+        get_libvirt_domain(machine).list_snapshots
+      rescue Fog::Errors::Error => e
+        raise Errors::SnapshotListError, error_message: e.message
+      end
+
+      def delete_snapshot(machine, snapshot_name)
+        get_snapshot_if_exists(machine, snapshot_name).delete
+      rescue Errors::SnapshotMissing => e
+        raise Errors::SnapshotDeletionError, error_message: e.message
+      end
+
+      def create_new_snapshot(machine, snapshot_name)
+        snapshot_desc = <<-EOF
+        <domainsnapshot>
+          <name>#{snapshot_name}</name>
+          <description>Snapshot for vagrant sandbox</description>
+        </domainsnapshot>
+        EOF
+        get_libvirt_domain(machine).snapshot_create_xml(snapshot_desc)
+      rescue Fog::Errors::Error => e
+        raise Errors::SnapshotCreationError, error_message: e.message
+      end
+
+      def create_snapshot(machine, snapshot_name)
+        begin
+          delete_snapshot(machine, snapshot_name)
+        rescue Errors::SnapshotDeletionError
+        end
+        create_new_snapshot(machine, snapshot_name)
+      end
+
+      # if we can get snapshot description without exception it exists
+      def get_snapshot_if_exists(machine, snapshot_name)
+        snapshot = get_libvirt_domain(machine).lookup_snapshot_by_name(snapshot_name)
+        return snapshot if snapshot.xml_desc
+      rescue Libvirt::RetrieveError => e
+        raise Errors::SnapshotMissing, error_message: e.message
+      end
+
       def state(machine)
         # may be other error states with initial retreival we can't handle
         begin
@@ -149,7 +198,7 @@ module VagrantPlugins
           end
         end
 
-        return state
+        state
       end
 
       private
@@ -160,43 +209,44 @@ module VagrantPlugins
         system_connection.list_all_networks.each do |net|
           leases = net.dhcp_leases(mac, 0)
           # Assume the lease expiring last is the current IP address
-          ip_address = leases.sort_by { |lse| lse["expirytime"] }.last["ipaddr"] if !leases.empty?
+          ip_address = leases.max_by { |lse| lse['expirytime'] }['ipaddr'] unless leases.empty?
           break if ip_address
         end
 
         ip_address
       end
 
-      def get_ipaddress_from_qemu_agent(domain, machine_id)
+      def get_ipaddress_from_qemu_agent(domain, machine_id, timeout)
         ip_address = nil
         addresses = nil
         libvirt_domain = connection.client.lookup_domain_by_uuid(machine_id)
         begin
-          response = libvirt_domain.qemu_agent_command('{"execute":"guest-network-get-interfaces"}', timeout=10)
-          @logger.debug("Got Response from qemu agent")
+          response = libvirt_domain.qemu_agent_command('{"execute":"guest-network-get-interfaces"}', timeout)
+          @logger.debug('Got Response from qemu agent')
           @logger.debug(response)
           addresses = JSON.parse(response)
-        rescue => e
-          @logger.debug("Unable to receive IP via qemu agent: [%s]" % e.message)
+        rescue StandardError => e
+          puts "Unable to receive IP via qemu agent: [#{e.message}]"
+          @logger.debug("Unable to receive IP via qemu agent: [#{e.message}]")
         end
 
         unless addresses.nil?
-          addresses["return"].each{ |interface|
-            if domain.mac.downcase == interface["hardware-address"].downcase
-              @logger.debug("Found mathing interface: [%s]" % interface["name"])
-              if interface.has_key?("ip-addresses")
-                interface["ip-addresses"].each{ |ip|
-                  # returning ipv6 addresses might break windows guests because
-                  # winrm cant handle connection, winrm fails with "invalid uri"
-                  if ip["ip-address-type"] == "ipv4"
-                    ip_address = ip["ip-address"]
-                    @logger.debug("Return IP: [%s]" % ip_address)
-                    break
-                  end
-                  }
-              end
+          addresses['return'].each do |interface|
+            next unless domain.mac.downcase == interface['hardware-address'].downcase
+
+            @logger.debug("Found matching interface: [#{interface['name']}]")
+            next unless interface.key?('ip-addresses')
+
+            interface['ip-addresses'].each do |ip|
+              # returning ipv6 addresses might break windows guests because
+              # winrm can't handle connection, winrm fails with "invalid uri"
+              next unless ip['ip-address-type'] == 'ipv4'
+
+              ip_address = ip['ip-address']
+              @logger.debug("Return IP: [#{ip_address}]")
+              break
             end
-          }
+          end
         end
         ip_address
       end
@@ -204,18 +254,30 @@ module VagrantPlugins
       def get_ipaddress_from_domain(domain)
         ip_address = nil
         domain.wait_for(2) do
-          addresses.each_pair do |type, ip|
+          addresses.each_pair do |_type, ip|
             # Multiple leases are separated with a newline, return only
             # the most recent address
-            ip_address = ip[0].split("\n").first if ip[0] != nil
+            ip_address = ip[0].split("\n").first unless ip[0].nil?
           end
 
-          ip_address != nil
+          !ip_address.nil?
         end
 
         ip_address
       end
 
+      def get_libvirt_domain(machine)
+        begin
+          libvirt_domain = connection.client.lookup_domain_by_uuid(machine.id)
+        rescue Libvirt::RetrieveError => e
+          raise e unless e.libvirt_code == ProviderLibvirt::Util::ErrorCodes::VIR_ERR_NO_DOMAIN
+
+          @logger.debug("machine #{machine.name} not found #{e}.")
+          return nil
+        end
+
+        libvirt_domain
+      end
     end
   end
 end

data/lib/vagrant-libvirt/errors.rb

@@ -109,7 +109,7 @@ module VagrantPlugins
       end
 
       class FogCreateServerError < VagrantLibvirtError
-        error_key(:fog_create_server_error)
+        error_key(:create_server_error)
       end
 
       # Network exceptions
@@ -154,6 +154,10 @@ module VagrantPlugins
       end
 
       # Other exceptions
+      class UpdateServerError < VagrantLibvirtError
+        error_key(:create_server_error)
+      end
+
       class InterfaceSlotNotAvailable < VagrantLibvirtError
         error_key(:interface_slot_not_available)
       end
@@ -186,8 +190,24 @@ module VagrantPlugins
         error_key(:no_ip_address_error)
       end
 
-      class DeleteSnapshotError < VagrantLibvirtError
-        error_key(:delete_snapshot_error)
+      class SnapshotMissing < VagrantLibvirtError
+        error_key(:snapshot_missing)
+      end
+
+      class SnapshotDeletionError < VagrantLibvirtError
+        error_key(:snapshot_deletion_error)
+      end
+
+      class SnapshotListError < VagrantLibvirtError
+        error_key(:snapshot_list_error)
+      end
+
+      class SnapshotCreationError < VagrantLibvirtError
+        error_key(:snapshot_creation_error)
+      end
+
+      class SnapshotReversionError < VagrantLibvirtError
+        error_key(:snapshot_reversion_error)
       end
 
       class SerialCannotCreatePathError < VagrantLibvirtError

data/lib/vagrant-libvirt/plugin.rb

@@ -6,8 +6,7 @@ rescue LoadError
   raise 'The Vagrant Libvirt plugin must be run within Vagrant.'
 end
 
-# compatibility fix to define constant not available Vagrant <1.6
-::Vagrant::MachineState::NOT_CREATED_ID ||= :not_created
+require 'vagrant-libvirt/util/compat'
 
 module VagrantPlugins
   module ProviderLibvirt
@@ -27,7 +26,7 @@ module VagrantPlugins
         Provider
       end
 
-      action_hook(:remove_libvirt_image) do |hook|
+      action_hook(*(Util::Compat.action_hook_args(:remove_libvirt_image, :box_remove))) do |hook|
         require_relative 'action'
         hook.after Vagrant::Action::Builtin::BoxRemove, Action.remove_libvirt_image
       end
@@ -51,6 +50,11 @@ module VagrantPlugins
         Cap::PublicAddress
       end
 
+      provider_capability(:libvirt, :snapshot_list) do
+        require_relative 'cap/snapshots'
+        Cap::Snapshots
+      end
+
       # lower priority than nfs or rsync
       # https://github.com/vagrant-libvirt/vagrant-libvirt/pull/170
       synced_folder('9p', 4) do

data/lib/vagrant-libvirt/provider.rb

@@ -52,7 +52,7 @@ module VagrantPlugins
         #  :username => "mitchellh",
         #  :private_key_path => "/path/to/my/key"
         # }
-        # note that modifing @machine.id or accessing @machine.state is not
+        # note that modifying @machine.id or accessing @machine.state is not
         # thread safe, so be careful to avoid these here as this method may
         # be called from other threads of execution.
         return nil if state.id != :running

data/lib/vagrant-libvirt/templates/domain.xml.erb

@@ -81,8 +81,28 @@
     <cmdline><%= @cmd_line %></cmdline>
 <%- if @dtb -%>
     <dtb><%= @dtb %></dtb>
+<% end -%>
+<%- unless @sysinfo.empty? -%>
+    <smbios mode='sysinfo'/>
 <% end -%>
   </os>
+<%- unless @sysinfo.empty? -%>
+  <sysinfo type='smbios'>
+  <%- @sysinfo.each_pair do |block, values| -%>
+    <<%= @sysinfo_blocks[block.to_s][:xml] %>>
+    <%- if values.respond_to?(:each_pair) -%>
+      <%- values.each do |name, value| -%>
+      <entry name='<%= name %>'><%= value %></entry>
+      <% end -%>
+    <%- else -%>
+      <%- values.each do |value| -%>
+      <entry><%= value %></entry>
+      <% end -%>
+    <% end -%>
+    </<%= @sysinfo_blocks[block.to_s][:xml] %>>
+  <% end -%>
+  </sysinfo>
+<% end -%>
   <features>
 <%- @features.each do |feature| -%>
     <<%= feature %>/>
@@ -117,11 +137,17 @@
             @disk_driver_opts.reject { |k,v| v.nil? }
                              .map { |k,v| "#{k}='#{v}'"}
                              .join(' ') -%>/>
-      <source file='<%= volume[:path] %>'/>
+      <source file='<%= volume[:absolute_path] %>'/>
       <%# we need to ensure a unique target dev -%>
-      <target dev='<%= volume[:dev] %>' bus='<%= volume[:bus] %>'/>
+      <target dev='<%= volume[:device] %>' bus='<%= volume[:bus] %>'/>
     </disk>
 <%- end -%>
+<%- scsi_volumes = @domain_volumes.select { |x| x[:bus] == 'scsi' } %>
+<%- if !scsi_volumes.empty? and !@disk_controller_model.nil? %>
+  <%- for idx in 0..(scsi_volumes.length / 7) do %>
+    <controller type='scsi' model='<%= @disk_controller_model %>' index='<%= idx -%>'/>
+  <%- end -%>
+<%- end -%>
 <%# additional disks -%>
 <%- @disks.each_with_index do |d, index| -%>
     <disk type='file' device='disk'>
@@ -220,7 +246,7 @@
     </graphics><% end -%>
     <video>
       <model type='<%= @video_type %>' vram='<%= @video_vram %>' heads='1'<% if not @video_accel3d %>/><% else %>>
-	<acceleration accel3d='yes'/>
+        <acceleration accel3d='yes'/>
       </model><% end -%>
     </video>
     <%#End Video -%>
@@ -250,13 +276,13 @@
     <hostdev mode='subsystem' type='usb'>
       <source startupPolicy='<%= usb[:startupPolicy] || "mandatory" %>'>
   <%- if usb[:vendor] -%>
-	<vendor id='<%= usb[:vendor] %>'/>
+        <vendor id='<%= usb[:vendor] %>'/>
   <%- end -%>
   <%- if usb[:product] -%>
-	<product id='<%= usb[:product] %>'/>
+        <product id='<%= usb[:product] %>'/>
   <%- end -%>
   <%- if usb[:bus] && usb[:device] -%>
-	<address bus='<%= usb[:bus] %>' device='<%= usb[:device] %>'/>
+        <address bus='<%= usb[:bus] %>' device='<%= usb[:device] %>'/>
   <%- end -%>
       </source>
     </hostdev>

data/lib/vagrant-libvirt/util/byte_number.rb

@@ -68,4 +68,3 @@ class ByteNumber < Numeric
         (to_f/(1024 ** n)).ceil
     end
 end
-  

data/lib/vagrant-libvirt/util/compat.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'vagrant'
+
+# compatibility fix to define constant not available Vagrant <1.6
+::Vagrant::MachineState::NOT_CREATED_ID ||= :not_created
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Util
+      module Compat
+        def self.action_hook_args(name, action)
+          # handle different number of arguments for action_hook depending on vagrant version
+          if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('2.2.11')
+            return name, action
+          end
+
+          return name
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-libvirt/util/domain_flags.rb

@@ -0,0 +1,15 @@
+ # Ripped from https://libvirt.org/html/libvirt-libvirt-domain.html#types
+module VagrantPlugins
+  module ProviderLibvirt
+    module Util
+      module DomainFlags
+        # virDomainUndefineFlagsValues
+        VIR_DOMAIN_UNDEFINE_MANAGED_SAVE = 1 # Also remove any managed save
+        VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA = 2 # If last use of domain, then also remove any snapshot metadata
+        VIR_DOMAIN_UNDEFINE_NVRAM = 4 # Also remove any nvram file
+        VIR_DOMAIN_UNDEFINE_KEEP_NVRAM = 8 # Keep nvram file
+        VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA = 16 # If last use of domain, then also remove any checkpoint metadata Future undefine control flags should come here.
+      end
+    end
+  end
+end

data/lib/vagrant-libvirt/util/unindent.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class String
+  def unindent
+    gsub(/^#{scan(/^\s*/).min_by{|l|l.length}}/, "")
+  end
+end

data/lib/vagrant-libvirt/util.rb

@@ -9,6 +9,7 @@ module VagrantPlugins
       autoload :NetworkUtil, 'vagrant-libvirt/util/network_util'
       autoload :StorageUtil, 'vagrant-libvirt/util/storage_util'
       autoload :ErrorCodes, 'vagrant-libvirt/util/error_codes'
+      autoload :DomainFlags, 'vagrant-libvirt/util/domain_flags'
       autoload :Ui, 'vagrant-libvirt/util/ui'
     end
   end

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.8.2
+0.10.1

data/locales/en.yml

@@ -16,7 +16,7 @@ en:
       Created volume larger than box defaults, will require manual resizing of
       filesystems to utilize.
     box_version_missing: |-
-      No verison detected for %{name}, using timestamp to watch for modifications. Consider
+      No version detected for %{name}, using timestamp to watch for modifications. Consider
       generating a local metadata for the box with a version to allow better handling.
       See https://www.vagrantup.com/docs/boxes/format#box-metadata for further details.
     uploading_volume: |-
@@ -25,6 +25,8 @@ en:
       Creating image (snapshot of base box volume).
     removing_domain_volume: |-
       Removing image (snapshot of base box volume).
+    updating_domain: |-
+      Updating domain definition due to configuration change
     starting_domain: |-
       Starting domain.
     terminating: |-
@@ -58,9 +60,11 @@ en:
     remove_stale_volume: |-
       Remove stale volume...
 
-    destroy:
+    domain_xml:
       obsolete_method: |
-        Destroying machine that was originally created without device aliases (pre 0.6.0), using fallback approach.
+        Machine that was originally created without device aliases (pre 0.6.0), using fall-back approach for device identification.
+
+    destroy:
       unexpected_volumes: |
         Unexpected number of volumes detected, possibly additional volumes attached outside of vagrant-libvirt.
         Attempting to handle this correctly, however may experience unexpected behaviour in the domain destroy.
@@ -136,7 +140,7 @@ en:
         Error while creating a storage pool volume: %{error_message}
       fog_create_domain_volume_error: |-
         Error while creating volume for domain: %{error_message}
-      fog_create_server_error: |-
+      create_server_error: |-
         Error while creating domain: %{error_message}
       domain_name_exists: |-
         Name `%{domain_name}` of domain about to create is already taken. Please try to run
@@ -181,6 +185,16 @@ en:
       management_network_required: |-
         Management network can't be disabled when VM use box.
         Please fix your configuration and run vagrant again.
+      snapshot_deletion_error: |-
+        Error while deleting snapshot: %{error_message}.
+      snapshot_missing: |-
+        Snapshot not found: %{error_message}.
+      snapshot_list_error: |-
+        Cannot list snapshots: %{error_message}.
+      snapshot_creation_error: |-
+        Cannot create snapshot(s): %{error_message}.
+      snapshot_reversion_error: |-
+        Cannot revert snapshot(s): %{error_message}.
       serial_cannot_create_path_error: |-
         Error creating path for serial port output log: %{path}
 
@@ -200,3 +214,13 @@ en:
       preparing: |-
         The vagrant machine is being prepared for creation, please wait for
         it to reach a steady state before issuing commands on it.
+
+    cap:
+      virtiofs:
+        preparing: Configuring virtiofs devices for shared folders...
+        mounting: Mounting virtiofs shared folders...
+        cleanup: Removing virtiofs devices for shared folders...
+      9p:
+        preparing: Configuring 9p devices for shared folders...
+        mounting: Mounting 9p shared folders...
+        cleanup: Removing 9p devices for shared folders...

data/spec/acceptance/additional_storage_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'additional storage configured', acceptance: true do
+  include_context 'libvirt_acceptance'
+
+  before do
+    environment.skeleton('additional_storage')
+  end
+
+  after do
+    assert_execute('vagrant', 'destroy', '--force')
+  end
+
+  it 'should succeed' do
+    status('Test: machine is created successfully')
+    result = environment.execute('vagrant', 'up')
+    expect(result).to exit_with(0)
+
+    status('Test: additional storage configured')
+    expect(result.stdout).to match(/\(vda\).*work_default.img/)
+    expect(result.stdout).to match(/\(vdb\).*work_default-vdb\.qcow2/)
+
+    status('Test: reload handles additional storage correctly')
+    result = environment.execute('vagrant', 'reload')
+    expect(result).to exit_with(0)
+
+    status('Test: additional storage reported correctly')
+    expect(result.stdout).to match(/\(vdb\).*work_default-vdb\.qcow2/)
+  end
+end

data/spec/acceptance/package_domain_spec.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'package domain', acceptance: true do
+  include_context 'libvirt_acceptance'
+
+  before(:all) do
+    expect(Vagrant::Util::Which.which('virt-sysprep')).to be_truthy,
+                                                          'packaging tests require virt-sysprep, please install'
+    expect(Vagrant::Util::Which.which('virt-sparsify')).to be_truthy,
+                                                           'packaging tests require virt-sparsify, please install'
+
+    result = (File.exist?('C:\\') ? `dir /-C #{Dir.tmpdir}` : `df #{Dir.tmpdir}`).split("\n").last
+    expect(result.split[3].to_i).to be > 6 * 1024 * 1024,
+                                    "packaging tests require more than 6GiB of space under #{Dir.tmpdir}"
+  end
+
+  after(:each) do
+    assert_execute('vagrant', 'destroy', '--force')
+  end
+
+  let(:testbox_envvars) { { VAGRANT_VAGRANTFILE: 'Vagrantfile.testbox' } }
+
+  context 'simple' do
+    before do
+      environment.skeleton('package_simple')
+    end
+
+    after do
+      result = environment.execute('vagrant', 'destroy', '--force', extra_env: testbox_envvars)
+      expect(result).to exit_with(0)
+
+      assert_execute('vagrant', 'box', 'remove', '--force', 'test-package-simple-domain')
+    end
+
+    it 'should succeed' do
+      status('Test: machine is created successfully')
+      expect(environment.execute('vagrant', 'up')).to exit_with(0)
+
+      status('Test: package machine successfully')
+      expect(environment.execute('vagrant', 'package')).to exit_with(0)
+
+      status('Test: add packaged box')
+      expect(environment.execute(
+        'vagrant', 'box', 'add', '--force', '--name', 'test-package-simple-domain', 'package.box'
+      )).to exit_with(0)
+
+      status('Test: machine from packaged box is created successfully')
+      result = environment.execute('vagrant', 'up', extra_env: testbox_envvars)
+      expect(result).to exit_with(0)
+      expect(result.stdout).to match(/test-package-complex-domain/)
+    end
+  end
+
+  context 'complex' do
+    before do
+      environment.skeleton('package_complex')
+      extra_env.merge!(
+        {
+          VAGRANT_LIBVIRT_VIRT_SYSPREP_OPERATIONS: 'defaults,-ssh-userdir,customize',
+          VAGRANT_LIBVIRT_VIRT_SYSPREP_OPTIONS: '--run $(pwd)/scripts/sysprep.sh',
+        }
+      )
+    end
+
+    after do
+      expect(environment.execute('vagrant', 'destroy', '--force', extra_env: testbox_envvars)).to exit_with(0)
+      assert_execute('vagrant', 'box', 'remove', '--force', 'test-package-complex-domain')
+    end
+
+    it 'should succeed' do
+      status('Test: machine is created successfully')
+      expect(environment.execute('vagrant', 'up')).to exit_with(0)
+
+      status('Test: package machine successfully')
+      expect(environment.execute('vagrant', 'package')).to exit_with(0)
+
+      status('Test: add packaged box')
+      expect(environment.execute(
+        'vagrant', 'box', 'add', '--force', '--name', 'test-package-complex-domain', 'package.box'
+      )).to exit_with(0)
+
+      status('Test: machine from packaged box is created successfully')
+      result = environment.execute('vagrant', 'up', extra_env: testbox_envvars)
+      expect(result).to exit_with(0)
+      expect(result.stdout).to match(/test-package-complex-domain/)
+    end
+  end
+end