vagrant-libvirt 0.10.8 → 0.11.2

data/spec/unit/driver_spec.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require 'fog/libvirt/requests/compute/dhcp_leases'
+require_relative '../spec_helper'
+require_relative '../support/binding_proc'
 
-require 'spec_helper'
-require 'support/binding_proc'
-require 'support/sharedcontext'
+require 'fog/libvirt/requests/compute/dhcp_leases'
 
 require 'vagrant-libvirt/driver'
 
@@ -14,87 +13,94 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
 
   subject { described_class.new(machine) }
 
-  let(:vagrantfile) do
-    <<-EOF
-    Vagrant.configure('2') do |config|
-      config.vm.define :test1 do |node|
-        node.vm.provider :libvirt do |domain|
-          domain.uri = "qemu+ssh://user@remote1/system"
-        end
-      end
-      config.vm.define :test2 do |node|
-        node.vm.provider :libvirt do |domain|
-          domain.uri = "qemu+ssh://vms@remote2/system"
-        end
-      end
-    end
-    EOF
-  end
-
-  # need to override the default package iso_env as using a different
-  # name for the test machines above.
-  let(:machine)    { iso_env.machine(:test1, :libvirt) }
-  let(:machine2)   { iso_env.machine(:test2, :libvirt) }
-  let(:connection1) { double("connection 1") }
-  let(:connection2) { double("connection 2") }
-  let(:system_connection1) { double("system connection 1") }
-  let(:system_connection2) { double("system connection 2") }
-
   # make it easier for distros that want to switch the default value for
   # qemu_use_session to true by ensuring it is explicitly false for tests.
   before do
     allow(machine.provider_config).to receive(:qemu_use_session).and_return(false)
     allow(logger).to receive(:info)
     allow(logger).to receive(:debug)
-    allow(machine.provider).to receive('driver').and_call_original
-    allow(machine2.provider).to receive('driver').and_call_original
   end
 
-  describe '#connection' do
-    it 'should configure a separate connection per machine' do
-      expect(Fog::Compute).to receive(:new).with(
-        hash_including({:libvirt_uri => 'qemu+ssh://user@remote1/system'})).and_return(connection1)
-      expect(Fog::Compute).to receive(:new).with(
-        hash_including({:libvirt_uri => 'qemu+ssh://vms@remote2/system'})).and_return(connection2)
+  describe 'connections' do
+    let(:vagrantfile) do
+      <<-EOF
+      Vagrant.configure('2') do |config|
+        config.vm.define :test1 do |node|
+          node.vm.provider :libvirt do |domain|
+            domain.uri = "qemu+ssh://user@remote1/system"
+          end
+        end
+        config.vm.define :test2 do |node|
+          node.vm.provider :libvirt do |domain|
+            domain.uri = "qemu+ssh://vms@remote2/system"
+          end
+        end
+      end
+      EOF
+    end
 
-      expect(machine.provider.driver.connection).to eq(connection1)
-      expect(machine2.provider.driver.connection).to eq(connection2)
+    # need to override the default package iso_env as using a different
+    # name for the test machines above.
+    let(:machine)    { iso_env.machine(:test1, :libvirt) }
+    let(:machine2)   { iso_env.machine(:test2, :libvirt) }
+    let(:connection1) { double("connection 1") }
+    let(:connection2) { double("connection 2") }
+    let(:system_connection1) { double("system connection 1") }
+    let(:system_connection2) { double("system connection 2") }
+
+    # make it easier for distros that want to switch the default value for
+    # qemu_use_session to true by ensuring it is explicitly false for tests.
+    before do
+      allow(machine.provider).to receive('driver').and_call_original
+      allow(machine2.provider).to receive('driver').and_call_original
     end
 
-    it 'should configure the connection once' do
-      expect(Fog::Compute).to receive(:new).once().and_return(connection1)
+    describe '#connection' do
+      it 'should configure a separate connection per machine' do
+        expect(Fog::Compute).to receive(:new).with(
+          hash_including({:libvirt_uri => 'qemu+ssh://user@remote1/system'})).and_return(connection1)
+        expect(Fog::Compute).to receive(:new).with(
+          hash_including({:libvirt_uri => 'qemu+ssh://vms@remote2/system'})).and_return(connection2)
 
-      expect(machine.provider.driver.connection).to eq(connection1)
-      expect(machine.provider.driver.connection).to eq(connection1)
-      expect(machine.provider.driver.connection).to eq(connection1)
-    end
-  end
+        expect(machine.provider.driver.connection).to eq(connection1)
+        expect(machine2.provider.driver.connection).to eq(connection2)
+      end
 
-  describe '#system_connection' do
-    # note that the urls for the two tests are currently
-    # incorrect here as they should be the following:
-    #   qemu+ssh://user@remote1/system
-    #   qemu+ssh://vms@remote2/system
-    #
-    # In that the system uri should be resolved based on
-    # the provider uri so that for:
-    #   uri => qemu+ssh://user@remote1/session
-    # system_uri should be 'qemu+ssh://user@remote1/system'
-    # and not 'qemu:///system'.
-    it 'should configure a separate connection per machine' do
-      expect(Libvirt).to receive(:open_read_only).with('qemu+ssh://user@remote1/system').and_return(system_connection1)
-      expect(Libvirt).to receive(:open_read_only).with('qemu+ssh://vms@remote2/system').and_return(system_connection2)
-
-      expect(machine.provider.driver.system_connection).to eq(system_connection1)
-      expect(machine2.provider.driver.system_connection).to eq(system_connection2)
+      it 'should configure the connection once' do
+        expect(Fog::Compute).to receive(:new).once().and_return(connection1)
+
+        expect(machine.provider.driver.connection).to eq(connection1)
+        expect(machine.provider.driver.connection).to eq(connection1)
+        expect(machine.provider.driver.connection).to eq(connection1)
+      end
     end
 
-    it 'should configure the connection once' do
-      expect(Libvirt).to receive(:open_read_only).with('qemu+ssh://user@remote1/system').and_return(system_connection1)
+    describe '#system_connection' do
+      # note that the urls for the two tests are currently
+      # incorrect here as they should be the following:
+      #   qemu+ssh://user@remote1/system
+      #   qemu+ssh://vms@remote2/system
+      #
+      # In that the system uri should be resolved based on
+      # the provider uri so that for:
+      #   uri => qemu+ssh://user@remote1/session
+      # system_uri should be 'qemu+ssh://user@remote1/system'
+      # and not 'qemu:///system'.
+      it 'should configure a separate connection per machine' do
+        expect(Libvirt).to receive(:open_read_only).with('qemu+ssh://user@remote1/system').and_return(system_connection1)
+        expect(Libvirt).to receive(:open_read_only).with('qemu+ssh://vms@remote2/system').and_return(system_connection2)
+
+        expect(machine.provider.driver.system_connection).to eq(system_connection1)
+        expect(machine2.provider.driver.system_connection).to eq(system_connection2)
+      end
+
+      it 'should configure the connection once' do
+        expect(Libvirt).to receive(:open_read_only).with('qemu+ssh://user@remote1/system').and_return(system_connection1)
 
-      expect(machine.provider.driver.system_connection).to eq(system_connection1)
-      expect(machine.provider.driver.system_connection).to eq(system_connection1)
-      expect(machine.provider.driver.system_connection).to eq(system_connection1)
+        expect(machine.provider.driver.system_connection).to eq(system_connection1)
+        expect(machine.provider.driver.system_connection).to eq(system_connection1)
+        expect(machine.provider.driver.system_connection).to eq(system_connection1)
+      end
     end
   end
 
@@ -114,7 +120,7 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
         # ideally should be able to yield a block to wait_for and check that
         # the 'addresses' function on the domain is called correctly.
         expect(domain).to receive(:wait_for).and_return(nil)
-        expect(subject.get_ipaddress(machine)).to eq(nil)
+        expect(subject.get_ipaddress).to eq(nil)
       end
 
       context 'when qemu_use_agent is enabled' do
@@ -159,7 +165,7 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
           expect(libvirt_domain).to receive(:qemu_agent_command).and_return(qemu_agent_interfaces)
           expect(domain).to receive(:mac).and_return("52:54:00:f8:67:98").exactly(2).times
 
-          expect(subject.get_ipaddress(machine)).to eq("192.168.122.42")
+          expect(subject.get_ipaddress).to eq("192.168.122.42")
         end
 
         context 'when qemu_use_session is enabled' do
@@ -173,13 +179,14 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
             expect(libvirt_domain).to receive(:qemu_agent_command).and_return(qemu_agent_interfaces)
             expect(domain).to receive(:mac).and_return("52:54:00:f8:67:98").exactly(2).times
 
-            expect(subject.get_ipaddress(machine)).to eq("192.168.122.42")
+            expect(subject.get_ipaddress).to eq("192.168.122.42")
           end
         end
       end
 
       context 'when qemu_use_session is enabled' do
-        let(:networks) { [instance_double(::Fog::Libvirt::Compute::Real)] }
+        let(:system_connection) { double("system connection") }
+        let(:networks) { [instance_double(::Libvirt::Network)] }
         let(:dhcp_leases) {
           {
             "iface"      =>"virbr0",
@@ -199,11 +206,10 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
 
         it 'should retrieve the address via the system dhcp-leases API' do
           expect(domain).to receive(:mac).and_return("52:54:00:8b:dc:5f")
-          expect(subject).to receive(:system_connection).and_return(system_connection1)
-          expect(system_connection1).to receive(:list_all_networks).and_return(networks)
+          expect(subject).to receive(:list_all_networks).and_return(networks)
           expect(networks[0]).to receive(:dhcp_leases).and_return([dhcp_leases])
 
-          expect(subject.get_ipaddress(machine)).to eq("192.168.122.43")
+          expect(subject.get_ipaddress).to eq("192.168.122.43")
         end
 
         context 'when qemu_use_agent is enabled' do
@@ -214,13 +220,144 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
           it 'should retrieve the address via the agent' do
             expect(subject).to receive(:get_ipaddress_from_qemu_agent).and_return("192.168.122.44")
 
-            expect(subject.get_ipaddress(machine)).to eq("192.168.122.44")
+            expect(subject.get_ipaddress).to eq("192.168.122.44")
           end
         end
       end
     end
   end
 
+
+  describe '#list_all_networks' do
+    let(:vagrantfile_providerconfig) do
+      <<-EOF
+        libvirt.uri = "qemu:///system"
+      EOF
+    end
+
+    let(:libvirt_networks) { [
+      instance_double(::Libvirt::Network),
+      instance_double(::Libvirt::Network),
+      instance_double(::Libvirt::Network),
+    ] }
+
+    before do
+      allow(subject).to receive(:connection).and_return(connection)
+      allow(connection).to receive(:client).and_return(libvirt_client)
+      expect(libvirt_client).to receive(:list_all_networks).and_return(libvirt_networks)
+    end
+
+    it 'should list networks' do
+      expect(libvirt_networks[0]).to receive(:bridge_name).and_return('')
+      expect(libvirt_networks[1]).to receive(:bridge_name).and_return('virbr0')
+      expect(libvirt_networks[2]).to receive(:bridge_name).and_return('virbr1')
+
+      expect(subject.list_all_networks).to eq(libvirt_networks)
+    end
+
+    it 'should skip networks missing bridge_name' do
+      expect(libvirt_networks[0]).to receive(:bridge_name).and_return('')
+      expect(libvirt_networks[1]).to receive(:bridge_name).and_raise(Libvirt::Error)
+      expect(libvirt_networks[1]).to receive(:name).and_return('bad_network')
+      expect(libvirt_networks[2]).to receive(:bridge_name).and_return('virbr1')
+
+      expect(subject.list_all_networks).to eq([libvirt_networks[0], libvirt_networks[2]])
+    end
+  end
+
+  describe '#host_devices' do
+    let(:vagrantfile_providerconfig) do
+      <<-EOF
+        libvirt.uri = "qemu:///system"
+      EOF
+    end
+
+    let(:ip_link_show) {
+      JSON.dump(
+        [
+          # trimmed element details of what would be returned by 'ip -j link show'
+          { "ifindex": 1, "ifname": "lo", "group": "default", "link_type": "loopback"},
+          { "ifindex": 2, "ifname": "eth0", "group": "default", "link_type": "ether"},
+          { "ifindex": 3, "ifname": "eth1", "group": "default", "link_type": "ether"},
+          { "ifindex": 4, "ifname": "virbr0", "group": "default", "link_type": "ether"},
+        ]
+      )
+    }
+
+    let(:libvirt_interfaces) { [
+      instance_double(Libvirt::Interface),
+      instance_double(Libvirt::Interface),
+    ] }
+    let(:libvirt_networks) { [
+      instance_double(Libvirt::Network),
+      instance_double(Libvirt::Network),
+    ] }
+
+    before do
+      allow(subject).to receive(:connection).and_return(connection)
+
+      allow(Vagrant::Util::Subprocess).to receive(:execute) do |*arr|
+        expect(arr[0]).to eq('ip')
+      end.and_return(Vagrant::Util::Subprocess::Result.new(exit_code=0, stdout=ip_link_show, stderr=''))
+
+      expect(libvirt_client).to receive(:list_all_interfaces).and_return(libvirt_interfaces)
+      expect(subject).to receive(:list_all_networks).and_return(libvirt_networks)
+      expect(libvirt_interfaces[0]).to receive(:name).and_return('eth0')
+      expect(libvirt_interfaces[1]).to receive(:name).and_return('virbr0')
+      expect(libvirt_networks[0]).to receive(:bridge_name).and_return('')
+      expect(libvirt_networks[1]).to receive(:bridge_name).and_return('virbr0')
+    end
+
+    it 'should query system and libvirt' do
+      expect(subject.host_devices).to eq(['lo', 'eth0', 'eth1', 'virbr0'])
+    end
+
+    it 'should handle empty string' do
+      expect(machine.provider_config).to receive(:proxy_command).and_return('').twice
+
+      expect(subject.host_devices).to eq(['lo', 'eth0', 'eth1', 'virbr0'])
+    end
+
+    it 'should cache the result' do
+      expect(machine.provider_config).to receive(:proxy_command).and_return(nil).once
+
+      expect(subject.host_devices).to eq(['lo', 'eth0', 'eth1', 'virbr0'])
+      expect(subject.host_devices).to eq(['lo', 'eth0', 'eth1', 'virbr0'])
+    end
+
+    context 'when libvirt is remote' do
+      let(:vagrantfile_providerconfig) do
+        <<-EOF
+          libvirt.uri = "qemu+ssh://remote-server/system"
+        EOF
+      end
+
+      before do
+        allow(machine.provider_config).to receive(:proxy_command).and_return('ssh remote-server -W %h:%p')
+      end
+
+      it 'should use ssh for ip link' do
+        expect(Vagrant::Util::Subprocess).to receive(:execute) do |*arr|
+          expect(arr[0..3]).to eq(['ssh', 'remote-server', 'ip', '-j'])
+        end.and_return(Vagrant::Util::Subprocess::Result.new(exit_code=0, stdout=ip_link_show, stderr=''))
+
+        expect(subject.host_devices).to eq(['lo', 'eth0', 'eth1', 'virbr0'])
+      end
+
+      it 'should construct the ssh command with all options when needed' do
+        machine.provider_config.port = 2022
+        machine.provider_config.username = 'remote-user'
+        machine.provider_config.id_ssh_key_file = 'my-key-file'
+
+        expect(Vagrant::Util::Subprocess).to receive(:execute) do |*arr|
+          expect(arr[0..9]).to eq(['ssh', 'remote-server', '-p', '2022', '-l', 'remote-user', '-i', 'my-key-file', 'ip', '-j'])
+        end.and_return(Vagrant::Util::Subprocess::Result.new(exit_code=0, stdout=ip_link_show, stderr=''))
+
+        expect(subject.host_devices).to eq(['lo', 'eth0', 'eth1', 'virbr0'])
+      end
+    end
+  end
+
   describe '#state' do
     let(:domain) { double('domain') }
 
@@ -271,7 +408,7 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
         {
           :setup => ProcWithBinding.new do
             expect(domain).to receive(:state).and_return('running').at_least(:once)
-            expect(subject).to receive(:get_domain_ipaddress).and_raise(Fog::Errors::TimeoutError)
+            expect(subject).to receive(:get_ipaddress).and_raise(Fog::Errors::TimeoutError)
           end,
         }
       ],
@@ -281,7 +418,7 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
         {
           :setup => ProcWithBinding.new do
             expect(domain).to receive(:state).and_return('running').at_least(:once)
-            expect(subject).to receive(:get_domain_ipaddress).and_return('192.168.121.2')
+            expect(subject).to receive(:get_ipaddress).and_return('192.168.121.2')
           end,
         }
       ],
@@ -294,7 +431,7 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
           opts[:setup].apply_binding(binding)
         end
 
-        expect(subject.state(machine)).to eq(expected)
+        expect(subject.state).to eq(expected)
       end
     end
   end

data/spec/unit/plugin_spec.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-require 'support/sharedcontext'
+require_relative '../spec_helper'
 
 require 'vagrant-libvirt'
 require 'vagrant-libvirt/plugin'
+require 'vagrant-libvirt/action'
+require 'vagrant-libvirt/action/remove_libvirt_image'
 
 
 describe VagrantPlugins::ProviderLibvirt::Plugin do
@@ -25,7 +26,9 @@ describe VagrantPlugins::ProviderLibvirt::Plugin do
     end
 
     it 'should call the action hook after box remove' do
-      expect(VagrantPlugins::ProviderLibvirt::Action).to receive(:remove_libvirt_image).and_return(Vagrant::Action::Builder.new)
+      expect_any_instance_of(VagrantPlugins::ProviderLibvirt::Action::RemoveLibvirtImage).to receive(:call) do |cls, env|
+        cls.instance_variable_get(:@app).call(env)
+      end
       expect {
         env[:env].action_runner.run(
           Vagrant::Action.action_box_remove, {

data/spec/unit/templates/domain_all_settings.xml

@@ -13,7 +13,12 @@
   <numatune>
     <memory nodeset='1-4,^3,6'/>
   </numatune>
+  <memtune>
+    <hard_limit unit='KiB'>250000</hard_limit>
+    <soft_limit unit='KiB'>200000</soft_limit>
+  </memtune>
   <cputune>
+    <vcpupin vcpu="0" cpuset="0" />
     <shares>1024</shares>
   </cputune>
   <os>
@@ -53,24 +58,35 @@
       <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'/>
+      <address type='virtio-mmio'/>
     </disk>
     <disk type='file' device='disk'>
       <alias name='ua-box-volume-1'/>
       <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'/>
+      <address type='virtio-mmio'/>
     </disk>
     <disk type='file' device='disk'>
       <alias name='ua-disk-volume-0'/>
       <driver name='qemu' type='qcow2' cache='default'/>
       <source file='/var/lib/libvirt/images/test-disk1.qcow2'/>
       <target dev='vdc' bus='virtio'/>
+      <address type='virtio-mmio'/>
     </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='vdd' bus='virtio'/>
+      <address type='virtio-mmio'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <alias name='ua-disk-volume-2'/>
+      <driver name='qemu' type='qcow2' cache='default'/>
+      <source file='/var/lib/libvirt/images/test-disk3.qcow2'/>
+      <target dev='vde' bus='virtio'/>
+      <address type='pci'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw' />
@@ -84,6 +100,10 @@
       <target dev='hdb' bus='ide'/>
       <readonly/>
     </disk>
+    <disk type='file' device='floppy'>
+      <source file=''/>
+      <target dev='fda' bus='fdc'/>
+    </disk>
     <serial type='file'>
       <source path='/var/log/vm_consoles/machine.log'/>
       <target port='0'/>
@@ -102,12 +122,13 @@
       <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'>
+    <input type='mouse' bus='ps2'>
+    </input>
+    <graphics type='vnc' port='-1' autoport='yes' websocket='-1' listen='127.0.0.1' keymap='en-us'>
       <gl enable='yes'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='16384' heads='1'>
+      <model type='virtio' vram='16384' heads='1'>
         <acceleration accel3d='yes'/>
       </model>
     </video>
@@ -149,7 +170,8 @@
         <device path='/dev/tpm0'/>
       </backend>
     </tpm>
-    <controller type='usb' model='nec-xhci' ports="4" />
+    <controller type='usb' model='nec-xhci' ports="4" >
+    </controller>
   </devices>
   <qemu:commandline>
     <qemu:arg value='-device'/>

data/spec/unit/templates/domain_cpu_mode_passthrough.xml

@@ -12,6 +12,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -30,8 +31,9 @@
     <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'/>
+    <input type='mouse' bus='ps2'>
+    </input>
+    <graphics type='vnc' port='-1' autoport='yes' websocket='-1' listen='127.0.0.1' keymap='en-us'/>
     <video>
       <model type='cirrus' vram='16384' heads='1'/>
     </video>

data/spec/unit/templates/domain_custom_cpu_model.xml

@@ -10,6 +10,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -28,8 +29,9 @@
     <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'/>
+    <input type='mouse' bus='ps2'>
+    </input>
+    <graphics type='vnc' port='-1' autoport='yes' websocket='-1' listen='127.0.0.1' keymap='en-us'/>
     <video>
       <model type='cirrus' vram='16384' heads='1'/>
     </video>

data/spec/unit/templates/domain_defaults.xml

@@ -10,6 +10,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -28,8 +29,9 @@
     <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'/>
+    <input type='mouse' bus='ps2'>
+    </input>
+    <graphics type='vnc' port='-1' autoport='yes' websocket='-1' listen='127.0.0.1' keymap='en-us'/>
     <video>
       <model type='cirrus' vram='16384' heads='1'/>
     </video>

data/spec/unit/templates/domain_scsi_bus_storage.xml

@@ -10,6 +10,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -35,8 +36,9 @@
     <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'/>
+    <input type='mouse' bus='ps2'>
+    </input>
+    <graphics type='vnc' port='-1' autoport='yes' websocket='-1' listen='127.0.0.1' keymap='en-us'/>
     <video>
       <model type='cirrus' vram='16384' heads='1'/>
     </video>

data/spec/unit/templates/domain_scsi_device_storage.xml

@@ -10,6 +10,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -35,8 +36,9 @@
     <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'/>
+    <input type='mouse' bus='ps2'>
+    </input>
+    <graphics type='vnc' port='-1' autoport='yes' websocket='-1' listen='127.0.0.1' keymap='en-us'/>
     <video>
       <model type='cirrus' vram='16384' heads='1'/>
     </video>

data/spec/unit/templates/domain_scsi_multiple_controllers_storage.xml

@@ -10,6 +10,7 @@
   </cpu>
   <os>
     <type>hvm</type>
+    <bootmenu enable='no'/>
     <kernel></kernel>
     <initrd></initrd>
     <cmdline></cmdline>
@@ -121,8 +122,9 @@
     <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'/>
+    <input type='mouse' bus='ps2'>
+    </input>
+    <graphics type='vnc' port='-1' autoport='yes' websocket='-1' listen='127.0.0.1' keymap='en-us'/>
     <video>
       <model type='cirrus' vram='16384' heads='1'/>
     </video>