vagrant-libvirt 0.10.8 → 0.11.1

data/spec/unit/templates/domain_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'support/sharedcontext'
+require_relative '../../spec_helper'
 
 require 'vagrant-libvirt/config'
 require 'vagrant-libvirt/util/erb_template'
@@ -67,6 +67,9 @@ describe 'templates/domain' do
       domain.clock_timer(name: 't2', track: 'b', tickpolicy: 'c', frequency: 'd', mode: 'e',  present: 'yes')
       domain.hyperv_feature(name: 'spinlocks', state: 'on', retries: '4096')
       domain.cputopology(sockets: '1', cores: '3', threads: '2')
+      domain.memtune(type: 'hard_limit', value: '250000')
+      domain.memtune(type: 'soft_limit', value: '200000')
+      domain.cpuaffinitiy(0 => '0')
       domain.machine_type = 'pc-compatible'
       domain.machine_arch = 'x86_64'
       domain.loader = '/efi/loader'
@@ -77,9 +80,12 @@ describe 'templates/domain' do
       domain.instance_variable_set('@domain_volume_cache', 'deprecated')
       domain.disk_bus = 'ide'
       domain.disk_device = 'vda'
+      domain.disk_address_type = 'virtio-mmio'
       domain.disk_driver(:cache => 'unsafe', :io => 'threads', :copy_on_read => 'on', :discard => 'unmap', :detect_zeroes => 'on')
       domain.storage(:file, path: 'test-disk1.qcow2')
       domain.storage(:file, path: 'test-disk2.qcow2', io: 'threads', copy_on_read: 'on', discard: 'unmap', detect_zeroes: 'on')
+      domain.storage(:file, path: 'test-disk3.qcow2', address_type: 'pci')
+      domain.storage(:file, device: :floppy)
       domain.storage(:file, device: :cdrom)
       domain.storage(:file, device: :cdrom)
       domain.channel(type: 'unix',
@@ -137,12 +143,14 @@ describe 'templates/domain' do
       domain.domain_volumes.push({
         :cache => 'unsafe',
         :bus => domain.disk_bus,
-        :absolute_path => '/var/lib/libvirt/images/test.qcow2'
+        :absolute_path => '/var/lib/libvirt/images/test.qcow2',
+        :address_type => 'virtio-mmio',
       })
       domain.domain_volumes.push({
         :cache => 'unsafe',
         :bus => domain.disk_bus,
-        :absolute_path => '/var/lib/libvirt/images/test2.qcow2'
+        :absolute_path => '/var/lib/libvirt/images/test2.qcow2',
+        :address_type => 'virtio-mmio',
       })
       resolve
 

data/spec/unit/templates/tpm/version_1.2.xml

@@ -10,6 +10,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -28,8 +29,9 @@
     <console type='pty'>
       <target port='0'/>
     </console>
-    <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'/>
+    <input type='mouse' bus='ps2'>
+    </input>
+    <graphics type='vnc' port='-1' autoport='yes' websocket='-1' listen='127.0.0.1' keymap='en-us'/>
     <video>
       <model type='cirrus' vram='16384' heads='1'/>
     </video>

data/spec/unit/templates/tpm/version_2.0.xml

@@ -10,6 +10,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -28,8 +29,9 @@
     <console type='pty'>
       <target port='0'/>
     </console>
-    <input type='mouse' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'/>
+    <input type='mouse' bus='ps2'>
+    </input>
+    <graphics type='vnc' port='-1' autoport='yes' websocket='-1' listen='127.0.0.1' keymap='en-us'/>
     <video>
       <model type='cirrus' vram='16384' heads='1'/>
     </video>

data/spec/unit/util/byte_number_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require_relative '../../spec_helper'
 
 require 'vagrant-libvirt/util/byte_number'
 

data/spec/unit/util/network_util_spec/default.xml

@@ -0,0 +1,16 @@
+<network>
+  <name>default</name>
+  <uuid>39e02111-c66c-4653-86a9-8d20673a4eb1</uuid>
+  <forward mode='nat'>
+    <nat>
+      <port start='1024' end='65535'/>
+    </nat>
+  </forward>
+  <bridge name='virbr0' stp='on' delay='0'/>
+  <mac address='74-c3-fd-27-a8-c9'/>
+  <ip address='192.168.122.1' netmask='255.255.255.0'>
+    <dhcp>
+      <range start='192.168.122.2' end='192.168.122.254'/>
+    </dhcp>
+  </ip>
+</network>

data/spec/unit/util/network_util_spec/hostdev.xml

@@ -0,0 +1,6 @@
+<network>
+  <name>passthrough</name>
+  <forward mode='hostdev' managed='yes'>
+    <pf dev='eth3'/>
+  </forward>
+</network>

data/spec/unit/util/network_util_spec/vagrant-libvirt.xml

@@ -0,0 +1,16 @@
+<network connections='1' ipv6='yes'>
+  <name>vagrant-libvirt</name>
+  <uuid>7347e8a9-bd25-409c-b4c3-ebf8744322bc</uuid>
+  <forward mode='nat'>
+    <nat>
+      <port start='1024' end='65535'/>
+    </nat>
+  </forward>
+  <bridge name='virbr1' stp='on' delay='0'/>
+  <mac address='52:54:00:d1:56:08'/>
+  <ip address='192.168.121.1' netmask='255.255.255.0'>
+    <dhcp>
+      <range start='192.168.121.1' end='192.168.121.254'/>
+    </dhcp>
+  </ip>
+</network>

data/spec/unit/util/network_util_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require_relative '../../spec_helper'
+
+require 'vagrant-libvirt/util/network_util'
+
+describe 'VagrantPlugins::ProviderLibvirt::Util::NetworkUtil' do
+  include_context 'libvirt'
+
+  subject do
+    Class.new {
+      include VagrantPlugins::ProviderLibvirt::Util::NetworkUtil
+
+      def initialize
+        @logger = Log4r::Logger.new('test-logger')
+      end
+    }.new
+  end
+
+  def create_libvirt_network(name, attrs={})
+    default_attrs = {
+      :active? => true,
+      :autostart? => true,
+    }
+    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.merge(attrs).each do |aname, avalue|
+      if avalue.is_a?(Exception)
+        allow(double).to receive(aname).and_raise(avalue)
+      else
+        allow(double).to receive(aname).and_return(avalue)
+      end
+    end
+
+    double
+  end
+
+  describe '#libvirt_networks' do
+    let(:default_network) { create_libvirt_network('default') }
+    let(:additional_network) { create_libvirt_network('vagrant-libvirt') }
+
+    it 'should retrieve the list of networks' 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'),
+      ])
+    end
+  end
+end

data/spec/unit/util/resolvers_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require_relative '../../spec_helper'
 
 require 'vagrant-libvirt/util/resolvers'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.11.1
 platform: ruby
 authors:
 - Lukas Stanek
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-libvirt
@@ -241,6 +241,7 @@ files:
 - lib/vagrant-libvirt/version.rb
 - locales/en.yml
 - spec/acceptance/additional_storage_spec.rb
+- spec/acceptance/networking_spec.rb
 - spec/acceptance/package_domain_spec.rb
 - spec/acceptance/provider_settings_spec.rb
 - spec/acceptance/simple_vm_provision_via_shell_spec.rb
@@ -259,8 +260,8 @@ files:
 - spec/support/libvirt_acceptance_context.rb
 - spec/support/libvirt_context.rb
 - spec/support/matchers/have_file_content.rb
-- spec/support/sharedcontext.rb
 - spec/support/temporary_dir.rb
+- spec/support/unit_context.rb
 - spec/unit/action/clean_machine_folder_spec.rb
 - spec/unit/action/cleanup_on_failure_spec.rb
 - spec/unit/action/create_domain_spec.rb
@@ -317,6 +318,7 @@ files:
 - spec/unit/action/start_domain_spec/nvram_domain_removed.xml
 - spec/unit/action/wait_till_up_spec.rb
 - spec/unit/action_spec.rb
+- spec/unit/cap/mount_9p_spec.rb
 - spec/unit/cap/synced_folder_9p_spec.rb
 - spec/unit/cap/synced_folder_virtiofs_spec.rb
 - spec/unit/config_spec.rb
@@ -333,6 +335,10 @@ files:
 - spec/unit/templates/tpm/version_1.2.xml
 - spec/unit/templates/tpm/version_2.0.xml
 - spec/unit/util/byte_number_spec.rb
+- spec/unit/util/network_util_spec.rb
+- spec/unit/util/network_util_spec/default.xml
+- spec/unit/util/network_util_spec/hostdev.xml
+- spec/unit/util/network_util_spec/vagrant-libvirt.xml
 - spec/unit/util/resolvers_spec.rb
 homepage: https://github.com/vagrant-libvirt/vagrant-libvirt
 licenses:
@@ -354,102 +360,108 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: libvirt provider for Vagrant.
 test_files:
+- spec/acceptance/additional_storage_spec.rb
+- spec/acceptance/networking_spec.rb
 - spec/acceptance/package_domain_spec.rb
 - spec/acceptance/provider_settings_spec.rb
-- spec/acceptance/two_disks_spec.rb
-- spec/acceptance/additional_storage_spec.rb
+- spec/acceptance/simple_vm_provision_via_shell_spec.rb
+- spec/acceptance/snapshots_spec.rb
 - spec/acceptance/support-skeletons/package_complex/Vagrantfile.testbox
 - spec/acceptance/support-skeletons/package_complex/scripts/sysprep.sh
 - spec/acceptance/support-skeletons/package_simple/Vagrantfile.testbox
-- spec/acceptance/simple_vm_provision_via_shell_spec.rb
-- spec/acceptance/snapshots_spec.rb
+- spec/acceptance/two_disks_spec.rb
 - spec/acceptance/use_qemu_agent_for_connectivity_spec.rb
-- spec/support/matchers/have_file_content.rb
-- spec/support/binding_proc.rb
-- spec/support/acceptance/context.rb
+- spec/spec_helper.rb
 - spec/support/acceptance/configuration.rb
+- spec/support/acceptance/context.rb
 - spec/support/acceptance/isolated_environment.rb
+- spec/support/binding_proc.rb
 - spec/support/environment_helper.rb
+- spec/support/libvirt_acceptance_context.rb
 - spec/support/libvirt_context.rb
+- spec/support/matchers/have_file_content.rb
 - spec/support/temporary_dir.rb
-- spec/support/libvirt_acceptance_context.rb
-- spec/support/sharedcontext.rb
-- spec/unit/config_spec.rb
-- spec/unit/action_spec.rb
-- spec/unit/cap/synced_folder_9p_spec.rb
-- spec/unit/cap/synced_folder_virtiofs_spec.rb
-- spec/unit/plugin_spec.rb
-- spec/unit/driver_spec.rb
-- spec/unit/templates/domain_custom_cpu_model.xml
-- spec/unit/templates/domain_all_settings.xml
-- spec/unit/templates/domain_spec.rb
-- spec/unit/templates/domain_defaults.xml
-- spec/unit/templates/domain_scsi_multiple_controllers_storage.xml
-- spec/unit/templates/domain_cpu_mode_passthrough.xml
-- spec/unit/templates/domain_scsi_bus_storage.xml
-- spec/unit/templates/domain_scsi_device_storage.xml
-- spec/unit/templates/tpm/version_1.2.xml
-- spec/unit/templates/tpm/version_2.0.xml
-- spec/unit/util/byte_number_spec.rb
-- spec/unit/util/resolvers_spec.rb
-- spec/unit/action/package_domain_spec.rb
-- spec/unit/action/set_boot_order_spec.rb
-- spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_1.xml
-- spec/unit/action/create_domain_volume_spec/one_disk_in_storage.xml
-- spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_2.xml
-- spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_0.xml
-- spec/unit/action/destroy_domain_spec.rb
-- spec/unit/action/set_name_of_domain_spec.rb
-- spec/unit/action/remove_libvirt_image_spec.rb
-- spec/unit/action/halt_domain_spec.rb
-- spec/unit/action/set_boot_order_spec/explicit_boot_order.xml
-- spec/unit/action/set_boot_order_spec/default.xml
+- spec/support/unit_context.rb
+- spec/unit/action/clean_machine_folder_spec.rb
+- spec/unit/action/cleanup_on_failure_spec.rb
 - spec/unit/action/create_domain_spec/additional_disks_domain.xml
+- spec/unit/action/create_domain_spec/custom_disk_settings.xml
 - spec/unit/action/create_domain_spec/default_domain.xml
-- spec/unit/action/create_domain_spec/sysinfo.xml
 - spec/unit/action/create_domain_spec/default_user_storage_pool.xml
-- spec/unit/action/create_domain_spec/custom_disk_settings.xml
+- spec/unit/action/create_domain_spec/sysinfo.xml
 - spec/unit/action/create_domain_spec/sysinfo_only_required.xml
 - spec/unit/action/create_domain_spec/two_disk_settings.xml
+- spec/unit/action/create_domain_spec.rb
+- spec/unit/action/create_domain_volume_spec/one_disk_in_storage.xml
+- spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_0.xml
+- spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_1.xml
+- spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_2.xml
 - spec/unit/action/create_domain_volume_spec.rb
+- spec/unit/action/destroy_domain_spec/additional_disks_domain.xml
+- spec/unit/action/destroy_domain_spec/box_multiple_disks.xml
+- spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks.xml
+- spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks_no_aliases.xml
+- spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_disks.xml
+- spec/unit/action/destroy_domain_spec/cdrom_domain.xml
+- spec/unit/action/destroy_domain_spec.rb
+- spec/unit/action/forward_ports_spec.rb
+- spec/unit/action/halt_domain_spec.rb
+- spec/unit/action/handle_box_image_spec.rb
+- spec/unit/action/package_domain_spec.rb
+- spec/unit/action/prepare_nfs_settings_spec.rb
+- spec/unit/action/remove_libvirt_image_spec.rb
 - spec/unit/action/resolve_disk_settings_spec/default_domain.xml
-- spec/unit/action/resolve_disk_settings_spec/multi_volume_box.xml
 - spec/unit/action/resolve_disk_settings_spec/default_no_aliases.xml
-- spec/unit/action/resolve_disk_settings_spec/multi_volume_box_additional_storage.xml
-- spec/unit/action/resolve_disk_settings_spec/multi_volume_box_additional_and_custom_no_aliases.xml
 - spec/unit/action/resolve_disk_settings_spec/default_system_storage_pool.xml
-- spec/unit/action/handle_box_image_spec.rb
-- spec/unit/action/wait_till_up_spec.rb
-- spec/unit/action/cleanup_on_failure_spec.rb
-- spec/unit/action/clean_machine_folder_spec.rb
+- spec/unit/action/resolve_disk_settings_spec/multi_volume_box.xml
+- spec/unit/action/resolve_disk_settings_spec/multi_volume_box_additional_and_custom_no_aliases.xml
+- spec/unit/action/resolve_disk_settings_spec/multi_volume_box_additional_storage.xml
 - spec/unit/action/resolve_disk_settings_spec.rb
-- spec/unit/action/start_domain_spec.rb
+- spec/unit/action/set_boot_order_spec/default.xml
+- spec/unit/action/set_boot_order_spec/explicit_boot_order.xml
+- spec/unit/action/set_boot_order_spec.rb
+- spec/unit/action/set_name_of_domain_spec.rb
+- spec/unit/action/shutdown_domain_spec.rb
+- spec/unit/action/start_domain_spec/clock_timer_removed.xml
+- spec/unit/action/start_domain_spec/clock_timer_rtc.xml
+- spec/unit/action/start_domain_spec/clock_timer_rtc_tsc.xml
+- spec/unit/action/start_domain_spec/default.xml
 - spec/unit/action/start_domain_spec/default_added_tpm_path.xml
-- spec/unit/action/start_domain_spec/nvram_domain.xml
 - spec/unit/action/start_domain_spec/default_added_tpm_version.xml
-- spec/unit/action/start_domain_spec/default.xml
-- spec/unit/action/start_domain_spec/clock_timer_rtc_tsc.xml
-- spec/unit/action/start_domain_spec/nvram_domain_removed.xml
+- spec/unit/action/start_domain_spec/default_with_different_formatting.xml
+- 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/nvram_domain.xml
 - spec/unit/action/start_domain_spec/nvram_domain_other_setting.xml
-- spec/unit/action/start_domain_spec/clock_timer_removed.xml
-- spec/unit/action/start_domain_spec/existing_added_nvram.xml
-- spec/unit/action/start_domain_spec/clock_timer_rtc.xml
-- spec/unit/action/start_domain_spec/existing.xml
-- spec/unit/action/start_domain_spec/default_with_different_formatting.xml
-- spec/unit/action/destroy_domain_spec/additional_disks_domain.xml
-- spec/unit/action/destroy_domain_spec/box_multiple_disks.xml
-- spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks_no_aliases.xml
-- spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_disks.xml
-- spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks.xml
-- spec/unit/action/destroy_domain_spec/cdrom_domain.xml
-- spec/unit/action/create_domain_spec.rb
-- spec/unit/action/prepare_nfs_settings_spec.rb
-- spec/unit/action/shutdown_domain_spec.rb
-- spec/unit/action/forward_ports_spec.rb
-- spec/spec_helper.rb
+- spec/unit/action/start_domain_spec/nvram_domain_removed.xml
+- spec/unit/action/start_domain_spec.rb
+- spec/unit/action/wait_till_up_spec.rb
+- spec/unit/action_spec.rb
+- spec/unit/cap/mount_9p_spec.rb
+- spec/unit/cap/synced_folder_9p_spec.rb
+- spec/unit/cap/synced_folder_virtiofs_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/driver_spec.rb
+- spec/unit/plugin_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
+- spec/unit/templates/domain_defaults.xml
+- spec/unit/templates/domain_scsi_bus_storage.xml
+- spec/unit/templates/domain_scsi_device_storage.xml
+- spec/unit/templates/domain_scsi_multiple_controllers_storage.xml
+- spec/unit/templates/domain_spec.rb
+- spec/unit/templates/tpm/version_1.2.xml
+- spec/unit/templates/tpm/version_2.0.xml
+- spec/unit/util/byte_number_spec.rb
+- spec/unit/util/network_util_spec/default.xml
+- spec/unit/util/network_util_spec/hostdev.xml
+- spec/unit/util/network_util_spec/vagrant-libvirt.xml
+- spec/unit/util/network_util_spec.rb
+- spec/unit/util/resolvers_spec.rb