vagrant-libvirt 0.7.0 → 0.8.0

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

@@ -5,15 +5,11 @@
   <uuid/>
   <memory/>
   <vcpu>1</vcpu>
-
-
   <cpu mode='host-model'>
-      <model fallback='allow'/>
+    <model fallback='allow'/>
   </cpu>
-
-
   <os>
-        <type>hvm</type>
+    <type>hvm</type>
     <kernel/>
     <initrd/>
     <cmdline/>
@@ -25,24 +21,16 @@
   </features>
   <clock offset='utc'/>
   <devices>
-
-
     <serial type='pty'>
       <target port='0'/>
     </serial>
     <console type='pty'>
       <target port='0'/>
     </console>
-
-
     <input bus='ps2' type='mouse'/>
-
-      <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
-      <video>
-        <model heads='1' type='cirrus' vram='9216'/>
-      </video>
-
-
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
+    <video>
+      <model heads='1' type='cirrus' vram='16384'/>
+    </video>
   </devices>
-
 </domain>

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

@@ -5,15 +5,11 @@
   <uuid/>
   <memory/>
   <vcpu>1</vcpu>
-
-
   <cpu mode='host-model'>
-      <model fallback='allow'/>
+    <model fallback='allow'/>
   </cpu>
-
-
   <os>
-        <type>hvm</type>
+    <type>hvm</type>
     <kernel/>
     <initrd/>
     <cmdline/>
@@ -25,24 +21,16 @@
   </features>
   <clock offset='utc'/>
   <devices>
-
-
     <serial type='pty'>
       <target port='0'/>
     </serial>
     <console type='pty'>
       <target port='0'/>
     </console>
-
-
     <input bus='ps2' type='mouse'/>
-
-      <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
-      <video>
-        <model heads='1' type='cirrus' vram='9216'/>
-      </video>
-
-
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
+    <video>
+      <model heads='1' type='cirrus' vram='16384'/>
+    </video>
   <tpm model='tpm-tis'><backend type='passthrough'><device path='/dev/tpm0'/></backend></tpm></devices>
-
 </domain>

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

@@ -5,15 +5,11 @@
   <uuid/>
   <memory/>
   <vcpu>1</vcpu>
-
-
   <cpu mode='host-model'>
-      <model fallback='allow'/>
+    <model fallback='allow'/>
   </cpu>
-
-
   <os>
-        <type>hvm</type>
+    <type>hvm</type>
     <kernel/>
     <initrd/>
     <cmdline/>
@@ -25,24 +21,16 @@
   </features>
   <clock offset='utc'/>
   <devices>
-
-
     <serial type='pty'>
       <target port='0'/>
     </serial>
     <console type='pty'>
       <target port='0'/>
     </console>
-
-
     <input bus='ps2' type='mouse'/>
-
-      <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
-      <video>
-        <model heads='1' type='cirrus' vram='9216'/>
-      </video>
-
-
+    <graphics autoport='yes' keymap='en-us' listen='127.0.0.1' port='-1' type='vnc'/>
+    <video>
+      <model heads='1' type='cirrus' vram='16384'/>
+    </video>
   <tpm model='tpm-crb'><backend type='emulator' version='2.0'/></tpm></devices>
-
 </domain>

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

@@ -52,7 +52,7 @@
     </graphics>
     <audio id='1' type='none'/>
     <video>
-      <model type='cirrus' vram='9216' heads='1' primary='yes'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

data/spec/unit/action/wait_till_up_spec.rb

@@ -24,6 +24,8 @@ describe VagrantPlugins::ProviderLibvirt::Action::WaitTillUp do
       allow(driver).to receive(:state).and_return(:running)
       # return some information for domain when needed
       allow(domain).to receive(:mac).and_return('9C:D5:53:F1:5A:E7')
+
+      allow(machine.provider_config).to receive(:qemu_use_session).and_return(false)
     end
 
     context 'when machine does not exist' do
@@ -86,46 +88,4 @@ describe VagrantPlugins::ProviderLibvirt::Action::WaitTillUp do
       end
     end
   end
-
-  describe '#recover' do
-    before do
-      allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver).to receive(:get_domain).and_return(machine)
-      allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver).to receive(:state)
-        .and_return(:not_created)
-      allow(env).to receive(:[]).and_call_original
-    end
-
-    it 'should do nothing by default' do
-      expect(env).to_not receive(:[]).with(:action_runner) # cleanup
-      expect(subject.recover(env)).to be_nil
-    end
-
-    context 'with machine coming up' do
-      before do
-        allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver).to receive(:state)
-          .and_return(:running)
-        env[:destroy_on_error] = true
-      end
-
-      context 'and user has disabled destroy on failure' do
-        before do
-          env[:destroy_on_error] = false
-        end
-
-        it 'skips terminate on failure' do
-          expect(env).to_not receive(:[]).with(:action_runner) # cleanup
-          expect(subject.recover(env)).to be_nil
-        end
-      end
-
-      context 'and using default settings' do
-        let(:runner) { double('runner') }
-        it 'deletes VM on failure' do
-          expect(env).to receive(:[]).with(:action_runner).and_return(runner) # cleanup
-          expect(runner).to receive(:run)
-          expect(subject.recover(env)).to be_nil
-        end
-      end
-    end
-  end
 end

data/spec/unit/action_spec.rb

@@ -27,6 +27,8 @@ describe VagrantPlugins::ProviderLibvirt::Action do
     allow(logger).to receive(:info)
     allow(logger).to receive(:debug)
     allow(logger).to receive(:error)
+
+    allow(connection.client).to receive(:libversion).and_return(6_002_000)
   end
 
   def allow_action_env_result(action, *responses)

data/spec/unit/config_spec.rb

@@ -171,55 +171,55 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         # ignore LIBVIRT_DEFAULT_URI due to explicit settings
         [ # when uri explicitly set
           {:uri => 'qemu:///system'},
-          {:uri => 'qemu:///system'},
+          {:uri => %r{qemu:///(system|session)}},
           {
-            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
+            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu:///custom'},
           }
         ],
         [ # when host explicitly set
           {:host => 'remote'},
-          {:uri => 'qemu://remote/system'},
+          {:uri => %r{qemu://remote/(system|session)}},
           {
-            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
+            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu:///custom'},
           }
         ],
         [ # when connect_via_ssh explicitly set
           {:connect_via_ssh => true},
-          {:uri => 'qemu+ssh://localhost/system?no_verify=1'},
+          {:uri => %r{qemu\+ssh://localhost/(system|session)\?no_verify=1}},
           {
-            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
+            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu:///custom'},
           }
         ],
         [ # when username explicitly set without ssh
           {:username => 'my_user' },
-          {:uri => 'qemu:///system', :username => 'my_user'},
+          {:uri => %r{qemu:///(system|session)}, :username => 'my_user'},
           {
-            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
+            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu:///custom'},
           }
         ],
         [ # when username explicitly set with host but without ssh
           {:username => 'my_user', :host => 'remote'},
-          {:uri => 'qemu://remote/system', :username => 'my_user'},
+          {:uri => %r{qemu://remote/(system|session)}, :username => 'my_user'},
           {
-            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
+            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu:///custom'},
           }
         ],
         [ # when password explicitly set
           {:password => 'some_password'},
-          {:uri => 'qemu:///system', :password => 'some_password'},
+          {:uri => %r{qemu:///(system|session)}, :password => 'some_password'},
           {
-            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
+            :env => {'LIBVIRT_DEFAULT_URI' => 'qemu:///custom'},
           }
         ],
 
         # driver settings
         [ # set to kvm only
           {:driver => 'kvm'},
-          {:uri => "qemu:///system"},
+          {:uri => %r{qemu:///(system|session)}},
         ],
         [ # set to qemu only
           {:driver => 'qemu'},
-          {:uri => "qemu:///system"},
+          {:uri => %r{qemu:///(system|session)}},
         ],
         [ # set to qemu with session enabled
           {:driver => 'qemu', :qemu_use_session => true},
@@ -241,29 +241,29 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         # connect_via_ssh settings
         [ # enabled
           {:connect_via_ssh => true},
-          {:uri => "qemu+ssh://localhost/system?no_verify=1"},
+          {:uri => %r{qemu\+ssh://localhost/(system|session)\?no_verify=1}},
         ],
         [ # enabled with user
           {:connect_via_ssh => true, :username => 'my_user'},
-          {:uri => "qemu+ssh://my_user@localhost/system?no_verify=1"},
+          {:uri => %r{qemu\+ssh://my_user@localhost/(system|session)\?no_verify=1}},
         ],
         [ # enabled with host
           {:connect_via_ssh => true, :host => 'remote_server'},
-          {:uri => "qemu+ssh://remote_server/system?no_verify=1"},
+          {:uri => %r{qemu\+ssh://remote_server/(system|session)\?no_verify=1}},
         ],
 
         # id_ssh_key_file behaviour
         [ # set should take given value
           {:connect_via_ssh => true, :id_ssh_key_file => '/path/to/keyfile'},
-          {:uri => 'qemu+ssh://localhost/system?no_verify=1&keyfile=/path/to/keyfile', :connect_via_ssh => true},
+          {:uri => %r{qemu\+ssh://localhost/(system|session)\?no_verify=1&keyfile=/path/to/keyfile}, :connect_via_ssh => true},
         ],
         [ # set should infer use of ssh
           {:id_ssh_key_file => '/path/to/keyfile'},
-          {:uri => 'qemu+ssh://localhost/system?no_verify=1&keyfile=/path/to/keyfile', :connect_via_ssh => true},
+          {:uri => %r{qemu\+ssh://localhost/(system|session)\?no_verify=1&keyfile=/path/to/keyfile}, :connect_via_ssh => true},
         ],
         [ # connect_via_ssh should enable default but ignore due to not existing
           {:connect_via_ssh => true},
-          {:uri => 'qemu+ssh://localhost/system?no_verify=1', :id_ssh_key_file => nil},
+          {:uri => %r{qemu\+ssh://localhost/(system|session)\?no_verify=1}, :id_ssh_key_file => nil},
           {
             :setup => ProcWithBinding.new {
               expect(File).to receive(:file?).with("/home/tests/.ssh/id_rsa").and_return(false)
@@ -272,7 +272,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         ],
         [ # connect_via_ssh should enable default and include due to existing
           {:connect_via_ssh => true},
-          {:uri => 'qemu+ssh://localhost/system?no_verify=1&keyfile=/home/tests/.ssh/id_rsa', :id_ssh_key_file => '/home/tests/.ssh/id_rsa'},
+          {:uri => %r{qemu\+ssh://localhost/(system|session)\?no_verify=1&keyfile=/home/tests/\.ssh/id_rsa}, :id_ssh_key_file => '/home/tests/.ssh/id_rsa'},
           {
             :setup => ProcWithBinding.new {
               expect(File).to receive(:file?).with("/home/tests/.ssh/id_rsa").and_return(true)
@@ -283,7 +283,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         # socket behaviour
         [ # set
           {:socket => '/var/run/libvirt/libvirt-sock'},
-          {:uri => "qemu:///system?socket=/var/run/libvirt/libvirt-sock"},
+          {:uri => %r{qemu:///(system|session)\?socket=/var/run/libvirt/libvirt-sock}},
         ],
       ].each do |inputs, outputs, options|
         opts = {}
@@ -317,7 +317,8 @@ describe VagrantPlugins::ProviderLibvirt::Config do
               hash["#{name.to_s[1..-1]}".to_sym] =subject.instance_variable_get(name)
             end
           end
-          expect(got).to eq(outputs)
+
+          expect(got).to match(outputs.inject({}) { |h, (k, v)| h[k] = v.is_a?(Regexp) ? a_string_matching(v) : v; h })
         end
       end
 
@@ -531,6 +532,47 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         end
       end
     end
+
+    context '@channels' do
+      it 'should be empty by default' do
+        subject.finalize!
+
+        expect(subject.channels).to be_empty
+      end
+
+      context 'when qemu_use_agent is set' do
+        before do
+          subject.qemu_use_agent = true
+        end
+
+        it 'should inject a qemu agent channel' do
+          subject.finalize!
+
+          expect(subject.channels).to_not be_empty
+          expect(subject.channels).to match([a_hash_including({:target_name => 'org.qemu.guest_agent.0'})])
+        end
+
+        context 'when agent channel already added' do
+          it 'should not modify the channels' do
+            subject.channel :type => 'unix', :target_name => 'org.qemu.guest_agent.0', :target_type => 'virtio'
+
+            subject.finalize!
+
+            expect(subject.channels.length).to eq(1)
+          end
+
+          context 'when agent channel explicitly disbaled' do
+            it 'should not include an agent channel' do
+              subject.channel :type => 'unix', :target_name => 'org.qemu.guest_agent.0', :disabled => true
+
+              subject.finalize!
+
+              expect(subject.channels).to be_empty
+            end
+          end
+        end
+      end
+    end
   end
 
   def assert_invalid
@@ -566,7 +608,9 @@ describe VagrantPlugins::ProviderLibvirt::Config do
 
     context 'with mac defined' do
       let (:vm) { double('vm') }
-      before { expect(machine.config).to receive(:vm).and_return(vm) }
+      before do
+        machine.config.instance_variable_get("@keys")[:vm] = vm
+      end
 
       it 'is valid with valid mac' do
         expect(vm).to receive(:networks).and_return([[:public, { mac: 'aa:bb:cc:dd:ee:ff' }]])
@@ -585,6 +629,21 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         assert_invalid
       end
     end
+
+    context 'with cpu_mode and cpu_model defined' do
+      it 'should discard model if mode is passthrough' do
+        subject.cpu_mode = 'host-passthrough'
+        subject.cpu_model = 'qemu64'
+        assert_valid
+        expect(subject.cpu_model).to be_empty
+      end
+
+      it 'should allow custom mode with model' do
+        subject.cpu_mode = 'custom'
+        subject.cpu_model = 'qemu64'
+        assert_valid
+      end
+    end
   end
 
   describe '#merge' do
@@ -606,11 +665,11 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         end
 
         context 'without devices given' do
-          it 'should merge disks with different devices assigned automatically' do
+          it 'should merge disks without assigning devices automatically' do
             one.storage(:file)
             two.storage(:file)
             subject.finalize!
-            expect(subject.disks).to include(include(device: 'vdb'),
+            expect(subject.disks).to_not include(include(device: 'vdb'),
                                              include(device: 'vdc'))
           end
         end

data/spec/unit/driver_spec.rb

@@ -35,10 +35,10 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
   # 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") } 
+  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.
@@ -177,7 +177,7 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
       end
 
       context 'when qemu_use_session is enabled' do
-        let(:networks) { [instance_double('::Fog::Libvirt::Compute::Real')] }
+        let(:networks) { [instance_double(::Fog::Libvirt::Compute::Real)] }
         let(:dhcp_leases) {
           {
             "iface"      =>"virbr0",
@@ -245,12 +245,21 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
           end,
         }
       ],
+      [
+        nil,
+        :unknown,
+        {
+          :setup => ProcWithBinding.new do
+            expect(domain).to receive(:state).and_return('unknown').at_least(:once)
+          end,
+        }
+      ],
       [
         'terminated',
         :not_created,
         {
           :setup => ProcWithBinding.new do
-            expect(domain).to receive(:state).and_return('terminated')
+            expect(domain).to receive(:state).and_return('terminated').at_least(:once)
           end,
         }
       ],
@@ -259,7 +268,7 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
         :inaccessible,
         {
           :setup => ProcWithBinding.new do
-            expect(domain).to receive(:state).and_return('running').twice()
+            expect(domain).to receive(:state).and_return('running').at_least(:once)
             expect(subject).to receive(:get_domain_ipaddress).and_raise(Fog::Errors::TimeoutError)
           end,
         }
@@ -269,7 +278,7 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
         :running,
         {
           :setup => ProcWithBinding.new do
-            expect(domain).to receive(:state).and_return('running').twice()
+            expect(domain).to receive(:state).and_return('running').at_least(:once)
             expect(subject).to receive(:get_domain_ipaddress).and_return('192.168.121.2')
           end,
         }

data/spec/unit/provider_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'support/sharedcontext'
+
+describe 'VagrantPlugins::ProviderLibvirt::Provider' do
+  require 'vagrant-libvirt/provider'
+
+  include_context 'unit'
+
+  describe '#ssh_info' do
+  end
+end