vagrant-libvirt 0.11.2 → 0.12.1

data/spec/unit/action_spec.rb

@@ -58,7 +58,7 @@ describe VagrantPlugins::ProviderLibvirt::Action do
   end
 
   def receive_and_call_next(&block)
-    return receive(:call) { |cls, env| call_next(cls, env, &block) }
+    return receive(:call) { |cls, env| call_next(cls, env, &block) }.exactly(1).times
   end
 
   def call_next(cls, env)
@@ -332,6 +332,25 @@ describe VagrantPlugins::ProviderLibvirt::Action do
         end
       end
     end
+
+    context 'running' do
+      before do
+        allow_action_env_result(VagrantPlugins::ProviderLibvirt::Action::IsCreated, true)
+        allow_action_env_result(VagrantPlugins::ProviderLibvirt::Action::IsRunning, true)
+        allow_action_env_result(VagrantPlugins::ProviderLibvirt::Action::IsSuspended, false)
+      end
+
+      it 'should call provision' do
+        expect_any_instance_of(Vagrant::Action::Builtin::BoxCheckOutdated).to receive_and_call_next
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::Provision).to receive_and_call_next
+        # ideally following two actions should not be scheduled if the machine is already running
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::ResolveDiskSettings).to receive_and_call_next
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::CreateNetworks).to receive_and_call_next
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::SetupComplete).to receive_and_call_next
+
+        expect(runner.run(subject.action_up)).to match(hash_including({:machine => machine}))
+      end
+    end
   end
 
   describe '#action_halt' do
@@ -389,6 +408,48 @@ describe VagrantPlugins::ProviderLibvirt::Action do
     end
   end
 
+  describe '#action_reload' do
+    context 'when not created' do
+      before do
+        allow_action_env_result(VagrantPlugins::ProviderLibvirt::Action::IsCreated, false)
+      end
+
+      it 'should report not created' do
+        expect(ui).to receive(:info).with('Domain is not created. Please run `vagrant up` first.')
+
+        expect(runner.run(subject.action_reload)).to match(hash_including({:machine => machine}))
+      end
+    end
+
+    context 'when halted' do
+      before do
+        allow_action_env_result(VagrantPlugins::ProviderLibvirt::Action::IsCreated, true)
+        allow_action_env_result(VagrantPlugins::ProviderLibvirt::Action::IsSuspended, false)
+        allow_action_env_result(VagrantPlugins::ProviderLibvirt::Action::IsRunning, false)
+      end
+
+      it 'should call reload' do
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::Provision).to receive_and_call_next
+        expect(subject).to receive(:action_halt).and_return(Vagrant::Action::Builder.new)
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::ResolveDiskSettings).to receive_and_call_next
+
+        # start action
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::PrepareNFSValidIds).to receive_and_call_next
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::SyncedFolderCleanup).to receive_and_call_next
+        expect_any_instance_of(Vagrant::Action::Builtin::SyncedFolders).to receive_and_call_next
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::PrepareNFSSettings).to receive_and_call_next
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::ShareFolders).to receive_and_call_next
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::SetBootOrder).to receive_and_call_next
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::StartDomain).to receive_and_call_next
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::WaitTillUp).to receive_and_call_next
+        expect_any_instance_of(Vagrant::Action::Builtin::WaitForCommunicator).to receive_and_call_next
+        expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::ForwardPorts).to receive_and_call_next
+
+        expect(runner.run(subject.action_reload)).to match(hash_including({:machine => machine}))
+      end
+    end
+  end
+
   describe '#action_suspend' do
     context 'not created' do
       before do

data/spec/unit/cap/mount_9p_spec.rb

@@ -15,6 +15,9 @@ describe 'VagrantPlugins::ProviderLibvirt::Cap::Mount9P' do
   end
 
   let(:options) { {} }
+  # Mock the guest operating system.
+  let(:guest)            { double('guest') }
+
   describe '#mount_9p_shared_folder' do
     let(:synced_folders) { {
       "/vagrant" => {
@@ -26,6 +29,7 @@ describe 'VagrantPlugins::ProviderLibvirt::Cap::Mount9P' do
     } }
 
     before do
+      allow(machine).to receive(:guest).and_return(guest)
       allow(guest).to receive(:capability).and_return('/home/vagrant/vagant')
       allow(communicator).to receive(:sudo).with('mkdir -p /home/vagrant/vagant')
     end

data/spec/unit/config_spec.rb

@@ -86,7 +86,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         ],
         [ # connect explicit to unix socket
           {:uri => "qemu+unix:///system"},
-          {:uri => "qemu+unix:///system", :connect_via_ssh => false, :host => nil, :username => nil},
+          {:uri => "qemu+unix:///system", :connect_via_ssh => false, :host => "", :username => nil},
         ],
         [ # via libssh2 should enable ssh as well
           {:uri => "qemu+libssh2://user@remote/system?known_hosts=/home/user/.ssh/known_hosts"},
@@ -139,7 +139,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         ],
         [ # with session and using ssh infer connect by ssh and ignore host as not provided
           {},
-          {:uri => "qemu+ssh:///session", :qemu_use_session => true, :connect_via_ssh => true, :host => nil},
+          {:uri => "qemu+ssh:///session", :qemu_use_session => true, :connect_via_ssh => true, :host => ""},
           {
             :env => {'LIBVIRT_DEFAULT_URI' => "qemu+ssh:///session"},
           }
@@ -768,8 +768,13 @@ describe VagrantPlugins::ProviderLibvirt::Config do
 
     context 'with mac defined' do
       let (:vm) { double('vm') }
+      let(:box) { instance_double(::Vagrant::Box) }
+
       before do
         machine.config.instance_variable_get("@keys")[:vm] = vm
+        allow(vm).to receive(:box).and_return(box)
+
+        allow(vm).to receive(:synced_folders).and_return({})
       end
 
       it 'is valid with valid mac' do
@@ -781,7 +786,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         network = [:public, { mac: 'aabbccddeeff' }]
         expect(vm).to receive(:networks).and_return([network])
         assert_valid
-        expect(network[1][:mac]).to eql('aa:bb:cc:dd:ee:ff')
+        expect(network[1][:mac]).to eql('aabbccddeeff')
       end
 
       it 'should be invalid if MAC not formatted correctly' do
@@ -798,8 +803,9 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         'virbr0',
       ] }
       let(:driver) { instance_double(::VagrantPlugins::ProviderLibvirt::Driver) }
+      let(:device_name) { 'eth0' }
       before do
-        machine.config.vm.network :public_network, dev: 'eth0', ip: "192.168.2.157"
+        machine.config.vm.network :public_network, dev: device_name, ip: "192.168.2.157"
         allow(machine.provider).to receive(:driver).and_return(driver)
         expect(driver).to receive(:host_devices).and_return(host_devices).at_least(:once).times
       end
@@ -809,9 +815,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
       end
 
       context 'when default device not on host' do
-        before do
-          machine.config.vm.network :public_network, dev: 'eno1', ip: "192.168.2.157"
-        end
+        let(:device_name) { 'eno1' }
 
         it 'should be invalid' do
           assert_invalid
@@ -819,9 +823,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
       end
 
       context 'when using excluded host device' do
-        before do
-          machine.config.vm.network :public_network, dev: 'virbr0', ip: "192.168.2.157"
-        end
+        let(:device_name) { 'virbr0' }
 
         it 'should be invalid' do
           assert_invalid
@@ -837,6 +839,27 @@ describe VagrantPlugins::ProviderLibvirt::Config do
           end
         end
       end
+
+      context 'when setting iface_name' do
+        let(:iface_name) { 'myvnet1' }
+
+        before do
+          machine.config.vm.network :public_network, libvirt__iface_name: iface_name, ip: "192.168.2.157"
+        end
+
+        it 'should valididate' do
+          assert_valid
+        end
+
+        context 'when set to reserved value' do
+          let(:iface_name) { 'vnet1' }
+
+          it 'should be invalid' do
+            errors = assert_invalid
+            expect(errors).to include(match(/network configuration for machine test with setting :libvirt__iface_name => '#{iface_name}' starts/))
+          end
+        end
+      end
     end
 
     context 'with nvram defined' do
@@ -996,10 +1019,16 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         EOF
       end
       let(:driver) { instance_double(::VagrantPlugins::ProviderLibvirt::Driver) }
+      let(:host_devices) { [
+        'lo',
+        'eth0',
+        'virbr0',
+      ] }
 
       before do
         allow(machine.provider).to receive(:driver).and_return(driver)
         allow(driver).to receive_message_chain('connection.client.libversion').and_return(6_002_000)
+        allow(driver).to receive(:host_devices).and_return(host_devices)
       end
 
       context 'when type is 9p' do

data/spec/unit/driver_spec.rb

@@ -42,40 +42,51 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
     # need to override the default package iso_env as using a different
     # name for the test machines above.
     let(:machine)    { iso_env.machine(:test1, :libvirt) }
-    let(:machine2)   { iso_env.machine(:test2, :libvirt) }
-    let(:connection1) { double("connection 1") }
-    let(:connection2) { double("connection 2") }
-    let(:system_connection1) { double("system connection 1") }
-    let(:system_connection2) { double("system connection 2") }
+    let(:connection) { double("connection 1") }
+    let(:system_connection) { double("system connection 1") }
 
     # make it easier for distros that want to switch the default value for
     # qemu_use_session to true by ensuring it is explicitly false for tests.
     before do
       allow(machine.provider).to receive('driver').and_call_original
-      allow(machine2.provider).to receive('driver').and_call_original
     end
 
     describe '#connection' do
+      let(:machine2)   { iso_env.machine(:test2, :libvirt) }
+      let(:connection2) { double("connection 2") }
+
+      before do
+        allow(machine2.provider).to receive('driver').and_call_original
+      end
+
       it 'should configure a separate connection per machine' do
         expect(Fog::Compute).to receive(:new).with(
-          hash_including({:libvirt_uri => 'qemu+ssh://user@remote1/system'})).and_return(connection1)
+          hash_including({:libvirt_uri => 'qemu+ssh://user@remote1/system'})).and_return(connection)
         expect(Fog::Compute).to receive(:new).with(
           hash_including({:libvirt_uri => 'qemu+ssh://vms@remote2/system'})).and_return(connection2)
 
-        expect(machine.provider.driver.connection).to eq(connection1)
+        expect(machine.provider.driver.connection).to eq(connection)
         expect(machine2.provider.driver.connection).to eq(connection2)
       end
 
       it 'should configure the connection once' do
-        expect(Fog::Compute).to receive(:new).once().and_return(connection1)
+        expect(Fog::Compute).to receive(:new).once().and_return(connection)
 
-        expect(machine.provider.driver.connection).to eq(connection1)
-        expect(machine.provider.driver.connection).to eq(connection1)
-        expect(machine.provider.driver.connection).to eq(connection1)
+        expect(machine.provider.driver.connection).to eq(connection)
+        expect(machine.provider.driver.connection).to eq(connection)
+        expect(machine.provider.driver.connection).to eq(connection)
       end
     end
 
     describe '#system_connection' do
+      let(:machine2)   { iso_env.machine(:test2, :libvirt) }
+      let(:connection2) { double("connection 2") }
+      let(:system_connection2) { double("system connection 2") }
+
+      before do
+        allow(machine2.provider).to receive('driver').and_call_original
+      end
+
       # note that the urls for the two tests are currently
       # incorrect here as they should be the following:
       #   qemu+ssh://user@remote1/system
@@ -87,19 +98,19 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
       # system_uri should be 'qemu+ssh://user@remote1/system'
       # and not 'qemu:///system'.
       it 'should configure a separate connection per machine' do
-        expect(Libvirt).to receive(:open_read_only).with('qemu+ssh://user@remote1/system').and_return(system_connection1)
+        expect(Libvirt).to receive(:open_read_only).with('qemu+ssh://user@remote1/system').and_return(system_connection)
         expect(Libvirt).to receive(:open_read_only).with('qemu+ssh://vms@remote2/system').and_return(system_connection2)
 
-        expect(machine.provider.driver.system_connection).to eq(system_connection1)
+        expect(machine.provider.driver.system_connection).to eq(system_connection)
         expect(machine2.provider.driver.system_connection).to eq(system_connection2)
       end
 
       it 'should configure the connection once' do
-        expect(Libvirt).to receive(:open_read_only).with('qemu+ssh://user@remote1/system').and_return(system_connection1)
+        expect(Libvirt).to receive(:open_read_only).with('qemu+ssh://user@remote1/system').and_return(system_connection)
 
-        expect(machine.provider.driver.system_connection).to eq(system_connection1)
-        expect(machine.provider.driver.system_connection).to eq(system_connection1)
-        expect(machine.provider.driver.system_connection).to eq(system_connection1)
+        expect(machine.provider.driver.system_connection).to eq(system_connection)
+        expect(machine.provider.driver.system_connection).to eq(system_connection)
+        expect(machine.provider.driver.system_connection).to eq(system_connection)
       end
     end
   end

data/spec/unit/templates/domain_all_settings.xml

@@ -47,7 +47,7 @@
       <spinlocks state='on' retries='4096' />
     </hyperv>
   </features>
-  <clock offset='variable'>
+  <clock offset='variable' basis='localtime' adjustment='-31536000'>
     <timer name='t1'/>
     <timer name='t2' track='b' tickpolicy='c' frequency='d' mode='e' present='yes'/>
   </clock>
@@ -105,7 +105,7 @@
       <target dev='fda' bus='fdc'/>
     </disk>
     <serial type='file'>
-      <source path='/var/log/vm_consoles/machine.log'/>
+      <source path='/var/log/vm_consoles/machine.log' append='on'/>
       <target port='0'/>
     </serial>
     <console type='file'>

data/spec/unit/templates/domain_spec.rb

@@ -62,7 +62,8 @@ describe 'templates/domain' do
       domain.cpu_mode = 'custom'
       domain.cpu_feature(name: 'AAA', policy: 'required')
       domain.hyperv_feature(name: 'BBB', state: 'on')
-      domain.clock_offset = 'variable'
+      domain.clock_adjustment = -(365 * 24 * 60 * 60)
+      domain.clock_basis = 'localtime'
       domain.clock_timer(name: 't1')
       domain.clock_timer(name: 't2', track: 'b', tickpolicy: 'c', frequency: 'd', mode: 'e',  present: 'yes')
       domain.hyperv_feature(name: 'spinlocks', state: 'on', retries: '4096')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.1
 platform: ruby
 authors:
 - Lukas Stanek
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-04 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-libvirt
@@ -174,6 +174,7 @@ 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
@@ -277,6 +278,7 @@ files:
 - 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_network_interfaces.rb
 - spec/unit/action/destroy_domain_spec.rb
 - spec/unit/action/destroy_domain_spec/additional_disks_domain.xml
 - spec/unit/action/destroy_domain_spec/box_multiple_disks.xml
@@ -403,6 +405,7 @@ test_files:
 - 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/create_network_interfaces.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