vagrant-libvirt 0.9.0 → 0.10.0

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>

data/spec/unit/templates/domain_spec.rb

@@ -16,13 +16,33 @@ describe 'templates/domain' do
     def initialize
       super
       @domain_volumes = []
+      @sysinfo_blocks = {
+        'bios' => {:section => "BIOS", :xml => "bios"},
+        'system' => {:section => "System", :xml => "system"},
+        'base board' => {:section => "Base Board", :xml => "baseBoard"},
+        'chassis' => {:section => "Chassis", :xml => "chassis"},
+        'oem strings' => {:section => "OEM Strings", :xml => "oemStrings"},
+      }
     end
 
     def finalize!
       super
+
+      disks.each do |disk|
+        disk[:absolute_path] = '/var/lib/libvirt/images/' + disk[:path]
+      end
     end
   end
 
+  def resolve
+    # 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)
+  end
+
   let(:domain) { DomainTemplateHelper.new }
   let(:xml_expected) { File.read(File.join(File.dirname(__FILE__), test_file)) }
 
@@ -58,23 +78,8 @@ describe 'templates/domain' do
       domain.disk_bus = 'ide'
       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 => 'vda',
-        :cache => 'unsafe',
-        :bus => domain.disk_bus,
-        :absolute_path => '/var/lib/libvirt/images/test.qcow2'
-      })
-      domain.domain_volumes.push({
-        :dev => 'vdb',
-        :cache => 'unsafe',
-        :bus => domain.disk_bus,
-        :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')
-      domain.disks.each do |disk|
-        disk[:absolute_path] = '/var/lib/libvirt/images/' + disk[:path]
-      end
       domain.storage(:file, device: :cdrom)
       domain.storage(:file, device: :cdrom)
       domain.channel(type: 'unix',
@@ -102,6 +107,15 @@ describe 'templates/domain' do
       domain.smartcard(mode: 'passthrough')
       domain.tpm_path = '/dev/tpm0'
 
+      domain.sysinfo = {
+        'system' => {
+          'serial' => 'AAAAAAAA',
+        },
+        'oem strings' => [
+          'AAAAAAAA',
+        ],
+      }
+
       domain.qemuargs(value: '-device')
       domain.qemuargs(value: 'dummy-device')
 
@@ -119,12 +133,18 @@ 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)
+
+      domain.domain_volumes.push({
+        :cache => 'unsafe',
+        :bus => domain.disk_bus,
+        :absolute_path => '/var/lib/libvirt/images/test.qcow2'
+      })
+      domain.domain_volumes.push({
+        :cache => 'unsafe',
+        :bus => domain.disk_bus,
+        :absolute_path => '/var/lib/libvirt/images/test2.qcow2'
+      })
+      resolve
 
       expect(domain.to_xml('domain')).to eq xml_expected
     end
@@ -231,4 +251,68 @@ describe 'templates/domain' do
       end
     end
   end
+
+  context 'scsi controller' do
+    context 'when disk device suggests scsi' do
+      let(:test_file) { 'domain_scsi_device_storage.xml' }
+
+      before do
+        domain.disk_device = 'sda'
+      end
+
+      it 'renders scsi controller in template' do
+        domain.finalize!
+        domain.domain_volumes.push({
+          :cache => 'unsafe',
+          :bus => domain.disk_bus,
+          :absolute_path => '/var/lib/libvirt/images/test.qcow2'
+        })
+
+        resolve
+        expect(domain.to_xml('domain')).to eq xml_expected
+      end
+    end
+
+    context 'when disk bus is scsi' do
+      let(:test_file) { 'domain_scsi_bus_storage.xml' }
+
+      before do
+        domain.disk_bus = 'scsi'
+      end
+
+      it 'renders scsi controller in template based on bus' do
+        domain.finalize!
+        domain.domain_volumes.push({
+          :dev => 'vda',
+          :cache => 'unsafe',
+          :bus => domain.disk_bus,
+          :absolute_path => '/var/lib/libvirt/images/test.qcow2'
+        })
+        resolve
+        expect(domain.to_xml('domain')).to eq xml_expected
+      end
+    end
+
+    context 'when enough scsi disks are added' do
+      let(:test_file) { 'domain_scsi_multiple_controllers_storage.xml' }
+
+      before do
+        domain.disk_bus = 'scsi'
+        domain.disk_controller_model = 'virtio-scsi'
+      end
+
+      it 'should render with multiple scsi controllers' do
+        domain.finalize!
+        for idx in 1..15 do
+          domain.domain_volumes.push({
+            :cache => 'unsafe',
+            :bus => domain.disk_bus,
+            :absolute_path => "/var/lib/libvirt/images/test-#{idx}.img"
+          })
+        end
+        resolve
+        expect(domain.to_xml('domain')).to eq xml_expected
+      end
+    end
+  end
 end

data/spec/unit/util/byte_number_spec.rb

@@ -25,4 +25,4 @@ describe ByteNumber do
       expect( ByteNumber.new(5).pow(5).to_i).to eq(5**5)
     end
   end
-end
+end