vagrant-libvirt 0.7.0 → 0.8.0

data/spec/unit/templates/domain_all_settings.xml

@@ -5,25 +5,21 @@
   <uuid></uuid>
   <memory></memory>
   <vcpu cpuset='1-4,^3,6'>1</vcpu>
-
-
   <cpu mode='custom'>
-      <model fallback='allow'>qemu64</model>
-        <feature name='AAA' policy='required'/>
-        <topology sockets='1' cores='3' threads='2'/>
+    <model fallback='allow'>qemu64</model>
+    <feature name='AAA' policy='required'/>
+    <topology sockets='1' cores='3' threads='2'/>
   </cpu>
-
   <numatune>
     <memory nodeset='1-4,^3,6'/>
   </numatune>
   <cputune>
     <shares>1024</shares>
   </cputune>
-
   <os>
-        <type arch='x86_64' machine='pc-compatible'>hvm</type>
-        <loader readonly='yes' type='rom'>/efi/loader</loader>
-      <bootmenu enable='yes'/>
+    <type arch='x86_64' machine='pc-compatible'>hvm</type>
+    <loader readonly='yes' type='rom'>/efi/loader</loader>
+    <bootmenu enable='yes'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -59,15 +55,14 @@
       <alias name='ua-disk-volume-0'/>
       <driver name='qemu' type='qcow2' cache='default'/>
       <source file='/var/lib/libvirt/images/test-disk1.qcow2'/>
-      <target dev='vdb' bus='virtio'/>
+      <target dev='vdc' bus='virtio'/>
     </disk>
     <disk type='file' device='disk'>
       <alias name='ua-disk-volume-1'/>
       <driver name='qemu' type='qcow2' cache='default' io='threads' copy_on_read='on' discard='unmap' detect_zeroes='on'/>
       <source file='/var/lib/libvirt/images/test-disk2.qcow2'/>
-      <target dev='vdc' bus='virtio'/>
+      <target dev='vdd' bus='virtio'/>
     </disk>
-
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw' />
       <source file=''/>
@@ -80,7 +75,6 @@
       <target dev='hdb' bus='ide'/>
       <readonly/>
     </disk>
-
     <serial type='file'>
       <source path='/var/log/vm_consoles/machine.log'/>
       <target port='0'/>
@@ -89,72 +83,52 @@
       <source path='/var/log/vm_consoles/machine.log'/>
       <target port='0'/>
     </console>
-
-  <channel type='unix' >
-      <target type='virtio'
-               name="org.qemu.guest_agent.0"
-      />
-  </channel>
-  <channel type='spicevmc' >
-      <target type='virtio'
-               name="com.redhat.spice.0"
-      />
-  </channel>
-  <channel type='unix' >
-      <source
-               path="/tmp/foo"
-      />
-      <target type='guestfwd'
-               address="192.0.2.42"
-               port="4242"
-      />
-  </channel>
-
+    <channel type='unix' >
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
+    </channel>
+    <channel type='spicevmc' >
+      <target type='virtio' name='com.redhat.spice.0'/>
+    </channel>
+    <channel type='unix' >
+      <source path='/tmp/foo'/>
+      <target type='guestfwd' address='192.0.2.42' port='4242'/>
+    </channel>
     <input type='mouse' bus='ps2'/>
-
-      <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'  >
-        <gl enable='yes' />
-      </graphics>
-      <video>
-        <model type='cirrus' vram='9216' heads='1'>
-          <acceleration accel3d='yes'/>
-        </model>
-      </video>
-      <rng model='virtio'>
-        <backend model='random'>/dev/random</backend>
-      </rng>
-      <hostdev mode='subsystem' type='pci' managed='yes'>
-        <source>
-          <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'/>
-        </source>
-      </hostdev>
-      <hostdev mode='subsystem' type='usb'>
-        <source startupPolicy='mandatory'>
-          <vendor id='0x1234'/>
-          <product id='0xabcd'/>
-          <address bus='1' device='2'/>
-        </source>
-      </hostdev>
-        <redirdev bus='usb' type='tcp'>
-        </redirdev>
-        <redirfilter>
-          <usbdev class='0x0b' vendor='0x08e6' product='0x3437' version='2.00' allow='yes'/>
-        </redirfilter>
+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'>
+      <gl enable='yes'/>
+    </graphics>
+    <video>
+      <model type='cirrus' vram='16384' heads='1'>
+	<acceleration accel3d='yes'/>
+      </model>
+    </video>
+    <rng model='virtio'>
+      <backend model='random'>/dev/random</backend>
+    </rng>
+    <hostdev mode='subsystem' type='pci' managed='yes'>
+      <source>
+	<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'/>
+      </source>
+    </hostdev>
+    <hostdev mode='subsystem' type='usb'>
+      <source startupPolicy='mandatory'>
+	<vendor id='0x1234'/>
+	<product id='0xabcd'/>
+	<address bus='1' device='2'/>
+      </source>
+    </hostdev>
+    <redirdev bus='usb' type='tcp'>
+    </redirdev>
+    <redirfilter>
+      <usbdev class='0x0b' vendor='0x08e6' product='0x3437' version='2.00' allow='yes'/>
+    </redirfilter>
     <watchdog model='i6300esb' action='reset'/>
-
-        <smartcard mode='passthrough' type='spicevmc'/>
-
+    <smartcard mode='passthrough' type='spicevmc'/>
     <tpm model='tpm-tis'>
       <backend type='passthrough'>
         <device path='/dev/tpm0'/>
@@ -162,7 +136,6 @@
     </tpm>
     <controller type='usb' model='nec-xhci' ports="4" />
   </devices>
-
   <qemu:commandline>
     <qemu:arg value='-device'/>
     <qemu:arg value='dummy-device'/>

data/spec/unit/templates/domain_cpu_mode_passthrough.xml

@@ -0,0 +1,39 @@
+<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-passthrough'>
+    <feature policy='optional' name='vmx'/>
+    <feature policy='optional' name='svm'/>
+    <topology sockets='1' cores='2' threads='1'/>
+  </cpu>
+  <os>
+    <type>hvm</type>
+    <kernel></kernel>
+    <initrd></initrd>
+    <cmdline></cmdline>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='utc'>
+  </clock>
+  <devices>
+    <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_custom_cpu_model.xml

@@ -5,15 +5,11 @@
   <uuid></uuid>
   <memory></memory>
   <vcpu>1</vcpu>
-
-
   <cpu mode='custom'>
-      <model fallback='allow'>SandyBridge</model>
+    <model fallback='allow'>SandyBridge</model>
   </cpu>
-
-
   <os>
-        <type>hvm</type>
+    <type>hvm</type>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -26,24 +22,16 @@
   <clock offset='utc'>
   </clock>
   <devices>
-
-
     <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='9216' heads='1'/>
-      </video>
-
-
+    <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_defaults.xml

@@ -5,15 +5,11 @@
   <uuid></uuid>
   <memory></memory>
   <vcpu>1</vcpu>
-
-
   <cpu mode='host-model'>
-      <model fallback='allow'></model>
+    <model fallback='allow'></model>
   </cpu>
-
-
   <os>
-        <type>hvm</type>
+    <type>hvm</type>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -26,24 +22,16 @@
   <clock offset='utc'>
   </clock>
   <devices>
-
-
     <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='9216' heads='1'/>
-      </video>
-
-
+    <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_spec.rb

@@ -59,13 +59,13 @@ describe 'templates/domain' do
       domain.disk_device = 'vda'
       domain.disk_driver(:cache => 'unsafe', :io => 'threads', :copy_on_read => 'on', :discard => 'unmap', :detect_zeroes => 'on')
       domain.domain_volumes.push({
-        :dev => 1.vdev.to_s,
+        :dev => 'vda',
         :cache => 'unsafe',
         :bus => domain.disk_bus,
         :path => '/var/lib/libvirt/images/test.qcow2'
       })
       domain.domain_volumes.push({
-        :dev => 2.vdev.to_s,
+        :dev => 'vdb',
         :cache => 'unsafe',
         :bus => domain.disk_bus,
         :path => '/var/lib/libvirt/images/test2.qcow2'
@@ -118,19 +118,42 @@ describe 'templates/domain' do
     let(:test_file) { 'domain_all_settings.xml' }
     it 'renders template' do
       domain.finalize!
+      # resolving is now done during create domain, so need to recreate
+      # the same behaviour before calling the template until that
+      # is separated out from create domain.
+      resolver = ::VagrantPlugins::ProviderLibvirt::Util::DiskDeviceResolver.new(prefix=domain.disk_device[0..1])
+      resolver.resolve!(domain.domain_volumes.dup.each { |volume| volume[:device] = volume[:dev] })
+      resolver.resolve!(domain.disks)
+
       expect(domain.to_xml('domain')).to eq xml_expected
     end
   end
 
-  context 'when custom cpu model enabled' do
-    before do
-      domain.cpu_mode = 'custom'
-      domain.cpu_model = 'SandyBridge'
+  context 'when cpu mode is set' do
+    context 'to host-passthrough' do
+      before do
+        domain.cpu_mode = 'host-passthrough'
+        domain.cpu_model = 'SandyBridge'
+        domain.cputopology :sockets => '1', :cores => '2', :threads => '1'
+        domain.nested = true
+      end
+      let(:test_file) { 'domain_cpu_mode_passthrough.xml' }
+      it 'should allow features and topology and ignore model' do
+        domain.finalize!
+        expect(domain.to_xml('domain')).to eq xml_expected
+      end
     end
-    let(:test_file) { 'domain_custom_cpu_model.xml' }
-    it 'renders template' do
-      domain.finalize!
-      expect(domain.to_xml('domain')).to eq xml_expected
+
+    context 'to custom and model is set' do
+      before do
+        domain.cpu_mode = 'custom'
+        domain.cpu_model = 'SandyBridge'
+      end
+      let(:test_file) { 'domain_custom_cpu_model.xml' }
+      it 'renders template' do
+        domain.finalize!
+        expect(domain.to_xml('domain')).to eq xml_expected
+      end
     end
   end
 
@@ -167,12 +190,12 @@ describe 'templates/domain' do
       end
     end
 
-    context 'memballon enabled' do
+    context 'memballoon enabled' do
       before do
         domain.memballoon_enabled = true
       end
 
-      it 'renders with memballon element' do
+      it 'renders with memballoon element' do
         domain.finalize!
 
         expect(domain.to_xml('domain')).to match(/<memballoon model='virtio'>/)
@@ -195,7 +218,7 @@ describe 'templates/domain' do
       end
     end
 
-    context 'memballon disabled' do
+    context 'memballoon disabled' do
       before do
         domain.memballoon_enabled = false
       end

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

@@ -5,15 +5,11 @@
   <uuid></uuid>
   <memory></memory>
   <vcpu>1</vcpu>
-
-
   <cpu mode='host-model'>
-      <model fallback='allow'></model>
+    <model fallback='allow'></model>
   </cpu>
-
-
   <os>
-        <type>hvm</type>
+    <type>hvm</type>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -26,29 +22,21 @@
   <clock offset='utc'>
   </clock>
   <devices>
-
-
     <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='9216' heads='1'/>
-      </video>
-
-
+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'/>
+    <video>
+      <model type='cirrus' vram='16384' heads='1'/>
+    </video>
     <tpm model='tpm-tis'>
       <backend type='passthrough'>
         <device path='/dev/tpm0'/>
       </backend>
     </tpm>
   </devices>
-
 </domain>

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

@@ -5,15 +5,11 @@
   <uuid></uuid>
   <memory></memory>
   <vcpu>1</vcpu>
-
-
   <cpu mode='host-model'>
-      <model fallback='allow'></model>
+    <model fallback='allow'></model>
   </cpu>
-
-
   <os>
-        <type>hvm</type>
+    <type>hvm</type>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -26,28 +22,20 @@
   <clock offset='utc'>
   </clock>
   <devices>
-
-
     <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='9216' heads='1'/>
-      </video>
-
-
+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'/>
+    <video>
+      <model type='cirrus' vram='16384' heads='1'/>
+    </video>
     <tpm model='tpm-crb'>
       <backend type='emulator' version='2.0'>
       </backend>
     </tpm>
   </devices>
-
 </domain>

data/spec/unit/util/resolvers_spec.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require 'vagrant-libvirt/util/resolvers'
+
+describe VagrantPlugins::ProviderLibvirt::Util::DiskDeviceResolver do
+  subject { described_class.new }
+
+  def deep_clone_disks(disk_array)
+    new_array = []
+    disk_array.each do |disk|
+      new_array.push disk.dup
+    end
+
+    new_array
+  end
+
+  describe '#resolve!' do
+    context 'when using default prefix' do
+      [
+        [
+          [{:name => 'single-disk'}],
+          [{:name => 'single-disk', :device => 'vda'}],
+        ],
+        [
+          [{:name => 'disk1'}, {:name => 'disk2'}],
+          [{:name => 'disk1', :device => 'vda'}, {:name => 'disk2', :device => 'vdb'}],
+        ],
+        [
+          [{:name => 'disk1'}, {:name => 'disk2', :device => 'vdc'}],
+          [{:name => 'disk1', :device => 'vda'}, {:name => 'disk2', :device => 'vdc'}],
+        ],
+        [
+          [{:name => 'disk1', :device => 'sda'}, {:name => 'disk2'}],
+          [{:name => 'disk1', :device => 'sda'}, {:name => 'disk2', :device => 'vda'}],
+        ],
+      ].each do |input_disks, output_disks, options={}|
+        opts = {}.merge!(options)
+        it "should handle inputs: #{input_disks}" do
+          disks = deep_clone_disks(input_disks)
+          expect(subject.resolve!(disks)).to eq(output_disks)
+          expect(disks).to_not eq(input_disks)
+        end
+      end
+    end
+
+    context 'when using different default prefix' do
+      let(:subject) { described_class.new('sd') }
+      [
+        [
+          [{:name => 'single-disk'}],
+          [{:name => 'single-disk', :device => 'sda'}],
+        ],
+        [
+          [{:name => 'disk1'}, {:name => 'disk2'}],
+          [{:name => 'disk1', :device => 'sda'}, {:name => 'disk2', :device => 'sdb'}],
+        ],
+        [
+          [{:name => 'disk1'}, {:name => 'disk2', :device => 'vdc'}],
+          [{:name => 'disk1', :device => 'sda'}, {:name => 'disk2', :device => 'vdc'}],
+        ],
+        [
+          [{:name => 'disk1', :device => 'sda'}, {:name => 'disk2'}],
+          [{:name => 'disk1', :device => 'sda'}, {:name => 'disk2', :device => 'sdb'}],
+        ],
+        [
+          [{:name => 'disk1'}, {:name => 'disk2', :device => 'sda'}],
+          [{:name => 'disk1', :device => 'sdb'}, {:name => 'disk2', :device => 'sda'}],
+        ],
+      ].each do |input_disks, output_disks, options={}|
+        opts = {}.merge!(options)
+        it "should handle inputs: #{input_disks}" do
+          disks = deep_clone_disks(input_disks)
+          expect(subject.resolve!(disks)).to eq(output_disks)
+        end
+      end
+    end
+
+    context 'when using custom prefix' do
+      [
+        [
+          [{:name => 'existing-disk', :device => 'vda'}],
+          [{:name => 'single-disk'}],
+          [{:name => 'single-disk', :device => 'sda'}],
+          {:prefix => 'sd'},
+        ],
+        [
+          [{:name => 'existing-disk', :device => 'vda'}],
+          [{:name => 'disk1', :device => 'sda'}, {:name => 'disk2'}],
+          [{:name => 'disk1', :device => 'sda'}, {:name => 'disk2', :device => 'sdb'}],
+          {:prefix => 'sd'},
+        ],
+      ].each do |existing, input_disks, output_disks, options={}|
+        opts = {}.merge!(options)
+        it "should handle inputs: #{input_disks} with opts: #{opts}" do
+          disks = deep_clone_disks(input_disks)
+          subject.resolve(existing)
+          expect(subject.resolve!(disks, opts)).to eq(output_disks)
+        end
+      end
+    end
+  end
+
+  describe '#resolve' do
+    let(:input_disks) { [{:name => 'single-disk'}] }
+    let(:output_disks) { [{:name => 'single-disk', :device => 'vda'}] }
+
+    it "should resolve without modifying" do
+      disks = deep_clone_disks(input_disks)
+      expect(subject.resolve(disks)).to eq(output_disks)
+      expect(disks).to_not eq(output_disks)
+      expect(disks).to eq(input_disks)
+    end
+  end
+end