vagrant-libvirt 0.3.0 → 0.5.2

data/spec/unit/templates/domain_all_settings.xml

@@ -34,33 +34,44 @@
     <pae/>
     <hyperv>
       <BBB state='on' />
+      <spinlocks state='on' retries='4096' />
     </hyperv>
   </features>
-  <clock offset='utc'/>
+  <clock offset='variable'>
+    <timer name='t1'/>
+    <timer name='t2' track='b' tickpolicy='c' frequency='d' mode='e' present='yes'/>
+  </clock>
   <devices>
     <emulator>/usr/bin/kvm-spice</emulator>
     <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' cache='unsafe'/>
+      <driver name='qemu' type='qcow2' cache='unsafe' io='threads' copy_on_read='on' discard='unmap' detect_zeroes='on'/>
       <source file='/var/lib/libvirt/images/test.qcow2'/>
       <target dev='vda' bus='ide'/>
     </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2' cache='unsafe' io='threads' copy_on_read='on' discard='unmap' detect_zeroes='on'/>
+      <source file='/var/lib/libvirt/images/test2.qcow2'/>
+      <target dev='vdb' bus='ide'/>
+    </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='default'/>
       <source file='/var/lib/libvirt/images/test-disk1.qcow2'/>
       <target dev='vdb' bus='virtio'/>
     </disk>
     <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' cache='default'/>
+      <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'/>
     </disk>
 
     <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw' />
       <source file=''/>
       <target dev='hda' bus='ide'/>
       <readonly/>
     </disk>
     <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw' />
       <source file=''/>
       <target dev='hdb' bus='ide'/>
       <readonly/>

data/spec/unit/templates/domain_custom_cpu_model.xml

@@ -23,7 +23,8 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc'>
+  </clock>
   <devices>
 
 

data/spec/unit/templates/domain_defaults.xml

@@ -23,7 +23,8 @@
     <apic/>
     <pae/>
   </features>
-  <clock offset='utc'/>
+  <clock offset='utc'>
+  </clock>
   <devices>
 
 

data/spec/unit/templates/domain_spec.rb

@@ -9,6 +9,13 @@ describe 'templates/domain' do
   class DomainTemplateHelper < VagrantPlugins::ProviderLibvirt::Config
     include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
 
+    attr_accessor :domain_volumes
+
+    def initialize
+      super
+      @domain_volumes = []
+    end
+
     def finalize!
       super
     end
@@ -33,6 +40,10 @@ 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_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')
       domain.cputopology(sockets: '1', cores: '3', threads: '2')
       domain.machine_type = 'pc-compatible'
       domain.machine_arch = 'x86_64'
@@ -41,12 +52,24 @@ describe 'templates/domain' do
       domain.boot('cdrom')
       domain.boot('hd')
       domain.emulator_path = '/usr/bin/kvm-spice'
-      domain.instance_variable_set('@domain_volume_path', '/var/lib/libvirt/images/test.qcow2')
-      domain.instance_variable_set('@domain_volume_cache', 'unsafe')
+      domain.instance_variable_set('@domain_volume_cache', 'deprecated')
       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 => 1.vdev.to_s,
+        :cache => 'unsafe',
+        :bus => domain.disk_bus,
+        :path => '/var/lib/libvirt/images/test.qcow2'
+      })
+      domain.domain_volumes.push({
+        :dev => 2.vdev.to_s,
+        :cache => 'unsafe',
+        :bus => domain.disk_bus,
+        :path => '/var/lib/libvirt/images/test2.qcow2'
+      })
       domain.storage(:file, path: 'test-disk1.qcow2')
-      domain.storage(:file, path: 'test-disk2.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
@@ -105,4 +128,78 @@ describe 'templates/domain' do
       expect(domain.to_xml('domain')).to eq xml_expected
     end
   end
+
+  context 'when tpm 2.0 device is specified' do
+    before do
+      domain.tpm_version = '2.0'
+      domain.tpm_type = 'emulator'
+      domain.tpm_model = 'tpm-crb'
+    end
+    let(:test_file) { 'tpm/version_2.0.xml' }
+    it 'renders template' do
+      domain.finalize!
+      expect(domain.to_xml('domain')).to eq xml_expected
+    end
+  end
+
+  context 'when tpm 1.2 device is implicitly used' do
+    before do
+      domain.tpm_path = '/dev/tpm0'
+    end
+    let(:test_file) { 'tpm/version_1.2.xml' }
+    it 'renders template' do
+      domain.finalize!
+      expect(domain.to_xml('domain')).to eq xml_expected
+    end
+  end
+
+  context 'memballoon' do
+    context 'default' do
+      it 'renders without specifying the xml tag' do
+        domain.finalize!
+
+        expect(domain.to_xml('domain')).to_not match(/memballoon/)
+      end
+    end
+
+    context 'memballon enabled' do
+      before do
+        domain.memballoon_enabled = true
+      end
+
+      it 'renders with memballon element' do
+        domain.finalize!
+
+        expect(domain.to_xml('domain')).to match(/<memballoon model='virtio'>/)
+        expect(domain.to_xml('domain')).to match(/<address type='pci' domain='0x0000' bus='0x00' slot='0x0f' function='0x0'\/>/)
+      end
+
+      context 'all settings specified' do
+        before do
+          domain.memballoon_model = "virtio-non-transitional"
+          domain.memballoon_pci_bus = "0x01"
+          domain.memballoon_pci_slot = "0x05"
+        end
+
+        it 'renders with specified values' do
+          domain.finalize!
+
+          expect(domain.to_xml('domain')).to match(/<memballoon model='virtio-non-transitional'>/)
+          expect(domain.to_xml('domain')).to match(/<address type='pci' domain='0x0000' bus='0x01' slot='0x05' function='0x0'\/>/)
+        end
+      end
+    end
+
+    context 'memballon disabled' do
+      before do
+        domain.memballoon_enabled = false
+      end
+
+      it 'renders the memballoon element with model none' do
+        domain.finalize!
+
+        expect(domain.to_xml('domain')).to match(/<memballoon model='none'\/>/)
+      end
+    end
+  end
 end

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

@@ -0,0 +1,54 @@
+<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>
+
+
+    <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>
+
+
+    <tpm model='tpm-tis'>
+      <backend type='passthrough'>
+        <device path='/dev/tpm0'/>
+      </backend>
+    </tpm>
+  </devices>
+
+</domain>

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

@@ -0,0 +1,53 @@
+<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>
+
+
+    <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>
+
+
+    <tpm model='tpm-crb'>
+      <backend type='emulator' version='2.0'>
+      </backend>
+    </tpm>
+  </devices>
+
+</domain>

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Lukas Stanek
 - Dima Vasilets
 - Brian Pitts
-autorequire: 
+- Darragh Bailey
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -54,6 +55,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-libvirt
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +111,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +158,7 @@ email:
 - ls@elostech.cz
 - pronix.service@gmail.com
 - brian@polibyte.com
+- daragh.bailey@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -123,6 +167,7 @@ files:
 - README.md
 - lib/vagrant-libvirt.rb
 - lib/vagrant-libvirt/action.rb
+- lib/vagrant-libvirt/action/clean_machine_folder.rb
 - lib/vagrant-libvirt/action/create_domain.rb
 - lib/vagrant-libvirt/action/create_domain_volume.rb
 - lib/vagrant-libvirt/action/create_network_interfaces.rb
@@ -155,10 +200,12 @@ files:
 - lib/vagrant-libvirt/action/start_domain.rb
 - lib/vagrant-libvirt/action/suspend_domain.rb
 - lib/vagrant-libvirt/action/wait_till_up.rb
-- lib/vagrant-libvirt/cap/mount_p9.rb
+- lib/vagrant-libvirt/cap/mount_9p.rb
+- lib/vagrant-libvirt/cap/mount_virtiofs.rb
 - lib/vagrant-libvirt/cap/nic_mac_addresses.rb
 - lib/vagrant-libvirt/cap/public_address.rb
-- lib/vagrant-libvirt/cap/synced_folder.rb
+- lib/vagrant-libvirt/cap/synced_folder_9p.rb
+- lib/vagrant-libvirt/cap/synced_folder_virtiofs.rb
 - lib/vagrant-libvirt/config.rb
 - lib/vagrant-libvirt/driver.rb
 - lib/vagrant-libvirt/errors.rb
@@ -181,26 +228,45 @@ files:
 - lib/vagrant-libvirt/version.rb
 - locales/en.yml
 - spec/spec_helper.rb
+- spec/support/binding_proc.rb
 - spec/support/environment_helper.rb
 - spec/support/libvirt_context.rb
+- spec/support/matchers/have_file_content.rb
 - spec/support/sharedcontext.rb
+- spec/unit/action/clean_machine_folder_spec.rb
 - spec/unit/action/create_domain_spec.rb
-- spec/unit/action/create_domain_spec/default_storage_pool.xml
+- spec/unit/action/create_domain_spec/additional_disks_domain.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_volume_spec.rb
+- spec/unit/action/create_domain_volume_spec/one_disk_in_storage.xml
+- 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/destroy_domain_spec.rb
+- 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/set_name_of_domain_spec.rb
 - spec/unit/action/start_domain_spec.rb
+- spec/unit/action/start_domain_spec/clock_timer_rtc.xml
 - spec/unit/action/start_domain_spec/default.xml
+- 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/wait_till_up_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/templates/domain_all_settings.xml
 - spec/unit/templates/domain_custom_cpu_model.xml
 - spec/unit/templates/domain_defaults.xml
 - spec/unit/templates/domain_spec.rb
+- spec/unit/templates/tpm/version_1.2.xml
+- spec/unit/templates/tpm/version_2.0.xml
 homepage: https://github.com/vagrant-libvirt/vagrant-libvirt
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,24 +281,44 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.11
+signing_key:
 specification_version: 4
 summary: libvirt provider for Vagrant.
 test_files:
-- spec/support/libvirt_context.rb
-- spec/support/sharedcontext.rb
-- spec/support/environment_helper.rb
-- spec/unit/templates/domain_all_settings.xml
-- spec/unit/templates/domain_custom_cpu_model.xml
-- spec/unit/templates/domain_defaults.xml
-- spec/unit/templates/domain_spec.rb
-- spec/unit/action/create_domain_spec/default_storage_pool.xml
+- spec/unit/action/start_domain_spec.rb
 - spec/unit/action/create_domain_spec.rb
+- spec/unit/action/forward_ports_spec.rb
 - spec/unit/action/wait_till_up_spec.rb
+- spec/unit/action/clean_machine_folder_spec.rb
+- spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_2.xml
+- spec/unit/action/create_domain_volume_spec/one_disk_in_storage.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_0.xml
+- spec/unit/action/start_domain_spec/default_added_tpm_version.xml
+- spec/unit/action/start_domain_spec/clock_timer_rtc.xml
+- spec/unit/action/start_domain_spec/default.xml
+- spec/unit/action/start_domain_spec/default_added_tpm_path.xml
 - spec/unit/action/destroy_domain_spec.rb
-- spec/unit/action/start_domain_spec.rb
+- 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/additional_disks_domain.xml
+- spec/unit/action/create_domain_spec/default_domain.xml
+- spec/unit/action/handle_box_image_spec.rb
 - spec/unit/action/set_name_of_domain_spec.rb
-- spec/unit/action/start_domain_spec/default.xml
+- spec/unit/action/halt_domain_spec.rb
+- spec/unit/action/create_domain_volume_spec.rb
 - spec/unit/config_spec.rb
+- spec/unit/templates/domain_defaults.xml
+- spec/unit/templates/domain_all_settings.xml
+- spec/unit/templates/domain_spec.rb
+- spec/unit/templates/tpm/version_1.2.xml
+- spec/unit/templates/tpm/version_2.0.xml
+- spec/unit/templates/domain_custom_cpu_model.xml
+- spec/support/libvirt_context.rb
+- spec/support/matchers/have_file_content.rb
+- spec/support/environment_helper.rb
+- spec/support/binding_proc.rb
+- spec/support/sharedcontext.rb
 - spec/spec_helper.rb