vagrant-libvirt 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af89387fcdeb6518bd31879ac2eaa00373c3af1c02613b389868eb6c656b5f2b
-  data.tar.gz: 82fa3560eb88abac51088e894d8e475bbf4dbcda4b10596b43e7fc41d158945a
+  metadata.gz: 4af147b9b5fb6d00d46b0027da6314153012a8fe8c77e64ba0a497ccb46151fa
+  data.tar.gz: 052ea81b672906f4b2c2476c0f7e84f4f0e40f45fb00d70239a68f25c94311a2
 SHA512:
-  metadata.gz: 53d1714279eaa3ed9c0434b891bad6bc03b4f52a0c2a5aed6e0736cefa89a3f66243ec3d04e2bf1bb707f76169e2f799ffa98e63f3cfdc3c91ee0d56e5332695
-  data.tar.gz: 15ea6d1ce672545f14f3886a6d945f2349c85cca61a63604abf30f5a716b9665c65ea181fd2dcb96c39321567725911b230d22d1c589c888a2b05ec9c7715b13
+  metadata.gz: 12662ab4dd96312b36cb5afa24d35b6558f247e53bbfb89903d748fb7c59e4cef2847c75d5025e8b8b39b92f5914b44647ff80e8aa3ac0e829f95648538540ee
+  data.tar.gz: fe1005190e1904f64fe60a4dddeadc867a7898c59b5762fa3db03d106b37091e1a5335a453c1b39728bb715603c1a18c1ea22d560a8da66fd7cb4c52e42fe8a0

data/README.md

@@ -1389,6 +1389,24 @@ Name of network "foreman_managed" is key for define boot order
       end
 ```
 
+An example VM that is PXE booted from the `br1` device (which must already be configured in the host machine), and if that fails, is booted from the disk:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define :pxeclient do |pxeclient|
+    pxeclient.vm.network :public_network,
+      dev: 'br1',
+      auto_config: false
+    pxeclient.vm.provider :libvirt do |domain|
+      boot_network = {'dev' => 'br1'}
+      domain.storage :file, :size => '100G'
+      domain.boot boot_network
+      domain.boot 'hd'
+    end
+  end
+end
+```
+
 ## SSH Access To VM
 
 vagrant-libvirt supports vagrant's [standard ssh

data/lib/vagrant-libvirt/action/clean_machine_folder.rb

@@ -19,6 +19,8 @@ module VagrantPlugins
 
           @logger.debug("Recursively removing: #{machine_folder}")
           FileUtils.rm_rf(machine_folder, :secure => true)
+          # need to recreate to prevent exception during a cancelled up
+          FileUtils.mkdir_p(machine_folder)
 
           @app.call(env)
         end

data/lib/vagrant-libvirt/action/create_domain.rb

@@ -33,7 +33,8 @@ module VagrantPlugins
           # Gather some info about domain
           @name = env[:domain_name]
           @title = config.title
-          @description = config.description
+          vagrantfile = File.join(env[:root_path], (env[:vagrantfile_name] || "Vagrantfile"))
+          @description = !config.description.empty? ? config.description : "Source: #{vagrantfile}"
           @uuid = config.uuid
           @cpus = config.cpus.to_i
           @cpuset = config.cpuset

data/lib/vagrant-libvirt/action/set_boot_order.rb

@@ -86,9 +86,13 @@ module VagrantPlugins
 
         def search_network(nets, xml)
           str = '/domain/devices/interface'
-          str += "[(@type='network' or @type='udp' or @type='bridge')"
+          str += "[(@type='network' or @type='udp' or @type='bridge' or @type='direct')"
           unless nets.empty?
-            str += " and source[@network='#{nets.first['network']}']"
+            net = nets.first
+            network = net['network']
+            dev = net['dev']
+            str += " and source[@network='#{network}']" if network
+            str += " and source[@dev='#{dev}']" if dev
           end
           str += ']'
           @logger.debug(str)

data/lib/vagrant-libvirt/config.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 require 'vagrant'
 
 class Numeric
@@ -193,6 +195,7 @@ module VagrantPlugins
         @uri               = UNSET_VALUE
         @driver            = UNSET_VALUE
         @host              = UNSET_VALUE
+        @port              = UNSET_VALUE
         @connect_via_ssh   = UNSET_VALUE
         @username          = UNSET_VALUE
         @password          = UNSET_VALUE
@@ -1016,7 +1019,12 @@ module VagrantPlugins
 
         # Extract host and username values from uri if provided, otherwise nil
         @host = uri.host
+        @port = uri.port
         @username = uri.user
+        if uri.query
+          params = CGI.parse(uri.query)
+          @id_ssh_key_file = params['keyfile'].first if params.has_key?('keyfile')
+        end
 
         finalize_id_ssh_key_file
       end
@@ -1053,11 +1061,13 @@ module VagrantPlugins
         if @connect_via_ssh
           if @proxy_command == UNSET_VALUE
             proxy_command = "ssh '#{@host}' "
+            proxy_command << "-p #{@port} " if @port
             proxy_command << "-l '#{@username}' " if @username
             proxy_command << "-i '#{@id_ssh_key_file}' " if @id_ssh_key_file
             proxy_command << '-W %h:%p'
           else
             inputs = { host: @host }
+            inputs << { port: @port } if @port
             inputs[:username] = @username if @username
             inputs[:id_ssh_key_file] = @id_ssh_key_file if @id_ssh_key_file
 

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.5.0
+0.5.1

data/spec/unit/action/clean_machine_folder_spec.rb

@@ -9,12 +9,18 @@ describe VagrantPlugins::ProviderLibvirt::Action::CleanMachineFolder do
   include_context 'unit'
 
   describe '#call' do
+    before do
+      FileUtils.touch(File.join(machine.data_dir, "box.meta"))
+    end
+
     context 'with default options' do
       it 'should verbosely remove the folder' do
         expect(ui).to receive(:info).with('Deleting the machine folder')
-        expect(FileUtils).to receive(:rm_rf).with(machine.data_dir, {:secure => true})
 
         expect(subject.call(env)).to be_nil
+
+        expect(File.exists?(machine.data_dir)).to eq(true)
+        expect(Dir.entries(machine.data_dir)).to match_array([".", ".."])
       end
     end
 
@@ -22,15 +28,17 @@ describe VagrantPlugins::ProviderLibvirt::Action::CleanMachineFolder do
       before do
         Dir.mktmpdir do |d|
           # returns a temporary directory that has been already deleted when running
-          expect(machine).to receive(:data_dir).and_return(d.to_s).exactly(2).times
+          expect(machine).to receive(:data_dir).and_return(d.to_s).exactly(3).times
         end
       end
 
       it 'should remove the folder' do
         expect(ui).to receive(:info).with('Deleting the machine folder')
-        expect(FileUtils).to receive(:rm_rf).with(machine.data_dir, {:secure => true})
 
         expect(subject.call(env)).to be_nil
+
+        expect(File.exists?(machine.data_dir)).to eq(true)
+        expect(Dir.entries(machine.data_dir)).to match_array([".", ".."])
       end
     end
 
@@ -39,9 +47,11 @@ describe VagrantPlugins::ProviderLibvirt::Action::CleanMachineFolder do
 
       it 'should quietly remove the folder' do
         expect(ui).to_not receive(:info).with('Deleting the machine folder')
-        expect(FileUtils).to receive(:rm_rf).with(machine.data_dir, {:secure => true})
 
         expect(subject.call(env)).to be_nil
+
+        expect(File.exists?(machine.data_dir)).to eq(true)
+        expect(Dir.entries(machine.data_dir)).to match_array([".", ".."])
       end
     end
   end

data/spec/unit/action/create_domain_spec.rb

@@ -15,7 +15,8 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
   let(:servers) { double('servers') }
   let(:volumes) { double('volumes') }
 
-  let(:storage_pool_xml) { File.read(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), test_file)) }
+  let(:domain_xml) { File.read(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), domain_xml_file)) }
+  let(:storage_pool_xml) { File.read(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), storage_pool_xml_file)) }
   let(:libvirt_storage_pool) { double('storage_pool') }
 
   describe '#call' do
@@ -44,12 +45,13 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
 
     context 'connection => qemu:///system' do
       context 'default pool' do
-        let(:test_file) { 'default_system_storage_pool.xml' }
+        let(:domain_xml_file) { 'default_domain.xml' }
+        let(:storage_pool_xml_file) { 'default_system_storage_pool.xml' }
 
         it 'should execute correctly' do
           expect(libvirt_client).to receive(:lookup_storage_pool_by_name).and_return(libvirt_storage_pool)
           expect(libvirt_storage_pool).to receive(:xml_desc).and_return(storage_pool_xml)
-          expect(servers).to receive(:create).and_return(machine)
+          expect(servers).to receive(:create).with(xml: domain_xml).and_return(machine)
           expect(volumes).to_not receive(:create) # additional disks only
 
           expect(subject.call(env)).to be_nil
@@ -78,6 +80,8 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
           end
 
           context 'volume create succeeded' do
+            let(:domain_xml_file) { 'additional_disks_domain.xml' }
+
             it 'should complete' do
               expect(libvirt_client).to receive(:lookup_storage_pool_by_name).and_return(libvirt_storage_pool)
               expect(libvirt_storage_pool).to receive(:xml_desc).and_return(storage_pool_xml)
@@ -89,7 +93,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
                   :pool_name   => "default",
                 )
               )
-              expect(servers).to receive(:create).and_return(machine)
+              expect(servers).to receive(:create).with(xml: domain_xml).and_return(machine)
 
               expect(subject.call(env)).to be_nil
             end
@@ -119,7 +123,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
       end
 
       context 'default pool' do
-        let(:test_file) { 'default_user_storage_pool.xml' }
+        let(:storage_pool_xml_file) { 'default_user_storage_pool.xml' }
 
         it 'should execute correctly' do
           expect(libvirt_client).to receive(:lookup_storage_pool_by_name).and_return(libvirt_storage_pool)

data/spec/unit/action/create_domain_spec/additional_disks_domain.xml

@@ -0,0 +1,54 @@
+<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name>vagrant-test_default</name>
+  <title></title>
+  <description>Source: /rootpath/Vagrantfile</description>
+  <uuid></uuid>
+  <memory>524288</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>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2' cache='default'/>
+      <source file='/var/lib/libvirt/images/vagrant-test_default-vdb.qcow2'/>
+      <target dev='vdb' bus='virtio'/>
+    </disk>
+
+
+    <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>
+
+
+  </devices>
+
+</domain>

data/spec/unit/action/create_domain_spec/default_domain.xml

@@ -0,0 +1,49 @@
+<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name>vagrant-test_default</name>
+  <title></title>
+  <description>Source: /rootpath/Vagrantfile</description>
+  <uuid></uuid>
+  <memory>524288</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>
+
+
+  </devices>
+
+</domain>

data/spec/unit/config_spec.rb

@@ -358,6 +358,10 @@ describe VagrantPlugins::ProviderLibvirt::Config do
           {:connect_via_ssh => true, :host => 'remote', :username => 'myuser'},
           "ssh 'remote' -l 'myuser' -W %h:%p",
         ],
+        [ # remote contains port
+          {:connect_via_ssh => true, :host => 'remote:2222'},
+          "ssh 'remote' -p 2222 -W %h:%p",
+        ],
         [ # include user and default ssh key exists
           {:connect_via_ssh => true, :host => 'remote', :username => 'myuser'},
           "ssh 'remote' -l 'myuser' -i '/home/tests/.ssh/id_rsa' -W %h:%p",
@@ -390,7 +394,6 @@ describe VagrantPlugins::ProviderLibvirt::Config do
         [
           {:uri => 'qemu+ssh://remote/system?keyfile=/some/path/to/keyfile'},
           "ssh 'remote' -i '/some/path/to/keyfile' -W %h:%p",
-          {:allow_failure => "keyfile not yet inferred from uri"},
         ],
 
         # provide custom template

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Lukas Stanek
 - Dima Vasilets
 - Brian Pitts
-autorequire:
+- Darragh Bailey
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-22 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -157,6 +158,7 @@ email:
 - ls@elostech.cz
 - pronix.service@gmail.com
 - brian@polibyte.com
+- daragh.bailey@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -233,6 +235,8 @@ files:
 - 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/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
@@ -252,7 +256,6 @@ files:
 - 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/provider_spec.rb
 - spec/unit/templates/domain_all_settings.xml
 - spec/unit/templates/domain_custom_cpu_model.xml
 - spec/unit/templates/domain_defaults.xml
@@ -263,7 +266,7 @@ homepage: https://github.com/vagrant-libvirt/vagrant-libvirt
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -278,43 +281,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.11
-signing_key:
+rubygems_version: 3.0.8
+signing_key: 
 specification_version: 4
 summary: libvirt provider for Vagrant.
 test_files:
-- spec/unit/action/start_domain_spec.rb
+- spec/support/libvirt_context.rb
+- spec/support/binding_proc.rb
+- spec/support/sharedcontext.rb
+- spec/support/matchers/have_file_content.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/templates/tpm/version_1.2.xml
+- spec/unit/templates/tpm/version_2.0.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_spec.rb
-- spec/unit/action/forward_ports_spec.rb
 - spec/unit/action/wait_till_up_spec.rb
+- spec/unit/action/forward_ports_spec.rb
+- spec/unit/action/destroy_domain_spec.rb
+- spec/unit/action/halt_domain_spec.rb
+- spec/unit/action/start_domain_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.rb
+- spec/unit/action/set_name_of_domain_spec.rb
 - 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/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/start_domain_spec/default_added_tpm_path.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/create_domain_spec/default_system_storage_pool.xml
-- spec/unit/action/create_domain_spec/default_user_storage_pool.xml
+- spec/unit/action/start_domain_spec/default_added_tpm_version.xml
 - spec/unit/action/handle_box_image_spec.rb
-- spec/unit/action/set_name_of_domain_spec.rb
-- spec/unit/action/halt_domain_spec.rb
-- spec/unit/action/create_domain_volume_spec.rb
 - spec/unit/config_spec.rb
-- spec/unit/provider_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

data/spec/unit/provider_spec.rb

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