vagrant-libvirt 0.12.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c040a1d251767da60c78665550646f187542bbf7b9997cc79fad57912496026
-  data.tar.gz: da241c3927605330f056e1b235910f35c9387b130fe645ba42418b388b34f08d
+  metadata.gz: '0825408b8026061a93791df6756ce840683b4ac6a314cfec9ac1254b5ebb35d7'
+  data.tar.gz: 6c933dfb97f1e8cf9c5ce3e14ecdef59abbdd6dac4d9822e712571634b0d3d3a
 SHA512:
-  metadata.gz: '0478c2e07037e6ca618f17d4965bed901227d48cc7eed448afb099d079e807450263b7ded71cd7a26dfaa83676e25cea890623b7b678c2c5b798df10895366a8'
-  data.tar.gz: bd18eb62fd9e0cd134511cdf642697272a16ae85fa882e9bcdfb9fea157878b2fa918e71fd0c9fa418a104e846211892450ad097965f588f4590495fdec00d3f
+  metadata.gz: 0b73ba987dd3e61e77062c36f995da22d4b934ccd78ba0cc6b3a083f6623bf99198c523bf38a9f6152c4fc958a36eb89afdd521c9b50af7dce819fdd1aa400a8
+  data.tar.gz: 174c59f4549f98b73987e5b308c3d52161ec54e2265838c143834ca7e90bfe4646c90e495520b660b201d094ef2634b082daeec2d4ed47c9948b8a4899d7102e

data/bin/stackprof-flamegraph.pl

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'stackprof-flamegraph.pl' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../../../../SynologyDrive/git/github.com/vagrant-libvirt/vagrant-libvirt/Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("vagrant-libvirt", "stackprof-flamegraph.pl")

data/bin/stackprof-gprof2dot.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'stackprof-gprof2dot.py' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../../../../SynologyDrive/git/github.com/vagrant-libvirt/vagrant-libvirt/Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("vagrant-libvirt", "stackprof-gprof2dot.py")

data/lib/vagrant-libvirt/action/create_network_interfaces.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'log4r'
-require 'vagrant/util/network_ip'
-require 'vagrant/util/scoped_hash_override'
 
 require 'vagrant-libvirt/util/erb_template'
 require 'vagrant-libvirt/util/network_util'
@@ -15,15 +13,12 @@ module VagrantPlugins
       class CreateNetworkInterfaces
         include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
         include VagrantPlugins::ProviderLibvirt::Util::NetworkUtil
-        include Vagrant::Util::NetworkIP
-        include Vagrant::Util::ScopedHashOverride
 
         def initialize(app, env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::create_network_interfaces')
           @management_network_name = env[:machine].provider_config.management_network_name
           config = env[:machine].provider_config
-          @nic_model_type = config.nic_model_type || 'virtio'
-          @nic_adapter_count = config.nic_adapter_count
+          @nic_model_type = config.nic_model_type
           @app = app
         end
 
@@ -39,34 +34,7 @@ module VagrantPlugins
           end
 
           # Setup list of interfaces before creating them.
-          adapters = []
-
-          # Vagrant gives you adapter 0 by default
-          # Assign interfaces to slots.
-          configured_networks(env[:machine], @logger).each do |options|
-            # don't need to create interface for this type
-            next if options[:iface_type] == :forwarded_port
-
-            # TODO: fill first ifaces with adapter option specified.
-            if options[:adapter]
-              if adapters[options[:adapter]]
-                raise Errors::InterfaceSlotNotAvailable
-              end
-
-              free_slot = options[:adapter].to_i
-              @logger.debug "Using specified adapter slot #{free_slot}"
-            else
-              free_slot = find_empty(adapters)
-              @logger.debug "Adapter not specified so found slot #{free_slot}"
-              raise Errors::InterfaceSlotExhausted if free_slot.nil?
-            end
-
-            # We have slot for interface, fill it with interface configuration.
-            adapters[free_slot] = options
-            adapters[free_slot][:network_name] = interface_network(
-              env[:machine].provider.driver, adapters[free_slot]
-            )
-          end
+          adapters = network_interfaces(env[:machine], @logger)
 
           # Create each interface as new domain device.
           @macs_per_network = Hash.new(0)
@@ -81,7 +49,7 @@ module VagrantPlugins
             @driver_name = iface_configuration.fetch(:driver_name, false)
             @driver_iommu = iface_configuration.fetch(:driver_iommu, false )
             @driver_queues = iface_configuration.fetch(:driver_queues, false)
-            @device_name = iface_configuration.fetch(:iface_name, false)
+            @device_name = iface_configuration.fetch(:iface_name, nil)
             @mtu = iface_configuration.fetch(:mtu, nil)
             @pci_bus = iface_configuration.fetch(:bus, nil)
             @pci_slot = iface_configuration.fetch(:slot, nil)
@@ -286,41 +254,6 @@ module VagrantPlugins
                        Nokogiri::XML::Node::SaveOptions::FORMAT
           )
         end
-
-        def find_empty(array, start = 0, stop = @nic_adapter_count)
-          (start..stop).each do |i|
-            return i unless array[i]
-          end
-          nil
-        end
-
-        # Return network name according to interface options.
-        def interface_network(driver, options)
-          # no need to get interface network for tcp tunnel config
-          return 'tunnel_interface' if options.fetch(:tunnel_type, nil)
-
-          if options[:network_name]
-            @logger.debug 'Found network by name'
-            return options[:network_name]
-          end
-
-          # Get list of all (active and inactive) Libvirt networks.
-          available_networks = libvirt_networks(driver)
-
-          return 'public' if options[:iface_type] == :public_network
-
-          if options[:ip]
-            address = network_address(options[:ip], options[:netmask])
-            available_networks.each do |network|
-              if address == network[:network_address]
-                @logger.debug 'Found network by ip'
-                return network[:name]
-              end
-            end
-          end
-
-          raise Errors::NetworkNotAvailableError, network_name: options[:ip]
-        end
       end
     end
   end

data/lib/vagrant-libvirt/action/start_domain.rb

@@ -6,6 +6,7 @@ require 'rexml/document'
 require 'rexml/formatters/pretty'
 require 'rexml/xpath'
 
+require 'vagrant-libvirt/util/network_util'
 require 'vagrant-libvirt/util/xml'
 
 module VagrantPlugins
@@ -13,9 +14,11 @@ module VagrantPlugins
     module Action
       # Just start the domain.
       class StartDomain
+        include VagrantPlugins::ProviderLibvirt::Util::NetworkUtil
 
-        def initialize(app, _env)
+        def initialize(app, env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::start_domain')
+          config = env[:machine].provider_config
           @app = app
         end
 
@@ -68,14 +71,44 @@ module VagrantPlugins
           end
 
           # Interface type
-          unless config.nic_model_type.nil?
-            REXML::XPath.each(xml_descr, '/domain/devices/interface/model') do |iface_model|
-              if iface_model.attributes['type'] != config.nic_model_type
-                @logger.debug "network type updated from '#{iface_model.attributes['type']}' to '#{config.nic_model_type}'"
+          adapters = network_interfaces(env[:machine], @logger)
+          index = 0
+          REXML::XPath.each(xml_descr, '/domain/devices/interface') do |iface|
+            # initial config defaults
+            nic_model_type = index == 0 && config.mgmt_attach ? config.management_network_model_type :  config.nic_model_type
+            driver_iommu = index == 0 && config.mgmt_attach ? config.management_network_driver_iommu : false
+            # resolve per adapter option
+            if index < adapters.length
+              nic_model_type = adapters[index].fetch(:model_type, nic_model_type)
+              driver_iommu = adapters[index].fetch(:driver_iommu, driver_iommu )
+            end
+
+            iface_model = iface.elements['model']
+            if iface_model.attributes['type'] != nic_model_type
+              @logger.debug "network type updated from '#{iface_model.attributes['type']}' to '#{nic_model_type}'"
+              descr_changed = true
+              iface_model.attributes['type'] = nic_model_type
+            end
+
+            iface_driver = iface.elements['driver'] || REXML::Element.new('driver', iface)
+
+            if nic_model_type == 'virtio'
+              iommu = driver_iommu ? 'on': 'off'
+              if !iface_driver.attributes['iommu'].nil? && !driver_iommu.nil? && iface_driver.attributes['iommu'] != iommu
                 descr_changed = true
-                iface_model.attributes['type'] = config.nic_model_type
+                iface_driver.attributes['iommu'] = iommu
+              end
+            else
+              if !iface_driver.nil?
+                descr_changed = true if iface_driver.attributes['iommu']
+                iface_driver.attributes.delete('iommu')
               end
             end
+            iface.delete_element(iface_driver) if iface_driver.attributes.empty?
+            index += 1
+          end
+          if adapters.length != index
+            env[:ui].warn("number of network adapters in current config (#{adapters.length}) is different to attached interfaces (#{index}), may have incorrectly updated")
           end
 
           # vCpu count

data/lib/vagrant-libvirt/config.rb

@@ -70,6 +70,7 @@ module VagrantPlugins
       attr_accessor :management_network_mtu
       attr_accessor :management_network_keep
       attr_accessor :management_network_driver_iommu
+      attr_accessor :management_network_iface_name
       attr_accessor :management_network_model_type
 
       # System connection information
@@ -258,6 +259,7 @@ module VagrantPlugins
         @management_network_mtu = UNSET_VALUE
         @management_network_keep = UNSET_VALUE
         @management_network_driver_iommu = UNSET_VALUE
+        @management_network_iface_name = UNSET_VALUE
         @management_network_model_type = UNSET_VALUE
 
         # System connection information
@@ -960,20 +962,6 @@ module VagrantPlugins
         @snapshot_pool_name = @storage_pool_name if @snapshot_pool_name == UNSET_VALUE
         @storage_pool_path = nil if @storage_pool_path == UNSET_VALUE
         @random_hostname = false if @random_hostname == UNSET_VALUE
-        @management_network_device = 'virbr0' if @management_network_device == UNSET_VALUE
-        @management_network_name = 'vagrant-libvirt' if @management_network_name == UNSET_VALUE
-        @management_network_address = '192.168.121.0/24' if @management_network_address == UNSET_VALUE
-        @management_network_mode = 'nat' if @management_network_mode == UNSET_VALUE
-        @management_network_mac = nil if @management_network_mac == UNSET_VALUE
-        @management_network_guest_ipv6 = 'yes' if @management_network_guest_ipv6 == UNSET_VALUE
-        @management_network_autostart = false if @management_network_autostart == UNSET_VALUE
-        @management_network_pci_bus = nil if @management_network_pci_bus == UNSET_VALUE
-        @management_network_pci_slot = nil if @management_network_pci_slot == UNSET_VALUE
-        @management_network_domain = nil if @management_network_domain == UNSET_VALUE
-        @management_network_mtu = nil if @management_network_mtu == UNSET_VALUE
-        @management_network_keep = false if @management_network_keep == UNSET_VALUE
-        @management_network_driver_iommu = false if @management_network_driver_iommu == UNSET_VALUE
-        @management_network_model_type = 'virtio' if @management_network_model_type == UNSET_VALUE
 
         # Domain specific settings.
         @title = '' if @title == UNSET_VALUE
@@ -1032,7 +1020,7 @@ module VagrantPlugins
         end
         @disk_address_type = nil if @disk_address_type == UNSET_VALUE
         @disk_driver_opts = {} if @disk_driver_opts == UNSET_VALUE
-        @nic_model_type = nil if @nic_model_type == UNSET_VALUE
+        @nic_model_type = 'virtio' if @nic_model_type == UNSET_VALUE
         @nested = false if @nested == UNSET_VALUE
         @volume_cache = nil if @volume_cache == UNSET_VALUE
         @kernel = nil if @kernel == UNSET_VALUE
@@ -1147,6 +1135,23 @@ module VagrantPlugins
 
         @serials = [{:type => 'pty', :source => nil}] if @serials == UNSET_VALUE
 
+        # management network options
+        @management_network_device = 'virbr0' if @management_network_device == UNSET_VALUE
+        @management_network_name = 'vagrant-libvirt' if @management_network_name == UNSET_VALUE
+        @management_network_address = '192.168.121.0/24' if @management_network_address == UNSET_VALUE
+        @management_network_mode = 'nat' if @management_network_mode == UNSET_VALUE
+        @management_network_mac = nil if @management_network_mac == UNSET_VALUE
+        @management_network_guest_ipv6 = 'yes' if @management_network_guest_ipv6 == UNSET_VALUE
+        @management_network_autostart = false if @management_network_autostart == UNSET_VALUE
+        @management_network_pci_bus = nil if @management_network_pci_bus == UNSET_VALUE
+        @management_network_pci_slot = nil if @management_network_pci_slot == UNSET_VALUE
+        @management_network_domain = nil if @management_network_domain == UNSET_VALUE
+        @management_network_mtu = nil if @management_network_mtu == UNSET_VALUE
+        @management_network_keep = false if @management_network_keep == UNSET_VALUE
+        @management_network_driver_iommu = false if @management_network_driver_iommu == UNSET_VALUE
+        @management_network_iface_name = nil if @management_network_iface_name == UNSET_VALUE
+        @management_network_model_type = @nic_model_type if @management_network_model_type == UNSET_VALUE
+
         @host_device_exclude_prefixes = ['docker', 'macvtap', 'virbr', 'vnet'] if @host_device_exclude_prefixes == UNSET_VALUE
       end
 

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

@@ -0,0 +1,22 @@
+require 'vagrant/util/hash_with_indifferent_access'
+
+module VagrantPlugins
+  module VagrantLibvirt
+    module Util
+      class HashWithCompactBlank < ::Vagrant::Util::HashWithIndifferentAccess
+        def compact_blank
+          copy = self.dup
+          copy.each do |k, _v|
+            if copy[k].respond_to(:compact_blank)
+              copy[k].compact_blank
+            elsif copy[k].respond_to(:each_pair)
+              copy[k].delete_if { |_k, v| v.to_s.empty? }
+            else
+              copy[k].reject! { |e| e.to_s.empty? }
+            end
+          end.delete_if { |_k, v| v.empty? }
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
 require 'ipaddr'
 require 'nokogiri'
 require 'vagrant/util/network_ip'
+require 'vagrant/util/scoped_hash_override'
 
 class IPAddr
   def get_mask
@@ -17,6 +18,39 @@ module VagrantPlugins
     module Util
       module NetworkUtil
         include Vagrant::Util::NetworkIP
+        include Vagrant::Util::ScopedHashOverride
+
+        def network_interfaces(machine, logger)
+          # Setup list of interfaces before creating them.
+          adapters = []
+
+          # Vagrant gives you adapter 0 by default
+          # Assign interfaces to slots.
+          configured_networks(machine, logger).each do |options|
+            # don't need to create interface for this type
+            next if options[:iface_type] == :forwarded_port
+
+            # TODO: fill first ifaces with adapter option specified.
+            if options[:adapter]
+              if adapters[options[:adapter]]
+                raise Errors::InterfaceSlotNotAvailable
+              end
+
+              free_slot = options[:adapter].to_i
+              @logger.debug "Using specified adapter slot #{free_slot}"
+            else
+              free_slot = find_empty(adapters, 0, machine.provider_config.nic_adapter_count)
+              @logger.debug "Adapter not specified so found slot #{free_slot}"
+              raise Errors::InterfaceSlotExhausted if free_slot.nil?
+            end
+
+            # We have slot for interface, fill it with interface configuration.
+            adapters[free_slot] = options
+            adapters[free_slot][:network_name] = interface_network(machine.provider.driver, adapters[free_slot])
+          end
+
+          adapters
+        end
 
         def configured_networks(machine, logger)
           qemu_use_session = machine.provider_config.qemu_use_session
@@ -34,6 +68,7 @@ module VagrantPlugins
           management_network_mtu = machine.provider_config.management_network_mtu
           management_network_keep = machine.provider_config.management_network_keep
           management_network_driver_iommu = machine.provider_config.management_network_driver_iommu
+          management_network_iface_name = machine.provider_config.management_network_iface_name
           management_network_model_type = machine.provider_config.management_network_model_type
           logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode"
 
@@ -79,6 +114,7 @@ module VagrantPlugins
           end
 
           management_network_options[:driver_iommu] = management_network_driver_iommu
+          management_network_options[:iface_name] = management_network_iface_name
 
           unless management_network_mac.nil?
             management_network_options[:mac] = management_network_mac
@@ -196,6 +232,41 @@ module VagrantPlugins
 
           libvirt_networks
         end
+
+        def find_empty(array, start, stop)
+          (start..stop).each do |i|
+            return i unless array[i]
+          end
+          nil
+        end
+
+        # Return network name according to interface options.
+        def interface_network(driver, options)
+          # no need to get interface network for tcp tunnel config
+          return 'tunnel_interface' if options.fetch(:tunnel_type, nil)
+
+          if options[:network_name]
+            @logger.debug 'Found network by name'
+            return options[:network_name]
+          end
+
+          # Get list of all (active and inactive) Libvirt networks.
+          available_networks = libvirt_networks(driver)
+
+          return 'public' if options[:iface_type] == :public_network
+
+          if options[:ip]
+            address = network_address(options[:ip], options[:netmask])
+            available_networks.each do |network|
+              if address == network[:network_address]
+                @logger.debug 'Found network by ip'
+                return network[:name]
+              end
+            end
+          end
+
+          raise Errors::NetworkNotAvailableError, network_name: options[:ip]
+        end
       end
     end
   end

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.12.0
+0.12.2

data/spec/unit/action/create_network_interfaces.rb

@@ -92,6 +92,56 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateNetworkInterfaces do
       expect(subject.call(env)).to be_nil
     end
 
+    context 'management network' do
+      let(:domain_xml) {
+        # don't need full domain here, just enough for the network element to work
+        <<-EOF.unindent
+        <domain type='qemu'>
+          <devices>
+            <interface type='network'>
+              <alias name='ua-net-0'/>
+              <mac address='52:54:00:7d:14:0e'/>
+              <source network='vagrant-libvirt'/>
+              <target dev="myvnet0"></target>
+              <model type='virtio'/>
+              <driver iommu='off'/>
+              <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+            </interface>
+          </devices>
+        </domain>
+        EOF
+      }
+
+      before do
+        allow(libvirt_domain).to receive(:xml_desc).and_return(domain_xml)
+      end
+
+      context 'when iface name is set' do
+        let(:vagrantfile_providerconfig) {
+          <<-EOF
+          libvirt.management_network_iface_name = 'myvnet0'
+          EOF
+        }
+        let(:management_nic_xml) {
+          <<-EOF.unindent
+          <interface type="network">
+            <alias name="ua-net-0"></alias>
+            <source network="vagrant-libvirt"></source>
+            <target dev="myvnet0"></target>
+            <model type="virtio"></model>
+            <driver iommu="off"></driver>
+          </interface>
+          EOF
+        }
+
+        it 'should set target appropriately' do
+          expect(driver).to receive(:attach_device).with(management_nic_xml)
+
+          expect(subject.call(env)).to be_nil
+        end
+      end
+    end
+
     context 'private network' do
       let(:vagrantfile) do
         <<-EOF

data/spec/unit/action/start_domain_spec/clock_timer_removed.xml

@@ -23,6 +23,12 @@
     
   </clock>
   <devices>
+    <interface type='network'>
+      <alias name='ua-net-0'/>
+      <source network='vagrant-libvirt'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </interface>
     <serial type='pty'>
       <target port='0'/>
     </serial>

data/spec/unit/action/start_domain_spec/clock_timer_rtc.xml

@@ -23,6 +23,12 @@
     <timer name='rtc'/>
   </clock>
   <devices>
+    <interface type='network'>
+      <alias name='ua-net-0'/>
+      <source network='vagrant-libvirt'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </interface>
     <serial type='pty'>
       <target port='0'/>
     </serial>

data/spec/unit/action/start_domain_spec/clock_timer_rtc_tsc.xml

@@ -24,6 +24,12 @@
     <timer name='tsc'/>
   </clock>
   <devices>
+    <interface type='network'>
+      <alias name='ua-net-0'/>
+      <source network='vagrant-libvirt'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </interface>
     <serial type='pty'>
       <target port='0'/>
     </serial>

data/spec/unit/action/start_domain_spec/default.xml

@@ -21,6 +21,12 @@
   </features>
   <clock offset='utc'/>
   <devices>
+    <interface type='network'>
+      <alias name='ua-net-0'/>
+      <source network='vagrant-libvirt'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </interface>
     <serial type='pty'>
       <target port='0'/>
     </serial>

data/spec/unit/action/start_domain_spec/default_added_tpm_path.xml

@@ -21,6 +21,12 @@
   </features>
   <clock offset='utc'/>
   <devices>
+    <interface type='network'>
+      <alias name='ua-net-0'/>
+      <source network='vagrant-libvirt'/>
+      <model type='virtio'/>
+      <address bus='0x00' domain='0x0000' function='0x0' slot='0x05' type='pci'/>
+    </interface>
     <serial type='pty'>
       <target port='0'/>
     </serial>

data/spec/unit/action/start_domain_spec/default_added_tpm_version.xml

@@ -21,6 +21,12 @@
   </features>
   <clock offset='utc'/>
   <devices>
+    <interface type='network'>
+      <alias name='ua-net-0'/>
+      <source network='vagrant-libvirt'/>
+      <model type='virtio'/>
+      <address bus='0x00' domain='0x0000' function='0x0' slot='0x05' type='pci'/>
+    </interface>
     <serial type='pty'>
       <target port='0'/>
     </serial>

data/spec/unit/action/start_domain_spec/default_with_different_formatting.xml

@@ -22,6 +22,12 @@
   </features>
   <clock offset='utc'/>
   <devices>
+    <interface type='network'>
+      <alias name='ua-net-0'/>
+      <source network='vagrant-libvirt'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </interface>
     <serial type='pty'>
       <target port='0'/>
     </serial>

data/spec/unit/action/start_domain_spec/existing_with_iommu.xml

@@ -0,0 +1,64 @@
+<domain type='qemu'>
+  <name>vagrant-libvirt_default</name>
+  <uuid>881a931b-0110-4d10-81aa-47a1a19f5726</uuid>
+  <description>Source: /home/test/vagrant-libvirt/Vagrantfile</description>
+  <memory unit='KiB'>2097152</memory>
+  <currentMemory unit='KiB'>2097152</currentMemory>
+  <vcpu placement='static'>2</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-i440fx-6.0'>hvm</type>
+    <bootmenu enable='no'/>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode='host-model' check='partial'/>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/vagrant-libvirt_default.img'/>
+      <target dev='vda' bus='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </disk>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <interface type='network'>
+      <alias name='ua-net-0'/>
+      <source network='vagrant-libvirt'/>
+      <model type='virtio'/>
+      <driver iommu='on'/>
+      <address bus='0x00' domain='0x0000' function='0x0' slot='0x05' type='pci'/>
+    </interface>
+    <serial type='pty'>
+      <target type='isa-serial' port='0'>
+        <model name='isa-serial'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us' websocket='-1'>
+      <listen type='address' address='127.0.0.1'/>
+    </graphics>
+    <audio id='1' type='none'/>
+    <video>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </video>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>

data/spec/unit/action/start_domain_spec/existing_with_two_interfaces_iommu.xml

@@ -0,0 +1,71 @@
+<domain type='qemu'>
+  <name>vagrant-libvirt_default</name>
+  <uuid>881a931b-0110-4d10-81aa-47a1a19f5726</uuid>
+  <description>Source: /home/test/vagrant-libvirt/Vagrantfile</description>
+  <memory unit='KiB'>2097152</memory>
+  <currentMemory unit='KiB'>2097152</currentMemory>
+  <vcpu placement='static'>2</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc-i440fx-6.0'>hvm</type>
+    <bootmenu enable='no'/>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode='host-model' check='partial'/>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/vagrant-libvirt_default.img'/>
+      <target dev='vda' bus='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </disk>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <interface type='network'>
+      <alias name='ua-net-0'/>
+      <source network='vagrant-libvirt'/>
+      <model type='virtio'/>
+      <driver iommu='on'/>
+      <address bus='0x00' domain='0x0000' function='0x0' slot='0x05' type='pci'/>
+    </interface>
+    <interface type='network'>
+      <alias name='ua-net-1'/>
+      <source network='private'/>
+      <model type='virtio'/>
+      <driver iommu='on'/>
+      <address bus='0x00' domain='0x0000' function='0x0' slot='0x06' type='pci'/>
+    </interface>
+    <serial type='pty'>
+      <target type='isa-serial' port='0'>
+        <model name='isa-serial'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us' websocket='-1'>
+      <listen type='address' address='127.0.0.1'/>
+    </graphics>
+    <audio id='1' type='none'/>
+    <video>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </video>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>

data/spec/unit/action/start_domain_spec.rb

@@ -162,6 +162,109 @@ describe VagrantPlugins::ProviderLibvirt::Action::StartDomain do
       end
     end
 
+    context 'interface' do
+      let(:test_file) { 'existing_with_iommu.xml' }
+      let(:updated_domain_xml) {
+        new_xml = domain_xml.dup
+        new_xml.sub!(
+          /<model type='virtio'\/>\s+<driver iommu='on'\/>/m,
+          <<-EOF
+          <model type='e1000'/>
+          EOF
+        )
+        new_xml
+      }
+      let(:vagrantfile_providerconfig) {
+        <<-EOF
+        libvirt.management_network_model_type = 'e1000'
+        EOF
+      }
+
+      it 'should remove iommu if not interface model not virtio' do
+        expect(ui).to_not receive(:warn)
+        expect(connection).to receive(:define_domain).and_return(libvirt_domain)
+        expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml, updated_domain_xml)
+        expect(libvirt_domain).to receive(:autostart=)
+        expect(domain).to receive(:start)
+
+        expect(subject.call(env)).to be_nil
+      end
+
+      context 'iommu mismatch' do
+        let(:updated_domain_xml) {
+          new_xml = domain_xml.dup
+          new_xml.sub!(/(<model type='virtio'\/>\s+)<driver iommu='on'\/>/m) { |_|
+            match = Regexp.last_match
+
+            "#{match[1]}<driver iommu='off'/>"
+          }
+          new_xml
+        }
+        let(:vagrantfile_providerconfig) {
+          <<-EOF
+          libvirt.management_network_driver_iommu = false
+          EOF
+        }
+
+
+        it 'should update iommu to off' do
+          expect(ui).to_not receive(:warn)
+          expect(connection).to receive(:define_domain).and_return(libvirt_domain)
+          expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml, updated_domain_xml)
+          expect(libvirt_domain).to receive(:autostart=)
+          expect(domain).to receive(:start)
+
+          expect(subject.call(env)).to be_nil
+        end
+      end
+
+      context 'with additional interface' do
+        let(:test_file) { 'existing_with_two_interfaces_iommu.xml' }
+        let(:adapters) {
+          [
+            {:iface_type => :private_network, :model_type => "e1000", :network_name => "vagrant-libvirt", :driver_iommu => false},
+            {:iface_type => :private_network, :model_type => "virtio", :network_name => "vagrant-libvirt-1", :driver_iommu => true},
+          ]
+        }
+        before do
+          allow(subject).to receive(:network_interfaces).and_return(adapters)
+        end
+
+        it 'should only update the management interface' do
+          expect(updated_domain_xml).to match(/<source network='vagrant-libvirt'\/>\s+<model type='e1000'\/>/m)
+          expect(updated_domain_xml).to match(/<source network='private'\/>\s+<model type='virtio'\/>/m)
+
+          expect(ui).to_not receive(:warn)
+          expect(connection).to receive(:define_domain).and_return(libvirt_domain)
+          expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml, updated_domain_xml)
+          expect(libvirt_domain).to receive(:autostart=)
+          expect(domain).to receive(:start)
+
+          expect(subject.call(env)).to be_nil
+        end
+
+        context 'with more adapters configured than attached' do
+          let(:adapters) {
+            [
+              {:iface_type => :private_network, :model_type => "e1000", :network_name => "vagrant-libvirt", :driver_iommu => false},
+              {:iface_type => :private_network, :model_type => "virtio", :network_name => "vagrant-libvirt-1", :driver_iommu => true},
+              {:iface_type => :private_network, :model_type => "virtio", :network_name => "vagrant-libvirt-2", :driver_iommu => true},
+            ]
+          }
+
+          it 'should update and trigger a warning about mismatched adapters' do
+            expect(ui).to receive(:warn).with(/number of network adapters in current config \(3\) is different to attached interfaces \(2\)/)
+            expect(connection).to receive(:define_domain).and_return(libvirt_domain)
+            expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml, updated_domain_xml)
+            expect(libvirt_domain).to receive(:autostart=)
+            expect(domain).to receive(:start)
+
+            expect(subject.call(env)).to be_nil
+          end
+        end
+      end
+    end
+
     context 'cpu' do
       let(:test_file) { 'existing.xml' }
       let(:updated_domain_xml) {

data/spec/unit/provider_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'support/sharedcontext'
+
+describe 'VagrantPlugins::ProviderLibvirt::Provider' do
+  require 'vagrant-libvirt/provider'
+
+  include_context 'unit'
+
+  describe '#ssh_info' do
+  end
+end

data/spec/unit/util/network_util_spec.rb

@@ -8,28 +8,29 @@ describe 'VagrantPlugins::ProviderLibvirt::Util::NetworkUtil' do
   include_context 'libvirt'
 
   subject do
-    Class.new {
+    Class.new do
       include VagrantPlugins::ProviderLibvirt::Util::NetworkUtil
 
       def initialize
         @logger = Log4r::Logger.new('test-logger')
       end
-    }.new
+    end.new
   end
 
-  def create_libvirt_network(name, attrs={})
+  def create_libvirt_network(name, attrs = {})
     default_attrs = {
-      :active? => true,
-      :autostart? => true,
+      active?: true,
+      autostart?: true
     }
-    network_xml = File.read(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), name + '.xml'))
+    network_xml = File.read(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), "#{name}.xml"))
     double = instance_double(::Libvirt::Network)
     allow(double).to receive(:xml_desc).and_return(network_xml)
     allow(double).to receive(:name).and_return(name)
 
     xml = REXML::Document.new(network_xml)
     bridge = REXML::XPath.first(xml, '/network/bridge')
-    default_attrs[:bridge_name] = !bridge.nil? ? bridge.attributes['name'] : Libvirt::Error.new("network #{name} does not have attribute bridge_name")
+    default_attrs[:bridge_name] =
+      !bridge.nil? ? bridge.attributes['name'] : Libvirt::Error.new("network #{name} does not have attribute bridge_name")
 
     default_attrs.merge(attrs).each do |aname, avalue|
       if avalue.is_a?(Exception)
@@ -50,10 +51,133 @@ describe 'VagrantPlugins::ProviderLibvirt::Util::NetworkUtil' do
       expect(logger).to_not receive(:debug)
       expect(driver).to receive(:list_all_networks).and_return([default_network, additional_network])
 
-      expect(subject.libvirt_networks(driver)).to match_array([
-        hash_including(:name => 'default'),
-        hash_including(:name => 'vagrant-libvirt'),
-      ])
+      expect(subject.libvirt_networks(driver)).to match_array(
+        [
+          hash_including(name: 'default'),
+          hash_including(name: 'vagrant-libvirt')
+        ]
+      )
+    end
+  end
+
+  describe '#network_interfaces' do
+    let(:configured_networks_all) do
+      [
+        {
+          iface_type: :private_network,
+          ip: '192.168.121.0',
+          netmask: '255.255.255.0',
+          network_name: 'vagrant-libvirt',
+        },
+        {
+          auto_correct: true,
+          iface_type: :forwarded_port,
+        },
+        {
+          iface_type: :private_network,
+          ip: '192.168.123.0',
+          netmask: '255.255.255.0',
+          network_name: 'vagrant-libvirt-1',
+        },
+        {
+          iface_type: :private_network,
+          ip: '192.168.124.0',
+          netmask: '255.255.255.0',
+          network_name: 'vagrant-libvirt-2',
+        },
+      ]
+    end
+    let(:configured_networks) do
+      [
+        configured_networks_all[0]
+      ]
+    end
+
+    before do
+      expect(subject).to receive(:configured_networks).with(machine, logger).and_return(configured_networks)
+    end
+
+    it 'should return a list of default adapters configured' do
+      expect(logger).to receive(:debug).with('Adapter not specified so found slot 0')
+      expect(logger).to receive(:debug).with('Found network by name')
+
+      expect(subject.network_interfaces(machine, logger)).to match_array([configured_networks[0]])
+    end
+
+    context 'with forwarded ports' do
+      let(:configured_networks) do
+        [
+          configured_networks_all[0],
+          configured_networks_all[1]
+        ]
+      end
+
+      it 'should skip the forwarded port' do
+        expect(logger).to receive(:debug).with('Adapter not specified so found slot 0')
+        expect(logger).to receive(:debug).with('Found network by name')
+
+        expect(subject.network_interfaces(machine, logger)).to match_array([configured_networks[0]])
+      end
+    end
+
+    context 'with 2 additional private networks with adapter set' do
+      let(:configured_networks) do
+        [
+          configured_networks_all[0],
+          configured_networks_all[2].merge(:adapter => 2),
+          configured_networks_all[3],
+        ]
+      end
+
+      it 'should return the first private network last' do
+        expect(logger).to receive(:debug).with('Adapter not specified so found slot 0')
+        expect(logger).to receive(:debug).with('Found network by name').exactly(3).times
+        expect(logger).to receive(:debug).with('Using specified adapter slot 2')
+        expect(logger).to receive(:debug).with('Adapter not specified so found slot 1')
+
+        expect(subject.network_interfaces(machine, logger)).to match_array(
+          [
+            configured_networks[0],
+            configured_networks[2],
+            configured_networks[1]
+          ]
+        )
+      end
+    end
+  end
+
+  describe '#configured_networks' do
+    it 'should return a list of default adapters configured' do
+      expect(logger).to receive(:info).with('Using vagrant-libvirt at 192.168.121.0/24 as the management network nat is the mode')
+      expect(logger).to receive(:debug).with(/In config found network type forwarded_port options/)
+
+      expect(subject.configured_networks(machine, logger)).to match_array(
+        [
+          hash_including(
+            {
+              forward_mode: 'nat',
+              iface_type: :private_network,
+              ip: '192.168.121.0',
+              model_type: 'virtio',
+              netmask: '255.255.255.0',
+              network_name: 'vagrant-libvirt',
+            }
+          ),
+          hash_including(
+            {
+              auto_correct: true,
+              forward_mode: 'nat',
+              guest: 22,
+              host: 2222,
+              host_ip: '127.0.0.1',
+              id: 'ssh',
+              iface_type: :forwarded_port,
+              netmask: '255.255.255.0',
+              protocol: 'tcp',
+            }
+          )
+        ]
+      )
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.2
 platform: ruby
 authors:
 - Lukas Stanek
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-22 00:00:00.000000000 Z
+date: 2023-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-libvirt
@@ -159,12 +159,16 @@ email:
 - pronix.service@gmail.com
 - brian@polibyte.com
 - daragh.bailey@gmail.com
-executables: []
+executables:
+- stackprof-flamegraph.pl
+- stackprof-gprof2dot.py
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/stackprof-flamegraph.pl
+- bin/stackprof-gprof2dot.py
 - lib/vagrant-libvirt.rb
 - lib/vagrant-libvirt/action.rb
 - lib/vagrant-libvirt/action/clean_machine_folder.rb
@@ -174,7 +178,6 @@ files:
 - lib/vagrant-libvirt/action/create_network_interfaces.rb
 - lib/vagrant-libvirt/action/create_networks.rb
 - lib/vagrant-libvirt/action/destroy_domain.rb
-- lib/vagrant-libvirt/action/destroy_domain_confirm.rb
 - lib/vagrant-libvirt/action/destroy_networks.rb
 - lib/vagrant-libvirt/action/forward_ports.rb
 - lib/vagrant-libvirt/action/halt_domain.rb
@@ -230,6 +233,7 @@ files:
 - lib/vagrant-libvirt/util/domain_flags.rb
 - lib/vagrant-libvirt/util/erb_template.rb
 - lib/vagrant-libvirt/util/error_codes.rb
+- lib/vagrant-libvirt/util/hash_with_blank_filter.rb
 - lib/vagrant-libvirt/util/network_util.rb
 - lib/vagrant-libvirt/util/nfs.rb
 - lib/vagrant-libvirt/util/resolvers.rb
@@ -316,6 +320,8 @@ files:
 - spec/unit/action/start_domain_spec/existing.xml
 - spec/unit/action/start_domain_spec/existing_added_nvram.xml
 - spec/unit/action/start_domain_spec/existing_reordered.xml
+- spec/unit/action/start_domain_spec/existing_with_iommu.xml
+- spec/unit/action/start_domain_spec/existing_with_two_interfaces_iommu.xml
 - spec/unit/action/start_domain_spec/nvram_domain.xml
 - spec/unit/action/start_domain_spec/nvram_domain_other_setting.xml
 - spec/unit/action/start_domain_spec/nvram_domain_removed.xml
@@ -327,6 +333,7 @@ files:
 - spec/unit/config_spec.rb
 - spec/unit/driver_spec.rb
 - spec/unit/plugin_spec.rb
+- spec/unit/provider_spec.rb
 - spec/unit/templates/domain_all_settings.xml
 - spec/unit/templates/domain_cpu_mode_passthrough.xml
 - spec/unit/templates/domain_custom_cpu_model.xml
@@ -442,6 +449,8 @@ test_files:
 - spec/unit/action/start_domain_spec/existing.xml
 - spec/unit/action/start_domain_spec/existing_added_nvram.xml
 - spec/unit/action/start_domain_spec/existing_reordered.xml
+- spec/unit/action/start_domain_spec/existing_with_iommu.xml
+- spec/unit/action/start_domain_spec/existing_with_two_interfaces_iommu.xml
 - spec/unit/action/start_domain_spec/nvram_domain.xml
 - spec/unit/action/start_domain_spec/nvram_domain_other_setting.xml
 - spec/unit/action/start_domain_spec/nvram_domain_removed.xml
@@ -454,6 +463,7 @@ test_files:
 - spec/unit/config_spec.rb
 - spec/unit/driver_spec.rb
 - spec/unit/plugin_spec.rb
+- spec/unit/provider_spec.rb
 - spec/unit/templates/domain_all_settings.xml
 - spec/unit/templates/domain_cpu_mode_passthrough.xml
 - spec/unit/templates/domain_custom_cpu_model.xml

data/lib/vagrant-libvirt/action/destroy_domain_confirm.rb

@@ -1,22 +0,0 @@
-
-require "vagrant/action/builtin/confirm"
-
-module VagrantPlugins
-  module VagrantLibvirt
-    module Action
-      class DestroyDomainConfirm < Vagrant::Action::Builtin::Confirm
-        def initialize(app, env)
-          force_key = :force_confirm_destroy
-          message   = I18n.t("vagrant_libvirt.destroy_domain.confirmation",
-                             name: env[:machine].name)
-
-          super(app, env, message, force_key, allowed: ["y", "n", "Y", "N"])
-        end
-
-        def call(env)
-
-        end
-      end
-    end
-  end
-end