vagrant-libvirt 0.10.7 → 0.11.1

data/spec/unit/action/prepare_nfs_settings_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-require 'support/sharedcontext'
+require_relative '../../spec_helper'
 
 require 'vagrant-libvirt/action/prepare_nfs_settings'
 
@@ -35,7 +34,6 @@ describe VagrantPlugins::ProviderLibvirt::Action::PrepareNFSSettings do
       let(:udp_socket) { double('udp_socket') }
 
       before do
-        allow(::TCPSocket).to receive(:new).and_return(socket)
         allow(socket).to receive(:close)
 
         allow(::UDPSocket).to receive(:open).and_return(udp_socket)
@@ -43,17 +41,35 @@ describe VagrantPlugins::ProviderLibvirt::Action::PrepareNFSSettings do
       end
 
       it 'should retrieve the guest IP address' do
-        times_called = 0
-        expect(::TCPSocket).to receive(:new) do
-          # force reaching later code
-          times_called += 1
-          times_called < 2 ? raise("StandardError") : socket
-        end
+        expect(::TCPSocket).to receive(:new).with('192.168.1.2', 'ssh').and_raise(StandardError)
+        expect(::TCPSocket).to receive(:new).with('192.168.2.2', 'ssh').and_return(socket)
         expect(machine).to receive(:ssh_info).and_return({:host => '192.168.1.2'})
         expect(communicator).to receive(:execute).and_yield(:stdout, "192.168.1.2\n192.168.2.2")
 
         expect(subject.call(env)).to be_nil
       end
+
+      it 'should use the ip if connection refused' do
+        expect(::TCPSocket).to receive(:new).with('192.168.1.2', 'ssh').and_raise(Errno::ECONNREFUSED)
+        expect(machine).to receive(:ssh_info).and_return({:host => '192.168.1.2'})
+
+        expect(subject.call(env)).to be_nil
+      end
+
+      it 'should use the ssh port defined' do
+        expect(::TCPSocket).to receive(:new).with('192.168.1.2', '2022').and_return(socket)
+        expect(machine).to receive(:ssh_info).and_return({:host => '192.168.1.2', :port => '2022'})
+
+        expect(subject.call(env)).to be_nil
+      end
+
+      it 'should raise an exception if machine ip not found' do
+        expect(::TCPSocket).to receive(:new).with('192.168.1.2', 'ssh').and_raise(StandardError)
+        expect(machine).to receive(:ssh_info).and_return({:host => '192.168.1.2'})
+        expect(communicator).to receive(:execute).and_yield(:stdout, "192.168.1.2")
+
+        expect { subject.call(env) }.to raise_error(::Vagrant::Errors::NFSNoHostonlyNetwork)
+      end
     end
   end
 end

data/spec/unit/action/remove_libvirt_image_spec.rb

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

data/spec/unit/action/resolve_disk_settings_spec/default_domain.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/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

@@ -0,0 +1,63 @@
+<domain type='qemu'>
+  <name>vagrant-libvirt_default</name>
+  <uuid>881a931b-0110-4d10-81aa-47a1a19f5726</uuid>
+  <description>Source: /home/test/vagrant-libvirt/Vagrantfile</description>
+  <memory unit='KiB'>2097152</memory>
+  <currentMemory unit='KiB'>2097152</currentMemory>
+  <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>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu check='partial' mode='host-passthrough'/>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk device='disk' type='file'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='/var/lib/libvirt/images/vagrant-libvirt_default.img'/>
+      <target bus='virtio' dev='vda'/>
+      <address bus='0x00' domain='0x0000' function='0x0' slot='0x03' type='pci'/>
+    </disk>
+    <controller index='0' model='pci-root' type='pci'/>
+    <controller index='0' model='piix3-uhci' type='usb'>
+      <address bus='0x00' domain='0x0000' function='0x2' slot='0x01' type='pci'/>
+    </controller>
+    <interface type='network'>
+      <mac address='52:54:00:7d:14:0e'/>
+      <source network='vagrant-libvirt'/>
+      <model type='virtio'/>
+      <address bus='0x00' domain='0x0000' function='0x0' slot='0x05' type='pci'/>
+    </interface>
+    <serial type='pty'>
+      <target port='0' type='isa-serial'>
+        <model name='isa-serial'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target port='0' type='serial'/>
+    </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' websocket="-1">
+      <listen address='127.0.0.1' type='address'/>
+    </graphics>
+    <audio id='1' type='none'/>
+    <video>
+      <model heads='1' primary='yes' type='cirrus' vram='16384'/>
+      <address bus='0x00' domain='0x0000' function='0x0' slot='0x02' type='pci'/>
+    </video>
+    <memballoon model='virtio'>
+      <address bus='0x00' domain='0x0000' function='0x0' slot='0x04' type='pci'/>
+    </memballoon>
+  </devices>
+</domain>

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'/>