vagrant-libvirt 0.10.8 → 0.11.2

data/lib/vagrant-libvirt/driver.rb

@@ -66,65 +66,48 @@ module VagrantPlugins
         @system_connection
       end
 
-      def get_domain(machine)
-        begin
-          domain = connection.servers.get(machine.id)
-        rescue Libvirt::RetrieveError => e
-          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
-      end
-
-      def created?(machine)
-        domain = get_domain(machine)
+      def created?
+        domain = get_domain()
         !domain.nil?
       end
 
-      def get_ipaddress(machine)
+      def get_ipaddress(domain=nil)
         # Find the machine
-        domain = get_domain(machine)
+        domain = get_domain() if domain.nil?
 
         if domain.nil?
           # The machine can't be found
           return nil
         end
 
-        get_domain_ipaddress(machine, domain)
-      end
-
-      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, machine.config.vm.boot_timeout)
+          return get_ipaddress_from_qemu_agent(@machine.config.vm.boot_timeout, domain)
         end
 
-        return get_ipaddress_from_system domain.mac if machine.provider_config.qemu_use_session
+        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 #{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 #{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)
+      def restore_snapshot(snapshot_name)
+        domain = get_libvirt_domain()
+        snapshot = get_snapshot_if_exists(snapshot_name)
         begin
           # 4 is VIR_DOMAIN_SNAPSHOT_REVERT_FORCE
           # needed due to https://bugzilla.redhat.com/show_bug.cgi?id=1006886
@@ -134,52 +117,52 @@ module VagrantPlugins
         end
       end
 
-      def list_snapshots(machine)
-        get_libvirt_domain(machine).list_snapshots
+      def list_snapshots
+        get_libvirt_domain().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
+      def delete_snapshot(snapshot_name)
+        get_snapshot_if_exists(snapshot_name).delete
       rescue Errors::SnapshotMissing => e
         raise Errors::SnapshotDeletionError, error_message: e.message
       end
 
-      def create_new_snapshot(machine, snapshot_name)
+      def create_new_snapshot(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)
+        get_libvirt_domain().snapshot_create_xml(snapshot_desc)
       rescue Fog::Errors::Error => e
         raise Errors::SnapshotCreationError, error_message: e.message
       end
 
-      def create_snapshot(machine, snapshot_name)
+      def create_snapshot(snapshot_name)
         begin
-          delete_snapshot(machine, snapshot_name)
+          delete_snapshot(snapshot_name)
         rescue Errors::SnapshotDeletionError
         end
-        create_new_snapshot(machine, snapshot_name)
+        create_new_snapshot(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)
+      def get_snapshot_if_exists(snapshot_name)
+        snapshot = get_libvirt_domain().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)
+      def state
         # may be other error states with initial retreival we can't handle
         begin
-          domain = get_domain(machine)
+          domain = get_domain
         rescue Libvirt::RetrieveError => e
-          @logger.debug("Machine #{machine.id} not found #{e}.")
+          @logger.debug("Machine #{@machine.id} not found #{e}.")
           return :not_created
         end
 
@@ -191,9 +174,9 @@ module VagrantPlugins
         state = domain.state.tr('-', '_').to_sym
         if state == :running
           begin
-            get_domain_ipaddress(machine, domain)
+            get_ipaddress(domain)
           rescue Fog::Errors::TimeoutError => e
-            @logger.debug("Machine #{machine.id} running but no IP address available: #{e}.")
+            @logger.debug("Machine #{@machine.id} running but no IP address available: #{e}.")
             return :inaccessible
           end
         end
@@ -201,12 +184,68 @@ module VagrantPlugins
         state
       end
 
-      def list_host_devices
-        connection.client.list_all_interfaces
+      def get_domain
+        begin
+          domain = connection.servers.get(@machine.id)
+        rescue Libvirt::RetrieveError => e
+          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
+      end
+
+      def list_all_networks
+        client = if @machine.provider_config.qemu_use_session
+                   system_connection
+                else
+                  connection.client
+                end
+
+        client.list_all_networks.select do |net|
+          begin
+            net.bridge_name
+          rescue Libvirt::Error
+            # there does not appear to be a mechanism to determine the type of network, only by
+            # querying the attribute and catching the error is it possible to ignore unsupported.
+            @logger.debug "Ignoring #{net.name} as it does not support retrieval of bridge_name attribute"
+            next
+          end
+        end
+      end
+
+      def host_devices
+        @host_devices ||= begin
+          cmd = []
+          unless @machine.provider_config.proxy_command.nil? || @machine.provider_config.proxy_command.empty?
+            cmd = ['ssh', @machine.provider_config.host]
+            cmd += ['-p', @machine.provider_config.port.to_s] if @machine.provider_config.port
+            cmd += ['-l', @machine.provider_config.username] if @machine.provider_config.username
+            cmd += ['-i', @machine.provider_config.id_ssh_key_file] if @machine.provider_config.id_ssh_key_file
+          end
+          ip_cmd = cmd + %W(ip -j link show)
+
+          result = Vagrant::Util::Subprocess.execute(*ip_cmd)
+          raise Errors::FogLibvirtConnectionError unless result.exit_code == 0
+
+          info = JSON.parse(result.stdout)
+
+          (
+            info.map { |iface| iface['ifname'] } +
+            connection.client.list_all_interfaces.map { |iface| iface.name } +
+            list_all_networks.map { |net| net.bridge_name }
+          ).uniq.reject(&:empty?)
+        end
+      end
+
+      def attach_device(xml)
+        get_libvirt_domain.attach_device(xml)
       end
 
-      def list_networks
-        connection.client.list_all_networks
+      def detach_device(xml)
+        get_libvirt_domain.detach_device(xml)
       end
 
       private
@@ -214,7 +253,7 @@ module VagrantPlugins
       def get_ipaddress_from_system(mac)
         ip_address = nil
 
-        system_connection.list_all_networks.each do |net|
+        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.max_by { |lse| lse['expirytime'] }['ipaddr'] unless leases.empty?
@@ -224,10 +263,10 @@ module VagrantPlugins
         ip_address
       end
 
-      def get_ipaddress_from_qemu_agent(domain, machine_id, timeout)
+      def get_ipaddress_from_qemu_agent(timeout, domain=nil)
         ip_address = nil
         addresses = nil
-        libvirt_domain = connection.client.lookup_domain_by_uuid(machine_id)
+        libvirt_domain = get_libvirt_domain()
         begin
           response = libvirt_domain.qemu_agent_command('{"execute":"guest-network-get-interfaces"}', timeout)
           @logger.debug('Got Response from qemu agent')
@@ -274,13 +313,13 @@ module VagrantPlugins
         ip_address
       end
 
-      def get_libvirt_domain(machine)
+      def get_libvirt_domain
         begin
-          libvirt_domain = connection.client.lookup_domain_by_uuid(machine.id)
+          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}.")
+          @logger.debug("machine #{@machine.name} not found #{e}.")
           return nil
         end
 

data/lib/vagrant-libvirt/provider.rb

@@ -57,7 +57,7 @@ module VagrantPlugins
         # be called from other threads of execution.
         return nil if state.id != :running
 
-        ip = driver.get_ipaddress(@machine)
+        ip = driver.get_ipaddress
 
         # if can't determine the IP, just return nil and let the core
         # deal with it, similar to the docker provider
@@ -70,7 +70,7 @@ module VagrantPlugins
           forward_x11: @machine.config.ssh.forward_x11
         }
 
-        ssh_info[:proxy_command] = @machine.provider_config.proxy_command if @machine.provider_config.proxy_command
+        ssh_info[:proxy_command] = @machine.provider_config.proxy_command if @machine.provider_config.proxy_command && !@machine.provider_config.proxy_command.empty?
 
         ssh_info
       end
@@ -93,9 +93,9 @@ module VagrantPlugins
         state_id = nil
         state_id = :not_created unless @machine.id
         state_id = :not_created if
-          !state_id && (!@machine.id || !driver.created?(@machine))
+          !state_id && (!@machine.id || !driver.created?)
         # Query the driver for the current state of the machine
-        state_id = driver.state(@machine) if @machine.id && !state_id
+        state_id = driver.state if @machine.id && !state_id
         state_id = :unknown unless state_id
 
         # This is a special pseudo-state so that we don't set the

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

@@ -5,33 +5,35 @@
   <uuid><%= @uuid %></uuid>
   <memory><%= @memory_size %></memory>
   <vcpu<% if @cpuset %> cpuset='<%= @cpuset %>'<% end %>><%= @cpus %></vcpu>
+<%- unless @cpu_mode.nil? -%>
   <cpu mode='<%= @cpu_mode %>'>
-<%- if @cpu_mode != 'host-passthrough' -%>
+  <%- if @cpu_mode != 'host-passthrough' -%>
     <model fallback='<%= @cpu_fallback %>'><% if @cpu_mode == 'custom' %><%= @cpu_model %><% end %></model>
-<%- end -%>
-<%- if @nested -%>
-  <%- if @cpu_features.select{|x| x[:name] == 'vmx'}.empty? -%>
-    <feature policy='optional' name='vmx'/>
   <%- end -%>
-  <%- if @cpu_features.select{|x| x[:name] == 'svm'}.empty? -%>
+  <%- if @nested -%>
+    <%- if @cpu_features.select{|x| x[:name] == 'vmx'}.empty? -%>
+    <feature policy='optional' name='vmx'/>
+    <%- end -%>
+    <%- if @cpu_features.select{|x| x[:name] == 'svm'}.empty? -%>
     <feature policy='optional' name='svm'/>
+    <%- end -%>
   <%- end -%>
-<%- end -%>
-<%- @cpu_features.each do |cpu_feature| -%>
+  <%- @cpu_features.each do |cpu_feature| -%>
     <feature name='<%= cpu_feature[:name] %>' policy='<%= cpu_feature[:policy] %>'/>
-<%- end -%>
-<%- unless @cpu_topology.empty? -%>
+  <%- end -%>
+  <%- unless @cpu_topology.empty? -%>
     <%# CPU topology -%>
     <topology sockets='<%= @cpu_topology[:sockets] %>' cores='<%= @cpu_topology[:cores] %>' threads='<%= @cpu_topology[:threads] %>'/>
-<%- end -%>
-<%- if @numa_nodes -%>
+  <%- end -%>
+  <%- if @numa_nodes -%>
     <numa>
-  <%- @numa_nodes.each_with_index do |node, index| -%>
+    <%- @numa_nodes.each_with_index do |node, index| -%>
       <cell id='<%= index %>' cpus='<%= node[:cpus] %>' memory='<%= node[:memory] %>'<% if node.key?(:memAccess) %> memAccess='<%= node[:memAccess] %>'<% end %>/>
-  <%- end -%>
+    <%- end -%>
     </numa>
-<%- end -%>
+  <%- end -%>
   </cpu>
+<%- end -%>
 <%- if @nodeset -%>
   <numatune>
     <memory nodeset='<%= @nodeset %>'/>
@@ -43,10 +45,22 @@
     <<%= backing[:name] %> <%= backing[:config].map { |k,v| "#{k}='#{v}'"}.join(' ')  %>/>
   <%- end -%>
   </memoryBacking>
+<%- end -%>
+<%- unless @memtunes.empty? -%>
+  <memtune>
+  <%- @memtunes.each do |name, options| -%>
+    <<%= name %> <%= options[:config].map { |k,v| "#{k}='#{v}'"}.join(' ')  %>><%= options[:value] %></<%= name %>>
+  <%- end -%>
+  </memtune>
 <%- end%>
-<%- if @shares -%>
+<%- if !@cpu_affinity.empty? || @shares -%>
   <cputune>
+  <%- @cpu_affinity.each do |vcpu, cpuset| -%>
+    <vcpupin vcpu="<%= vcpu %>" cpuset="<%= cpuset %>" />
+  <%- end -%>
+  <%- if @shares -%>
     <shares><%= @shares %></shares>
+  <%- end -%>
   </cputune>
 <%- end -%>
   <os>
@@ -73,9 +87,7 @@
 <%- if @nvram -%>
     <nvram><%= @nvram %></nvram>
 <%- end -%>
-<%- if @boot_order.count >= 1 -%>
-    <bootmenu enable='yes'/>
-<%- end -%>
+    <bootmenu enable='<%= @boot_order.count >= 1 ? "yes" : "no" %>'/>
     <kernel><%= @kernel %></kernel>
     <initrd><%= @initrd %></initrd>
     <cmdline><%= @cmd_line %></cmdline>
@@ -140,6 +152,9 @@
       <source file='<%= volume[:absolute_path] %>'/>
       <%# we need to ensure a unique target dev -%>
       <target dev='<%= volume[:device] %>' bus='<%= volume[:bus] %>'/>
+  <%- if volume[:address_type] -%>
+      <address type='<%= volume[:address_type] %>'/>
+  <%- end -%>
     </disk>
 <%- end -%>
 <%- scsi_volumes = @domain_volumes.select { |x| x[:bus] == 'scsi' } %>
@@ -160,6 +175,9 @@
       -%>/>
       <source file='<%= d[:absolute_path] %>'/>
       <target dev='<%= d[:device] %>' bus='<%= d[:bus] %>'/>
+  <%- if d[:address_type] || @disk_address_type -%>
+      <address type='<%= d[:address_type] || @disk_address_type %>'/>
+  <%- end -%>
   <%- if d[:shareable] -%>
       <shareable/>
   <%- end -%>
@@ -182,6 +200,12 @@
       <readonly/>
     </disk>
 <%- end -%>
+<%- @floppies.each do |f| -%>
+    <disk type='file' device='floppy'>
+      <source file='<%= f[:path] %>'/>
+      <target dev='<%= f[:dev] %>' bus='<%= f[:bus] %>'/>
+    </disk>
+<%- end -%>
 <%- @serials.each_with_index do |serial, port| -%>
     <serial type='<%= serial[:type] %>'>
       <%- unless serial[:source].nil? -%>
@@ -218,7 +242,11 @@
     </channel>
 <%- end -%>
 <%- @inputs.each do |input| -%>
-    <input type='<%= input[:type] %>' bus='<%= input[:bus] %>'/>
+    <input type='<%= input[:type] %>' bus='<%= input[:bus] %>'>
+  <%- unless @launchsecurity_data.nil? -%>
+      <driver iommu='on' />
+  <%- end -%>
+    </input>
 <%- end -%>
 <%- if !@sound_type.nil? -%>
     <%# Sound device-%>
@@ -228,12 +256,13 @@
 <%- end -%>
 <%- if @graphics_type != 'none'
       graphics = {
-	'type' => @graphics_type,
-	'port' => @graphics_port,
-	'autoport' => @graphics_autoport,
-	'listen' => @graphics_ip,
-	'keymap' => @keymap,
-	'passwd' => @graphics_passwd,
+        'type' => @graphics_type,
+        'port' => @graphics_port,
+        'autoport' => @graphics_autoport,
+        'websocket' => @graphics_websocket,
+        'listen' => @graphics_ip,
+        'keymap' => @keymap,
+        'passwd' => @graphics_passwd,
       }
 -%>
     <%# Video device -%>
@@ -254,6 +283,9 @@
 <%- if @rng[:model] == "random"%>
     <rng model='virtio'>
       <backend model='random'>/dev/random</backend>
+  <%- unless @launchsecurity_data.nil? -%>
+      <driver iommu='on' />
+  <%- end -%>
     </rng>
 <%- end -%>
 <%-
@@ -327,18 +359,32 @@
 <%- end -%>
 <%- if not @usbctl_dev.empty? -%>
     <%# USB Controller -%>
-    <controller type='usb' model='<%= @usbctl_dev[:model] %>' <%= "ports=\"#{@usbctl_dev[:ports]}\" " if @usbctl_dev[:ports] %>/>
+    <controller type='usb' model='<%= @usbctl_dev[:model] %>' <%= "ports=\"#{@usbctl_dev[:ports]}\" " if @usbctl_dev[:ports] %>>
+  <%- unless @launchsecurity_data.nil? -%>
+      <driver iommu='on' />
+  <%- end -%>
+    </controller>
 <%- end -%>
 <%- unless @memballoon_enabled.nil? -%>
   <%- if @memballoon_enabled -%>
     <memballoon model='<%= @memballoon_model %>'>
       <address type='pci' domain='0x0000' bus='<%= @memballoon_pci_bus %>' slot='<%= @memballoon_pci_slot %>' function='0x0'/>
+  <%- unless @launchsecurity_data.nil? -%>
+      <driver iommu='on' />
+  <%- end -%>
     </memballoon>
   <%- else -%>
     <memballoon model='none'/>
   <%- end -%>
 <%- end -%>
   </devices>
+<%- unless @launchsecurity_data.nil? -%>
+  <launchSecurity type='<%= @launchsecurity_data[:type] %>'>
+    <cbitpos><%= @launchsecurity_data[:cbitpos] %></cbitpos>
+    <reducedPhysBits><%= @launchsecurity_data[:reducedPhysBits] %></reducedPhysBits>
+    <policy><%= @launchsecurity_data[:policy] %></policy>
+  </launchSecurity>
+<%- end -%>
 <%- if not @qemu_args.empty? or not @qemu_env.empty? -%>
   <qemu:commandline>
   <%- @qemu_args.each do |arg| -%>

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

@@ -12,12 +12,15 @@
   <% end %>
   <model type='<%=@model_type%>'/>
   <% if @driver_name and @driver_queues %>
-    <driver name='<%=@driver_name%>' queues='<%=@driver_queues%>'/>
+    <driver <% if @driver_iommu %> iommu="on" <% end %> name='<%=@driver_name%>' queues='<%=@driver_queues%>'/>
   <% elsif @driver_queues %>
-    <driver queues='<%=@driver_queues%>'/>
+    <driver <% if @driver_iommu %> iommu="on" <% end %> queues='<%=@driver_queues%>'/>
   <% elsif @driver_name %>
-    <driver name='<%=@driver_name%>'/>
+    <driver <% if @driver_iommu %> iommu="on" <% end %> name='<%=@driver_name%>'/>
+  <% elsif @driver_iommu %>
+    <driver iommu='on' />
   <% end %>
+
   <% if @ovs %>
   <virtualport type='openvswitch'>
     <% if @ovs_interfaceid %>

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

@@ -33,6 +33,7 @@ module VagrantPlugins
           management_network_domain = env[:machine].provider_config.management_network_domain
           management_network_mtu = env[:machine].provider_config.management_network_mtu
           management_network_keep = env[:machine].provider_config.management_network_keep
+          management_network_driver_iommu = env[:machine].provider_config.management_network_driver_iommu
           logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode"
 
           begin
@@ -74,7 +75,7 @@ module VagrantPlugins
             }
           end
 
-
+          management_network_options[:driver_iommu] = management_network_driver_iommu
 
           unless management_network_mac.nil?
             management_network_options[:mac] = management_network_mac
@@ -149,17 +150,11 @@ module VagrantPlugins
 
         # Return a list of all (active and inactive) Libvirt networks as a list
         # of hashes with their name, network address and status (active or not)
-        def libvirt_networks(libvirt_client)
+        def libvirt_networks(driver)
           libvirt_networks = []
 
-          active = libvirt_client.list_networks
-          inactive = libvirt_client.list_defined_networks
-
           # Iterate over all (active and inactive) networks.
-          active.concat(inactive).each do |network_name|
-            libvirt_network = libvirt_client.lookup_network_by_name(
-              network_name
-            )
+          driver.list_all_networks.each do |libvirt_network|
 
             # Parse ip address and netmask from the network xml description.
             xml = Nokogiri::XML(libvirt_network.xml_desc)
@@ -182,7 +177,7 @@ module VagrantPlugins
             network_address = (network_address(ip, netmask) if ip && netmask)
 
             libvirt_networks << {
-              name:             network_name,
+              name:             libvirt_network.name,
               ip_address:       ip,
               netmask:          netmask,
               network_address:  network_address,

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.10.8
+0.11.2

data/locales/en.yml

@@ -29,6 +29,8 @@ en:
       Updating domain definition due to configuration change
     starting_domain: |-
       Starting domain.
+    starting_domain_with_graphics: |-
+      Domain launching with graphics connection settings...
     terminating: |-
       Removing domain...
     poweroff_domain: |-
@@ -203,6 +205,8 @@ en:
     states:
       paused: |-
         The Libvirt domain is suspended. Run `vagrant resume` to resume it.
+      pmsuspended: |-
+        The Libvirt domain is suspended. Run `vagrant resume` to resume it.
       shutting_down: |-
         The Libvirt domain is shutting down. Wait for it to complete and
         then run `vagrant up` to start it or `vagrant destroy` to remove.

data/spec/acceptance/additional_storage_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require_relative '../spec_helper'
 
 describe 'additional storage configured', acceptance: true do
   include_context 'libvirt_acceptance'
@@ -25,8 +25,5 @@ describe 'additional storage configured', acceptance: true do
     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/networking_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative '../spec_helper'
+
+describe 'package domain', acceptance: true do
+  include_context 'libvirt_acceptance'
+
+  before(:all) do
+    expect(Vagrant::Util::Which.which('virsh')).to be_truthy,
+                                                          'networking tests require virsh, please install'
+    expect(system('virsh --connect=qemu:///system uri >/dev/null')).to be_truthy,
+      'network tests require access to qemu:///system context, please ensure test user has correct permissions'
+  end
+
+  after(:each) do
+    assert_execute('vagrant', 'destroy', '--force')
+  end
+
+  before do
+    environment.skeleton('network_no_autostart')
+  end
+
+  context 'when host is rebooted' do
+    before do
+      result = environment.execute('vagrant', 'up')
+      expect(result).to exit_with(0)
+
+      result = environment.execute('vagrant', 'halt')
+      expect(result).to exit_with(0)
+
+      result = environment.execute('virsh', '--connect=qemu:///system', 'net-destroy', 'vagrant-libvirt-test')
+      expect(result).to exit_with(0)
+    end
+
+    it 'should start networking on restart' do
+      status('Test: machine restarts networking')
+      result = environment.execute('vagrant', 'up')
+      expect(result).to exit_with(0)
+    end
+  end
+end

data/spec/acceptance/package_domain_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require_relative '../spec_helper'
 
 describe 'package domain', acceptance: true do
   include_context 'libvirt_acceptance'
@@ -49,7 +49,7 @@ describe 'package domain', acceptance: true do
       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/)
+      expect(result.stdout).to match(/test-package-simple-domain/)
     end
   end
 

data/spec/acceptance/provider_settings_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require_relative '../spec_helper'
 
 describe 'provider settings', acceptance: true do
   include_context 'libvirt_acceptance'

data/spec/acceptance/simple_vm_provision_via_shell_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require_relative '../spec_helper'
 
 describe 'simple vm provision via shell', acceptance: true do
   include_context 'libvirt_acceptance'