vagrant-libvirt 0.10.8 → 0.11.1

data/spec/unit/action/resolve_disk_settings_spec/default_no_aliases.xml

@@ -10,6 +10,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>

data/spec/unit/action/resolve_disk_settings_spec/multi_volume_box.xml

@@ -10,6 +10,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>

data/spec/unit/action/resolve_disk_settings_spec/multi_volume_box_additional_and_custom_no_aliases.xml

@@ -10,6 +10,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>

data/spec/unit/action/resolve_disk_settings_spec/multi_volume_box_additional_storage.xml

@@ -10,6 +10,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>

data/spec/unit/action/resolve_disk_settings_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require_relative '../../spec_helper'
 
 require 'fog/libvirt/models/compute/volume'
 

data/spec/unit/action/set_boot_order_spec/default.xml

@@ -7,6 +7,7 @@
   <vcpu placement="static">2</vcpu>
   <os>
     <type arch="x86_64" machine="pc-i440fx-6.0">hvm</type>
+    <bootmenu enable="yes"/>
     <boot dev="hd"/>
   </os>
   <features>

data/spec/unit/action/set_boot_order_spec/explicit_boot_order.xml

@@ -8,6 +8,7 @@
   <vcpu placement="static">2</vcpu>
   <os>
     <type arch="x86_64" machine="pc-i440fx-6.0">hvm</type>
+    <bootmenu enable="yes"/>
     
   </os>
   <features>

data/spec/unit/action/set_boot_order_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-require 'support/sharedcontext'
-require 'support/libvirt_context'
+require_relative '../../spec_helper'
 
 require 'vagrant-libvirt/action/set_boot_order'
 

data/spec/unit/action/set_name_of_domain_spec.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require_relative '../../spec_helper'
+
+require 'vagrant-libvirt/action/set_name_of_domain'
 
 describe VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain do
   before :each do

data/spec/unit/action/shutdown_domain_spec.rb

@@ -1,6 +1,7 @@
-require 'spec_helper'
-require 'support/sharedcontext'
-require 'support/libvirt_context'
+# frozen_string_literal: true
+
+require_relative '../../spec_helper'
+
 require 'vagrant-libvirt/action/shutdown_domain'
 
 describe VagrantPlugins::ProviderLibvirt::Action::StartShutdownTimer do

data/spec/unit/action/start_domain_spec/clock_timer_removed.xml

@@ -30,7 +30,7 @@
       <target port='0'/>
     </console>
     <input bus='ps2' type='mouse'/>
-    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc' websocket='-1'/>
     <video>
       <model heads='1' type='cirrus' vram='16384'/>
     </video>

data/spec/unit/action/start_domain_spec/clock_timer_rtc.xml

@@ -30,7 +30,7 @@
       <target port='0'/>
     </console>
     <input bus='ps2' type='mouse'/>
-    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc' websocket='-1'/>
     <video>
       <model heads='1' type='cirrus' vram='16384'/>
     </video>

data/spec/unit/action/start_domain_spec/clock_timer_rtc_tsc.xml

@@ -31,7 +31,7 @@
       <target port='0'/>
     </console>
     <input bus='ps2' type='mouse'/>
-    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc' websocket='-1'/>
     <video>
       <model heads='1' type='cirrus' vram='16384'/>
     </video>

data/spec/unit/action/start_domain_spec/default.xml

@@ -28,7 +28,7 @@
       <target port='0'/>
     </console>
     <input bus='ps2' type='mouse'/>
-    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc' websocket='-1'/>
     <video>
       <model heads='1' type='cirrus' vram='16384'/>
     </video>

data/spec/unit/action/start_domain_spec/default_added_tpm_path.xml

@@ -28,7 +28,7 @@
       <target port='0'/>
     </console>
     <input bus='ps2' type='mouse'/>
-    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc' websocket='-1'/>
     <video>
       <model heads='1' type='cirrus' vram='16384'/>
     </video>

data/spec/unit/action/start_domain_spec/default_added_tpm_version.xml

@@ -28,7 +28,7 @@
       <target port='0'/>
     </console>
     <input bus='ps2' type='mouse'/>
-    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc' websocket='-1'/>
     <video>
       <model heads='1' type='cirrus' vram='16384'/>
     </video>

data/spec/unit/action/start_domain_spec/default_with_different_formatting.xml

@@ -29,7 +29,7 @@
       <target port='0'/>
     </console>
     <input bus='ps2' type='mouse'/>
-    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc' websocket='-1'/>
     <video>
       <model heads='1' type='cirrus' vram='16384'/>
     </video>

data/spec/unit/action/start_domain_spec/existing.xml

@@ -7,6 +7,7 @@
   <vcpu placement='static'>2</vcpu>
   <os>
     <type arch='x86_64' machine='pc-i440fx-6.0'>hvm</type>
+    <bootmenu enable='no'/>
     <boot dev='hd'/>
   </os>
   <features>
@@ -47,7 +48,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'>
+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us' websocket='-1'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <audio id='1' type='none'/>

data/spec/unit/action/start_domain_spec/existing_added_nvram.xml

@@ -7,6 +7,7 @@
   <vcpu placement='static'>2</vcpu>
   <os>
     <type arch='x86_64' machine='pc-i440fx-6.0'>hvm</type><loader type='pflash'>/path/to/loader/file</loader><nvram>/path/to/nvram/file</nvram>
+    <bootmenu enable='no'/>
     <boot dev='hd'/>
   </os>
   <features>
@@ -47,7 +48,7 @@
     </console>
     <input bus='ps2' type='mouse'/>
     <input bus='ps2' type='keyboard'/>
-    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc' websocket='-1'>
       <listen address='127.0.0.1' type='address'/>
     </graphics>
     <audio id='1' type='none'/>

data/spec/unit/action/start_domain_spec/existing_reordered.xml

@@ -7,6 +7,7 @@
   <vcpu placement='static'>2</vcpu>
   <os>
     <type arch='x86_64' machine='pc-i440fx-6.0'>hvm</type>
+    <bootmenu enable='no'/>
     <boot dev='hd'/>
   </os>
   <features>
@@ -47,7 +48,7 @@
     </console>
     <input bus='ps2' type='mouse'/>
     <input bus='ps2' type='keyboard'/>
-    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc' websocket="-1">
       <listen address='127.0.0.1' type='address'/>
     </graphics>
     <audio id='1' type='none'/>

data/spec/unit/action/start_domain_spec/nvram_domain.xml

@@ -7,6 +7,7 @@
   <vcpu placement='static'>2</vcpu>
   <os>
     <type arch='x86_64' machine='pc-i440fx-6.0'>hvm</type>
+    <bootmenu enable='no'/>
     <loader type='pflash'>/path/to/loader/file</loader>
     <nvram>/path/to/nvram/file</nvram>
     <boot dev='hd'/>

data/spec/unit/action/start_domain_spec/nvram_domain_other_setting.xml

@@ -7,6 +7,7 @@
   <vcpu placement='static'>2</vcpu>
   <os>
     <type arch='x86_64' machine='pc-i440fx-6.0'>hvm</type>
+    <bootmenu enable='no'/>
     <loader type='pflash'>/path/to/loader/file</loader>
     <nvram>/path/to/nvram/file1</nvram>
     <boot dev='hd'/>
@@ -49,7 +50,7 @@
     </console>
     <input bus='ps2' type='mouse'/>
     <input bus='ps2' type='keyboard'/>
-    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc' websocket='-1'>
       <listen address='127.0.0.1' type='address'/>
     </graphics>
     <audio id='1' type='none'/>

data/spec/unit/action/start_domain_spec/nvram_domain_removed.xml

@@ -7,6 +7,7 @@
   <vcpu placement='static'>2</vcpu>
   <os>
     <type arch='x86_64' machine='pc-i440fx-6.0'>hvm</type>
+    <bootmenu enable='no'/>
     
     
     <boot dev='hd'/>
@@ -49,7 +50,7 @@
     </console>
     <input bus='ps2' type='mouse'/>
     <input bus='ps2' type='keyboard'/>
-    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'>
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc' websocket='-1'>
       <listen address='127.0.0.1' type='address'/>
     </graphics>
     <audio id='1' type='none'/>

data/spec/unit/action/start_domain_spec.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-require 'support/sharedcontext'
-require 'support/libvirt_context'
+require_relative '../../spec_helper'
 
 require 'vagrant-libvirt/errors'
 require 'vagrant-libvirt/action/start_domain'
+require 'vagrant-libvirt/util/unindent'
 
 describe VagrantPlugins::ProviderLibvirt::Action::StartDomain do
   subject { described_class.new(app, env) }
@@ -34,6 +33,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::StartDomain do
 
       allow(logger).to receive(:debug)
       allow(logger).to receive(:info)
+      allow(ui).to receive(:info)
 
       allow(libvirt_domain).to receive(:xml_desc).and_return(domain_xml)
 
@@ -162,6 +162,195 @@ describe VagrantPlugins::ProviderLibvirt::Action::StartDomain do
       end
     end
 
+    context 'cpu' do
+      let(:test_file) { 'existing.xml' }
+      let(:updated_domain_xml) {
+        new_xml = domain_xml.dup
+        new_xml.gsub!(
+          /<cpu .*\/>/,
+          <<-EOF
+          <cpu check='partial' mode='custom'>
+            <model fallback='allow'>Haswell</model>
+            <feature name='vmx' policy='optional'/>
+            <feature name='svm' policy='optional'/>
+          </cpu>
+          EOF
+        )
+        new_xml
+      }
+      let(:vagrantfile_providerconfig) {
+        <<-EOF
+        libvirt.cpu_mode = 'custom'
+        libvirt.cpu_model = 'Haswell'
+        libvirt.nested = true
+        EOF
+      }
+
+      it 'should set cpu related settings when changed' do
+        expect(ui).to_not receive(:warn)
+        expect(connection).to receive(:define_domain).and_return(libvirt_domain)
+        expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml, updated_domain_xml)
+        expect(libvirt_domain).to receive(:autostart=)
+        expect(domain).to receive(:start)
+
+        expect(subject.call(env)).to be_nil
+      end
+
+      let(:domain_xml_no_cpu) {
+        new_xml = domain_xml.dup
+        new_xml.gsub!(/<cpu .*\/>/, '')
+        new_xml
+      }
+      let(:updated_domain_xml_new_cpu) {
+        new_xml = domain_xml.dup
+        new_xml.gsub!(
+          /<cpu .*\/>/,
+          <<-EOF
+          <cpu mode='custom'>
+            <model fallback='allow'>Haswell</model>
+            <feature name='vmx' policy='optional'/>
+            <feature name='svm' policy='optional'/>
+          </cpu>
+          EOF
+        )
+        new_xml
+      }
+
+      it 'should add cpu settings if not already present' do
+        expect(ui).to_not receive(:warn)
+        expect(connection).to receive(:define_domain).and_return(libvirt_domain)
+        expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml_no_cpu, updated_domain_xml_new_cpu)
+        expect(libvirt_domain).to receive(:autostart=)
+        expect(domain).to receive(:start)
+
+        expect(subject.call(env)).to be_nil
+      end
+    end
+
+    context 'launchSecurity' do
+      let(:updated_domain_xml_new_launch_security) {
+        new_xml = domain_xml.dup
+        new_xml.gsub!(
+          /<\/devices>/,
+          <<-EOF.unindent.rstrip
+          </devices>
+            <launchSecurity type='sev'>
+              <cbitpos>47</cbitpos>
+              <reducedPhysBits>1</reducedPhysBits>
+              <policy>0x0003</policy>
+            </launchSecurity>
+          EOF
+        )
+        new_xml
+      }
+
+      it 'should create if not already set' do
+        machine.provider_config.launchsecurity_data = {:type => 'sev', :cbitpos => 47, :reducedPhysBits => 1, :policy => "0x0003"}
+
+        expect(ui).to_not receive(:warn)
+        expect(connection).to receive(:define_domain).and_return(libvirt_domain)
+        expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml, updated_domain_xml_new_launch_security)
+        expect(libvirt_domain).to receive(:autostart=)
+        expect(domain).to receive(:start)
+
+        expect(subject.call(env)).to be_nil
+      end
+
+      context 'already exists' do
+        let(:domain_xml_launch_security) { updated_domain_xml_new_launch_security }
+        let(:updated_domain_xml_launch_security) {
+          new_xml = domain_xml_launch_security.dup
+          new_xml.gsub!(/<cbitpos>47/, '<cbitpos>48')
+          new_xml.gsub!(/<reducedPhysBits>1/, '<reducedPhysBits>2')
+          new_xml.gsub!(/<policy>0x0003/, '<policy>0x0004')
+          new_xml
+        }
+
+
+        it 'should update all settings' do
+          machine.provider_config.launchsecurity_data = {:type => 'sev', :cbitpos => 48, :reducedPhysBits => 2, :policy => "0x0004"}
+
+          expect(ui).to_not receive(:warn)
+          expect(connection).to receive(:define_domain).and_return(libvirt_domain)
+          expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml_launch_security, updated_domain_xml_launch_security)
+          expect(libvirt_domain).to receive(:autostart=)
+          expect(domain).to receive(:start)
+
+          expect(subject.call(env)).to be_nil
+        end
+
+        it 'should remove if disabled' do
+          machine.provider_config.launchsecurity_data = nil
+
+          expect(ui).to_not receive(:warn)
+          expect(connection).to receive(:define_domain).and_return(libvirt_domain)
+          expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml_launch_security, domain_xml)
+          expect(libvirt_domain).to receive(:autostart=)
+          expect(domain).to receive(:start)
+
+          expect(subject.call(env)).to be_nil
+        end
+
+        context 'with controllers' do
+          # makes domain_xml contain 2 controllers and memballoon
+          # which should mean that launchsecurity element exists, but without
+          # iommu set on controllers
+          let(:test_file) { 'existing.xml' }
+          let(:updated_domain_xml_launch_security_controllers) {
+            new_xml = updated_domain_xml_new_launch_security.dup
+            new_xml.gsub!(
+              /<controller type='pci' index='0' model='pci-root'\/>/,
+              "<controller type='pci' index='0' model='pci-root'><driver iommu='on'/></controller>",
+            )
+            new_xml.gsub!(
+              /(<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'\/>)/,
+              '\1<driver iommu="on"/>',
+            )
+            # memballoon
+            new_xml.gsub!(
+              /(<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'\/>)/,
+              '\1<driver iommu="on"/>',
+            )
+            new_xml
+          }
+
+          it 'should set driver iommu on all controllers' do
+            machine.provider_config.launchsecurity_data = {:type => 'sev', :cbitpos => 47, :reducedPhysBits => 1, :policy => "0x0003"}
+
+            expect(ui).to_not receive(:warn)
+            expect(connection).to receive(:define_domain).and_return(libvirt_domain)
+            expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml_launch_security, updated_domain_xml_launch_security_controllers)
+            expect(libvirt_domain).to receive(:autostart=)
+            expect(domain).to receive(:start)
+
+            expect(subject.call(env)).to be_nil
+          end
+        end
+      end
+    end
+
+    context 'graphics' do
+      context 'autoport not disabled' do
+        let(:test_file) { 'existing.xml' }
+        let(:launched_domain_xml) {
+          new_xml = domain_xml.dup
+          new_xml.gsub!(/graphics type='vnc' port='-1'/m, "graphics type='vnc' port='5900'")
+          new_xml
+        }
+
+        it 'should retrieve the port from XML' do
+          expect(ui).to_not receive(:warn)
+          expect(connection).to_not receive(:define_domain)
+          expect(libvirt_domain).to receive(:xml_desc).and_return(domain_xml, launched_domain_xml)
+          expect(libvirt_domain).to receive(:autostart=)
+          expect(domain).to receive(:start)
+          expect(ui).to receive(:info).with(' -- Graphics Port:      5900')
+
+          expect(subject.call(env)).to be_nil
+        end
+      end
+    end
+
     context 'nvram' do
       context 'when being added to existing' do
         let(:vagrantfile_providerconfig) do

data/spec/unit/action/wait_till_up_spec.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
+require_relative '../../spec_helper'
+
 require 'vagrant-libvirt/action/wait_till_up'
 require 'vagrant-libvirt/errors'
 
-require 'spec_helper'
-require 'support/sharedcontext'
-require 'support/libvirt_context'
-
 describe VagrantPlugins::ProviderLibvirt::Action::WaitTillUp do
   subject { described_class.new(app, env) }
 
@@ -74,7 +72,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::WaitTillUp do
         allow(domain).to receive(:wait_for).and_return(true)
         allow(env).to receive(:[]).and_call_original
         allow(env).to receive(:[]).with(:interrupted).and_return(false)
-        allow(driver).to receive(:get_domain_ipaddress).and_return('192.168.121.2')
+        allow(driver).to receive(:get_ipaddress).and_return('192.168.121.2')
       end
       it 'should call the next hook' do
         expect(app).to receive(:call)