vagrant-libvirt 0.8.0 → 0.9.0

data/spec/unit/action/start_domain_spec.rb

@@ -13,19 +13,19 @@ describe VagrantPlugins::ProviderLibvirt::Action::StartDomain do
   include_context 'unit'
   include_context 'libvirt'
 
-  let(:libvirt_domain) { double('libvirt_domain') }
-  let(:libvirt_client) { double('libvirt_client') }
   let(:servers) { double('servers') }
 
   let(:domain_xml) { File.read(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), test_file)) }
   let(:updated_domain_xml) { File.read(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), updated_test_file)) }
 
+  before do
+    allow(driver).to receive(:created?).and_return(true)
+  end
+
   describe '#call' do
     let(:test_file) { 'default.xml' }
 
     before do
-      allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver)
-        .to receive(:connection).and_return(connection)
       allow(connection).to receive(:client).and_return(libvirt_client)
       allow(libvirt_client).to receive(:lookup_domain_by_uuid).and_return(libvirt_domain)
 
@@ -43,7 +43,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::StartDomain do
     end
 
     it 'should execute without changing' do
-      allow(libvirt_domain).to receive(:undefine)
+      expect(libvirt_domain).to_not receive(:undefine)
       expect(libvirt_domain).to receive(:autostart=)
       expect(domain).to receive(:start)
 
@@ -54,7 +54,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::StartDomain do
       let(:test_file) { 'existing.xml' }
 
       it 'should execute without changing' do
-        allow(libvirt_domain).to receive(:undefine)
+        expect(libvirt_domain).to_not receive(:undefine)
         expect(libvirt_domain).to receive(:autostart=)
         expect(domain).to receive(:start)
 
@@ -62,6 +62,64 @@ describe VagrantPlugins::ProviderLibvirt::Action::StartDomain do
       end
     end
 
+    context 'nvram' do
+      context 'when being added to existing' do
+        let(:vagrantfile_providerconfig) do
+          <<-EOF
+          libvirt.loader = "/path/to/loader/file"
+          libvirt.nvram = "/path/to/nvram/file"
+          EOF
+        end
+        let(:test_file) { 'existing.xml' }
+        let(:updated_test_file) { 'existing_added_nvram.xml' }
+
+        it 'should undefine without passing flags' do
+          expect(libvirt_domain).to receive(:undefine).with(0)
+          expect(servers).to receive(:create).with(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 'when it was already in use' do
+        let(:vagrantfile_providerconfig) do
+          <<-EOF
+          libvirt.loader = "/path/to/loader/file"
+          libvirt.nvram = "/path/to/nvram/file"
+          # change another setting to trigger the undefine/create
+          libvirt.cpus = 4
+          EOF
+        end
+        let(:test_file) { 'nvram_domain.xml' }
+        let(:updated_test_file) { 'nvram_domain_other_setting.xml' }
+
+        it 'should set the flag to keep nvram' do
+          expect(libvirt_domain).to receive(:undefine).with(VagrantPlugins::ProviderLibvirt::Util::DomainFlags::VIR_DOMAIN_UNDEFINE_KEEP_NVRAM)
+          expect(servers).to receive(:create).with(xml: updated_domain_xml)
+          expect(libvirt_domain).to receive(:autostart=)
+          expect(domain).to receive(:start)
+
+          expect(subject.call(env)).to be_nil
+        end
+
+        context 'when it is being disabled' do
+          let(:vagrantfile_providerconfig) { }
+          let(:updated_test_file) { 'nvram_domain_removed.xml' }
+
+          it 'should set the flag to remove nvram' do
+            expect(libvirt_domain).to receive(:undefine).with(VagrantPlugins::ProviderLibvirt::Util::DomainFlags::VIR_DOMAIN_UNDEFINE_NVRAM)
+            expect(servers).to receive(:create).with(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 'tpm' do
       context 'passthrough tpm added' do
         let(:updated_test_file) { 'default_added_tpm_path.xml' }

data/spec/unit/action/wait_till_up_spec.rb

@@ -18,8 +18,6 @@ describe VagrantPlugins::ProviderLibvirt::Action::WaitTillUp do
 
   describe '#call' do
     before do
-      allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Provider).to receive(:driver)
-        .and_return(driver)
       allow(driver).to receive(:get_domain).and_return(domain)
       allow(driver).to receive(:state).and_return(:running)
       # return some information for domain when needed

data/spec/unit/action_spec.rb

@@ -14,13 +14,10 @@ describe VagrantPlugins::ProviderLibvirt::Action do
   include_context 'libvirt'
   include_context 'unit'
 
-  let(:libvirt_domain) { double('libvirt_domain') }
   let(:runner) { Vagrant::Action::Runner.new(env) }
   let(:state) { double('state') }
 
   before do
-    allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver)
-      .to receive(:connection).and_return(connection)
     allow(machine).to receive(:id).and_return('test-machine-id')
     allow(machine).to receive(:state).and_return(state)
 

data/spec/unit/config_spec.rb

@@ -630,6 +630,24 @@ describe VagrantPlugins::ProviderLibvirt::Config do
       end
     end
 
+    context 'with nvram defined' do
+      before do
+        subject.nvram = '/path/to/some/nvram'
+      end
+
+      it 'should be invalid as loader not set' do
+        assert_invalid
+      end
+
+      context 'with loader defined' do
+        it 'should be valid' do
+          subject.loader = '/path/to/some/loader'
+
+          assert_valid
+        end
+      end
+    end
+
     context 'with cpu_mode and cpu_model defined' do
       it 'should discard model if mode is passthrough' do
         subject.cpu_mode = 'host-passthrough'

data/spec/unit/driver_spec.rb

@@ -46,6 +46,8 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
     allow(machine.provider_config).to receive(:qemu_use_session).and_return(false)
     allow(logger).to receive(:info)
     allow(logger).to receive(:debug)
+    allow(machine.provider).to receive('driver').and_call_original
+    allow(machine2.provider).to receive('driver').and_call_original
   end
 
   describe '#connection' do

data/spec/unit/templates/domain_all_settings.xml

@@ -107,14 +107,20 @@
     </rng>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
-	<address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
+        <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
       </source>
     </hostdev>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
-	<address domain='0x0001' bus='0x03' slot='0x00' function='0x0'/>
+        <address domain='0x0001' bus='0x03' slot='0x00' function='0x0'/>
       </source>
     </hostdev>
+    <hostdev mode='subsystem' type='pci' managed='yes'>
+      <source>
+        <address domain='0x0002' bus='0x04' slot='0x00' function='0x0'/>
+      </source>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/>
+    </hostdev>
     <hostdev mode='subsystem' type='usb'>
       <source startupPolicy='mandatory'>
 	<vendor id='0x1234'/>

data/spec/unit/templates/domain_spec.rb

@@ -62,13 +62,13 @@ describe 'templates/domain' do
         :dev => 'vda',
         :cache => 'unsafe',
         :bus => domain.disk_bus,
-        :path => '/var/lib/libvirt/images/test.qcow2'
+        :absolute_path => '/var/lib/libvirt/images/test.qcow2'
       })
       domain.domain_volumes.push({
         :dev => 'vdb',
         :cache => 'unsafe',
         :bus => domain.disk_bus,
-        :path => '/var/lib/libvirt/images/test2.qcow2'
+        :absolute_path => '/var/lib/libvirt/images/test2.qcow2'
       })
       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')
@@ -92,6 +92,7 @@ describe 'templates/domain' do
       domain.serial(:type => 'file', :source => {:path => '/var/log/vm_consoles/machine.log'})
       domain.pci(bus: '0x06', slot: '0x12', function: '0x5')
       domain.pci(domain: '0x0001', bus: '0x03', slot: '0x00', function: '0x0')
+      domain.pci(domain: '0x0002', bus: '0x04', slot: '0x00', function: '0x0', guest_domain: '0x0000', guest_bus: '0x01', guest_slot: '0x01', guest_function: '0x0')
       domain.usb_controller(model: 'nec-xhci', ports: '4')
       domain.usb(bus: '1', device: '2', vendor: '0x1234', product: '0xabcd')
       domain.redirdev(type: 'tcp', host: 'localhost', port: '4000')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Lukas Stanek
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -75,14 +75,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +166,7 @@ files:
 - lib/vagrant-libvirt/action/read_mac_addresses.rb
 - lib/vagrant-libvirt/action/remove_libvirt_image.rb
 - lib/vagrant-libvirt/action/remove_stale_volume.rb
+- lib/vagrant-libvirt/action/resolve_disk_settings.rb
 - lib/vagrant-libvirt/action/resume_domain.rb
 - lib/vagrant-libvirt/action/set_boot_order.rb
 - lib/vagrant-libvirt/action/set_name_of_domain.rb
@@ -192,6 +193,7 @@ files:
 - lib/vagrant-libvirt/util.rb
 - lib/vagrant-libvirt/util/byte_number.rb
 - lib/vagrant-libvirt/util/collection.rb
+- 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/network_util.rb
@@ -216,7 +218,6 @@ files:
 - 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/default_system_storage_pool.xml
 - spec/unit/action/create_domain_spec/default_user_storage_pool.xml
 - spec/unit/action/create_domain_spec/two_disk_settings.xml
 - spec/unit/action/create_domain_volume_spec.rb
@@ -236,6 +237,13 @@ files:
 - 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/resolve_disk_settings_spec.rb
+- spec/unit/action/resolve_disk_settings_spec/default_domain.xml
+- spec/unit/action/resolve_disk_settings_spec/default_no_aliases.xml
+- spec/unit/action/resolve_disk_settings_spec/default_system_storage_pool.xml
+- 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/set_name_of_domain_spec.rb
 - spec/unit/action/shutdown_domain_spec.rb
 - spec/unit/action/start_domain_spec.rb
@@ -244,6 +252,10 @@ files:
 - spec/unit/action/start_domain_spec/default_added_tpm_path.xml
 - spec/unit/action/start_domain_spec/default_added_tpm_version.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/nvram_domain.xml
+- spec/unit/action/start_domain_spec/nvram_domain_other_setting.xml
+- 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/config_spec.rb
@@ -286,10 +298,9 @@ test_files:
 - spec/support/matchers/have_file_content.rb
 - spec/support/binding_proc.rb
 - spec/support/environment_helper.rb
-- spec/support/libvirt_context.rb
-- spec/support/sharedcontext.rb
 - spec/support/temporary_dir.rb
-- spec/unit/action/create_domain_spec/default_system_storage_pool.xml
+- spec/support/sharedcontext.rb
+- spec/support/libvirt_context.rb
 - spec/unit/action/create_domain_spec/default_user_storage_pool.xml
 - spec/unit/action/create_domain_spec/additional_disks_domain.xml
 - spec/unit/action/create_domain_spec/custom_disk_settings.xml
@@ -304,26 +315,37 @@ test_files:
 - spec/unit/action/start_domain_spec/default_added_tpm_path.xml
 - spec/unit/action/start_domain_spec/default_added_tpm_version.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/nvram_domain.xml
+- spec/unit/action/start_domain_spec/nvram_domain_other_setting.xml
+- spec/unit/action/start_domain_spec/nvram_domain_removed.xml
 - spec/unit/action/clean_machine_folder_spec.rb
-- spec/unit/action/cleanup_on_failure_spec.rb
-- spec/unit/action/destroy_domain_spec.rb
+- spec/unit/action/set_name_of_domain_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/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/set_name_of_domain_spec.rb
 - spec/unit/action/shutdown_domain_spec.rb
-- spec/unit/action/start_domain_spec.rb
-- spec/unit/action/create_domain_spec.rb
+- spec/unit/action/cleanup_on_failure_spec.rb
 - spec/unit/action/create_domain_volume_spec.rb
+- spec/unit/action/package_domain_spec.rb
+- spec/unit/action/start_domain_spec.rb
 - spec/unit/action/wait_till_up_spec.rb
-- spec/unit/action/forward_ports_spec.rb
+- spec/unit/action/create_domain_spec.rb
+- spec/unit/action/destroy_domain_spec.rb
+- spec/unit/action/handle_box_image_spec.rb
+- spec/unit/action/resolve_disk_settings_spec.rb
+- spec/unit/action/resolve_disk_settings_spec/default_domain.xml
+- spec/unit/action/resolve_disk_settings_spec/default_no_aliases.xml
+- spec/unit/action/resolve_disk_settings_spec/default_system_storage_pool.xml
+- 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/templates/tpm/version_1.2.xml
 - spec/unit/templates/tpm/version_2.0.xml
 - spec/unit/templates/domain_all_settings.xml