vagrant-libvirt 0.8.2 → 0.10.1

data/spec/unit/config_spec.rb

@@ -577,24 +577,28 @@ describe VagrantPlugins::ProviderLibvirt::Config do
 
   def assert_invalid
     subject.finalize!
-    errors = subject.validate(machine)
-    raise "No errors: #{errors.inspect}" if errors.values.all?(&:empty?)
+    errors = subject.validate(machine).values.first
+    expect(errors).to_not be_empty
+    errors
   end
 
   def assert_valid
     subject.finalize!
-    errors = subject.validate(machine)
-    raise "Errors: #{errors.inspect}" unless errors.values.all?(&:empty?)
+    errors = subject.validate(machine).values.first
+    expect(errors).to be_empty
   end
 
   describe '#validate' do
+    before do
+      allow(machine).to receive(:provider_config).and_return(subject)
+      allow(machine).to receive(:ui).and_return(ui)
+    end
+
     it 'is valid with defaults' do
       assert_valid
     end
 
     context 'with disks defined' do
-      before { expect(machine).to receive(:provider_config).and_return(subject).at_least(:once) }
-
       it 'is valid if relative path used for disk' do
         subject.storage :file, path: '../path/to/file.qcow2'
         assert_valid
@@ -630,6 +634,73 @@ describe VagrantPlugins::ProviderLibvirt::Config do
       end
     end
 
+    context 'with public_network defined' do
+      let(:libvirt_client)  { instance_double(::Libvirt::Connect) }
+      let(:host_devices) { [
+        instance_double(Libvirt::Interface),
+        instance_double(Libvirt::Interface),
+      ] }
+      before do
+        machine.config.vm.network :public_network, dev: 'eth0', ip: "192.168.2.157"
+        expect(machine).to receive_message_chain('provider.driver.connection.client').and_return(libvirt_client)
+        expect(libvirt_client).to receive(:list_all_interfaces).and_return(host_devices)
+        expect(host_devices[0]).to receive(:name).and_return('eth0')
+        expect(host_devices[1]).to receive(:name).and_return('virbr0')
+      end
+
+      it 'should validate use of existing device' do
+        assert_valid
+      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
+
+        it 'should be invalid' do
+          assert_invalid
+        end
+      end
+
+      context 'when using excluded host device' do
+        before do
+          machine.config.vm.network :public_network, dev: 'virbr0', ip: "192.168.2.157"
+        end
+
+        it 'should be invalid' do
+          assert_invalid
+        end
+
+        context 'when user overrides to allow device' do
+          before do
+            subject.host_device_exclude_prefixes = []
+          end
+
+          it 'should validate' do
+            assert_valid
+          end
+        end
+      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'
@@ -644,6 +715,60 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         assert_valid
       end
     end
+
+    context 'with sysinfo defined' do
+      context 'when invalid block name provided' do
+        it 'should be invalid' do
+          subject.sysinfo = {'bad bios': {'vendor': 'some vendor'}}
+
+          errors = assert_invalid
+          expect(errors).to include(match(/invalid sysinfo element 'bad bios';/))
+        end
+      end
+
+      context 'when invalid element name provided' do
+        it 'should be invalid' do
+          subject.sysinfo = {'bios': {'bad vendor': 'some vendor'}}
+
+          errors = assert_invalid
+          expect(errors).to include(match(/'sysinfo.bios' does not support entry name 'bad vendor'/))
+        end
+      end
+
+      context 'when empty element value provided' do
+        it 'should succeed with a warning' do
+          expect(ui).to receive(:warn).with(/Libvirt Provider: sysinfo.bios.vendor is nil or empty/)
+          subject.sysinfo = {'bios': {'vendor': ''}}
+
+          assert_valid
+        end
+      end
+
+      context 'when handling "oem strings"' do
+        it 'should succeed' do
+          subject.sysinfo = {'oem strings': ['string 1']}
+
+          assert_valid
+        end
+
+        context 'when empty entries' do
+          it 'should succeed with a warning' do
+            expect(ui).to receive(:warn).with(/Libvirt Provider: 'sysinfo.oem strings' contains an empty/)
+            subject.sysinfo = {'oem strings': ['']}
+
+            assert_valid
+          end
+        end
+
+        context 'when non string passed' do
+          it 'should be invalid' do
+            subject.sysinfo = {'oem strings': [true]}
+
+            assert_invalid
+          end
+        end
+      end
+    end
   end
 
   describe '#merge' do
@@ -707,5 +832,27 @@ describe VagrantPlugins::ProviderLibvirt::Config do
                                                 include(name: 'hpet'))
       end
     end
+
+    context 'sysinfo' do
+      it 'should merge' do
+        one.sysinfo = {
+          'bios' => {'vendor': 'Some Vendor'},
+          'system' => {'manufacturer': 'some manufacturer'},
+          'oem strings' => ['string 1'],
+        }
+        two.sysinfo = {
+          'bios' => {'vendor': 'Another Vendor'},
+          'system' => {'serial': 'AABBCCDDEE'},
+          'oem strings' => ['string 2'],
+        }
+
+        subject.finalize!
+        expect(subject.sysinfo).to eq(
+          'bios' => {'vendor': 'Another Vendor'},
+          'system' => {'manufacturer': 'some manufacturer', 'serial': 'AABBCCDDEE'},
+          'oem strings' => ['string 1', 'string 2'],
+        )
+      end
+    end
   end
 end

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
@@ -195,7 +197,7 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
           allow(machine.provider_config).to receive(:qemu_use_session).and_return(true)
         end
 
-        it 'should retreive the address via the system dhcp-leases API' do
+        it 'should retrieve the address via the system dhcp-leases API' do
           expect(domain).to receive(:mac).and_return("52:54:00:8b:dc:5f")
           expect(subject).to receive(:system_connection).and_return(system_connection1)
           expect(system_connection1).to receive(:list_all_networks).and_return(networks)

data/spec/unit/plugin_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'support/sharedcontext'
+
+require 'vagrant-libvirt/plugin'
+
+
+describe VagrantPlugins::ProviderLibvirt::Plugin do
+  subject { described_class.new }
+
+  include_context 'unit'
+
+  describe '#action_hook remove_libvirt_image' do
+    before do
+      # set up some dummy boxes
+      box_path = File.join(env[:env].boxes.directory, 'vagrant-libvirt-VAGRANTSLASH-test', '0.0.1')
+      ['libvirt', 'virtualbox'].each do |provider|
+        provider_path = File.join(box_path, provider)
+        FileUtils.mkdir_p(provider_path)
+        metadata = {'provider': provider}
+        File.open(File.join(provider_path, 'metadata.json'), "w") { |f| f.write metadata.to_json }
+      end
+    end
+
+    it 'should call the action hook after box remove' do
+      expect(VagrantPlugins::ProviderLibvirt::Action).to receive(:remove_libvirt_image).and_return(Vagrant::Action::Builder.new)
+      expect {
+        env[:env].action_runner.run(
+          Vagrant::Action.action_box_remove, {
+            box_name: 'vagrant-libvirt/test',
+            box_provider: 'libvirt',
+            box_version: '0.0.1',
+            force_confirm_box_remove: true,
+            box_remove_all_versions: false,
+            ui: ui,
+          }
+        )
+      }.to_not raise_error
+    end
+  end
+end

data/spec/unit/templates/domain_all_settings.xml

@@ -23,7 +23,16 @@
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
+    <smbios mode='sysinfo'/>
   </os>
+  <sysinfo type='smbios'>
+    <system>
+      <entry name='serial'>AAAAAAAA</entry>
+    </system>
+    <oemStrings>
+      <entry>AAAAAAAA</entry>
+    </oemStrings>
+  </sysinfo>
   <features>
     <acpi/>
     <apic/>
@@ -99,7 +108,7 @@
     </graphics>
     <video>
       <model type='cirrus' vram='16384' heads='1'>
-	<acceleration accel3d='yes'/>
+        <acceleration accel3d='yes'/>
       </model>
     </video>
     <rng model='virtio'>
@@ -112,20 +121,20 @@
     </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'/>
+        <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'/>
-	<product id='0xabcd'/>
-	<address bus='1' device='2'/>
+        <vendor id='0x1234'/>
+        <product id='0xabcd'/>
+        <address bus='1' device='2'/>
       </source>
     </hostdev>
     <redirdev bus='usb' type='tcp'>

data/spec/unit/templates/domain_scsi_bus_storage.xml

@@ -0,0 +1,44 @@
+<domain type='' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name></name>
+  <title></title>
+  <description></description>
+  <uuid></uuid>
+  <memory></memory>
+  <vcpu>1</vcpu>
+  <cpu mode='host-model'>
+    <model fallback='allow'></model>
+  </cpu>
+  <os>
+    <type>hvm</type>
+    <kernel></kernel>
+    <initrd></initrd>
+    <cmdline></cmdline>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='utc'>
+  </clock>
+  <devices>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-0'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test.qcow2'/>
+      <target dev='vda' bus='scsi'/>
+    </disk>
+    <controller type='scsi' model='virtio-scsi' index='0'/>
+    <serial type='pty'>
+      <target port='0'/>
+    </serial>
+    <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'/>
+    <video>
+      <model type='cirrus' vram='16384' heads='1'/>
+    </video>
+  </devices>
+</domain>

data/spec/unit/templates/domain_scsi_device_storage.xml

@@ -0,0 +1,44 @@
+<domain type='' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name></name>
+  <title></title>
+  <description></description>
+  <uuid></uuid>
+  <memory></memory>
+  <vcpu>1</vcpu>
+  <cpu mode='host-model'>
+    <model fallback='allow'></model>
+  </cpu>
+  <os>
+    <type>hvm</type>
+    <kernel></kernel>
+    <initrd></initrd>
+    <cmdline></cmdline>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='utc'>
+  </clock>
+  <devices>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-0'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test.qcow2'/>
+      <target dev='sda' bus='scsi'/>
+    </disk>
+    <controller type='scsi' model='virtio-scsi' index='0'/>
+    <serial type='pty'>
+      <target port='0'/>
+    </serial>
+    <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'/>
+    <video>
+      <model type='cirrus' vram='16384' heads='1'/>
+    </video>
+  </devices>
+</domain>

data/spec/unit/templates/domain_scsi_multiple_controllers_storage.xml

@@ -0,0 +1,130 @@
+<domain type='' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name></name>
+  <title></title>
+  <description></description>
+  <uuid></uuid>
+  <memory></memory>
+  <vcpu>1</vcpu>
+  <cpu mode='host-model'>
+    <model fallback='allow'></model>
+  </cpu>
+  <os>
+    <type>hvm</type>
+    <kernel></kernel>
+    <initrd></initrd>
+    <cmdline></cmdline>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='utc'>
+  </clock>
+  <devices>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-0'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-1.img'/>
+      <target dev='sda' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-1'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-2.img'/>
+      <target dev='sdb' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-2'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-3.img'/>
+      <target dev='sdc' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-3'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-4.img'/>
+      <target dev='sdd' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-4'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-5.img'/>
+      <target dev='sde' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-5'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-6.img'/>
+      <target dev='sdf' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-6'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-7.img'/>
+      <target dev='sdg' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-7'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-8.img'/>
+      <target dev='sdh' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-8'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-9.img'/>
+      <target dev='sdi' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-9'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-10.img'/>
+      <target dev='sdj' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-10'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-11.img'/>
+      <target dev='sdk' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-11'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-12.img'/>
+      <target dev='sdl' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-12'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-13.img'/>
+      <target dev='sdm' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-13'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-14.img'/>
+      <target dev='sdn' bus='scsi'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-box-volume-14'/>
+      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <source file='/var/lib/libvirt/images/test-15.img'/>
+      <target dev='sdo' bus='scsi'/>
+    </disk>
+    <controller type='scsi' model='virtio-scsi' index='0'/>
+    <controller type='scsi' model='virtio-scsi' index='1'/>
+    <controller type='scsi' model='virtio-scsi' index='2'/>
+    <serial type='pty'>
+      <target port='0'/>
+    </serial>
+    <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'/>
+    <video>
+      <model type='cirrus' vram='16384' heads='1'/>
+    </video>
+  </devices>
+</domain>