vagrant-libvirt 0.4.0 → 0.5.3

data/spec/unit/action/wait_till_up_spec.rb

@@ -12,7 +12,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::WaitTillUp do
   include_context 'libvirt'
   include_context 'unit'
 
-  let (:driver) { double('driver') }
+  let (:driver) { VagrantPlugins::ProviderLibvirt::Driver.new env[:machine] }
 
   describe '#call' do
     before do
@@ -47,27 +47,26 @@ describe VagrantPlugins::ProviderLibvirt::Action::WaitTillUp do
         end
       end
 
-      context 'if interrupted waiting for SSH' do
+      context 'multiple timeouts waiting for IP' do
         before 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, true, true)
-          allow(driver).to receive(:get_domain_ipaddress).and_return('192.168.121.2')
+          allow(env).to receive(:[]).with(:interrupted).and_return(false)
+          allow(logger).to receive(:debug)
+          allow(logger).to receive(:info)
         end
-        it 'should exit after getting IP' do
+
+        it 'should abort after hitting limit' do
+          expect(domain).to receive(:wait_for).at_least(300).times.and_raise(::Fog::Errors::TimeoutError)
           expect(app).to_not receive(:call)
           expect(ui).to receive(:info).with('Waiting for domain to get an IP address...')
-          expect(ui).to receive(:info).with('Waiting for SSH to become available...')
-          expect(logger).to receive(:debug).with(/Searching for IP for MAC address: .*/)
-          expect(logger).to receive(:info).with('Got IP address 192.168.121.2')
-          expect(logger).to receive(:info).with(/Time for getting IP: .*/)
+          expect(ui).to_not receive(:info).with('Waiting for SSH to become available...')
           expect(env[:machine].communicate).to_not receive(:ready?)
-          expect(subject.call(env)).to be_nil
+          expect {subject.call(env) }.to raise_error(::Fog::Errors::TimeoutError)
         end
       end
     end
 
-    context 'when machine boots and ssh available' do
+    context 'when machine boots and ip available' do
       before do
         allow(domain).to receive(:wait_for).and_return(true)
         allow(env).to receive(:[]).and_call_original
@@ -77,12 +76,9 @@ describe VagrantPlugins::ProviderLibvirt::Action::WaitTillUp do
       it 'should call the next hook' do
         expect(app).to receive(:call)
         expect(ui).to receive(:info).with('Waiting for domain to get an IP address...')
-        expect(ui).to receive(:info).with('Waiting for SSH to become available...')
         expect(logger).to receive(:debug).with(/Searching for IP for MAC address: .*/)
         expect(logger).to receive(:info).with('Got IP address 192.168.121.2')
         expect(logger).to receive(:info).with(/Time for getting IP: .*/)
-        expect(logger).to receive(:info).with(/Time for SSH ready: .*/)
-        expect(env[:machine].communicate).to receive(:ready?).and_return(true)
         expect(subject.call(env)).to be_nil
       end
     end

data/spec/unit/config_spec.rb

@@ -1,4 +1,4 @@
-require 'contextual_proc'
+require 'support/binding_proc'
 
 require 'spec_helper'
 require 'support/sharedcontext'
@@ -103,7 +103,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
             :id_ssh_key_file => nil,
           },
           {
-            :setup => ContextualProc.new {
+            :setup => ProcWithBinding.new {
               expect(File).to_not receive(:file?)
             }
           }
@@ -116,7 +116,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
             :id_ssh_key_file => "/home/tests/.ssh/id_rsa",
           },
           {
-            :setup => ContextualProc.new {
+            :setup => ProcWithBinding.new {
               expect(File).to receive(:file?).with("/home/tests/.ssh/id_rsa").and_return(true)
             }
           }
@@ -263,7 +263,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
           {:connect_via_ssh => true},
           {:uri => 'qemu+ssh://localhost/system?no_verify=1', :id_ssh_key_file => nil},
           {
-            :setup => ContextualProc.new {
+            :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 => true},
           {:uri => 'qemu+ssh://localhost/system?no_verify=1&keyfile=/home/tests/.ssh/id_rsa', :id_ssh_key_file => '/home/tests/.ssh/id_rsa'},
           {
-            :setup => ContextualProc.new {
+            :setup => ProcWithBinding.new {
               expect(File).to receive(:file?).with("/home/tests/.ssh/id_rsa").and_return(true)
             }
           }
@@ -294,7 +294,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
           end
 
           if !opts[:setup].nil?
-            opts[:setup].apply(binding)
+            opts[:setup].apply_binding(binding)
           end
 
           inputs.each do |k, v|
@@ -358,11 +358,15 @@ 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",
           {
-            :setup => ContextualProc.new {
+            :setup => ProcWithBinding.new {
               expect(File).to receive(:file?).with("/home/tests/.ssh/id_rsa").and_return(true)
             }
           }
@@ -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
@@ -417,7 +420,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do
           end
 
           if !opts[:setup].nil?
-            opts[:setup].apply(binding)
+            opts[:setup].apply_binding(binding)
           end
 
           inputs.each do |k, v|

data/spec/unit/templates/domain_all_settings.xml

@@ -34,6 +34,7 @@
     <pae/>
     <hyperv>
       <BBB state='on' />
+      <spinlocks state='on' retries='4096' />
     </hyperv>
   </features>
   <clock offset='variable'>
@@ -47,6 +48,11 @@
       <source file='/var/lib/libvirt/images/test.qcow2'/>
       <target dev='vda' bus='ide'/>
     </disk>
+    <disk type='file' device='disk'>
+      <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'/>
+    </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='default'/>
       <source file='/var/lib/libvirt/images/test-disk1.qcow2'/>
@@ -59,11 +65,13 @@
     </disk>
 
     <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw' />
       <source file=''/>
       <target dev='hda' bus='ide'/>
       <readonly/>
     </disk>
     <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw' />
       <source file=''/>
       <target dev='hdb' bus='ide'/>
       <readonly/>

data/spec/unit/templates/domain_spec.rb

@@ -9,6 +9,13 @@ describe 'templates/domain' do
   class DomainTemplateHelper < VagrantPlugins::ProviderLibvirt::Config
     include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
 
+    attr_accessor :domain_volumes
+
+    def initialize
+      super
+      @domain_volumes = []
+    end
+
     def finalize!
       super
     end
@@ -36,6 +43,7 @@ describe 'templates/domain' do
       domain.clock_offset = 'variable'
       domain.clock_timer(name: 't1')
       domain.clock_timer(name: 't2', track: 'b', tickpolicy: 'c', frequency: 'd', mode: 'e',  present: 'yes')
+      domain.hyperv_feature(name: 'spinlocks', state: 'on', retries: '4096')
       domain.cputopology(sockets: '1', cores: '3', threads: '2')
       domain.machine_type = 'pc-compatible'
       domain.machine_arch = 'x86_64'
@@ -44,11 +52,22 @@ describe 'templates/domain' do
       domain.boot('cdrom')
       domain.boot('hd')
       domain.emulator_path = '/usr/bin/kvm-spice'
-      domain.instance_variable_set('@domain_volume_path', '/var/lib/libvirt/images/test.qcow2')
       domain.instance_variable_set('@domain_volume_cache', 'deprecated')
       domain.disk_bus = 'ide'
       domain.disk_device = 'vda'
       domain.disk_driver(:cache => 'unsafe', :io => 'threads', :copy_on_read => 'on', :discard => 'unmap', :detect_zeroes => 'on')
+      domain.domain_volumes.push({
+        :dev => 1.vdev.to_s,
+        :cache => 'unsafe',
+        :bus => domain.disk_bus,
+        :path => '/var/lib/libvirt/images/test.qcow2'
+      })
+      domain.domain_volumes.push({
+        :dev => 2.vdev.to_s,
+        :cache => 'unsafe',
+        :bus => domain.disk_bus,
+        :path => '/var/lib/libvirt/images/test2.qcow2'
+      })
       domain.storage(:file, path: 'test-disk1.qcow2')
       domain.storage(:file, path: 'test-disk2.qcow2', io: 'threads', copy_on_read: 'on', discard: 'unmap', detect_zeroes: 'on')
       domain.disks.each do |disk|

data/spec/unit/util/byte_number_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+require 'vagrant-libvirt/util/byte_number'
+
+
+describe ByteNumber do
+  describe '#ByteNumber to Gigrabyte' do
+    it 'should return bigger size' do
+      expect( ByteNumber.new("10737423360").to_GB).to eq(11)
+      expect( ByteNumber.new("737423360").to_GB).to eq(1)
+      expect( ByteNumber.new("110737423360").to_GB).to eq(104)
+    end
+  end
+
+  describe '#ByteNumber from Gigrabyte' do
+    it 'should convert' do
+      expect( ByteNumber.from_GB(5).to_i).to eq(5368709120)
+    end
+  end
+
+  describe '#ByteNumber pow' do
+    it 'should be work like interger' do
+      expect( ByteNumber.new(5).pow(5).to_i).to eq(5**5)
+    end
+  end
+end

metadata

@@ -1,31 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Lukas Stanek
 - Dima Vasilets
 - Brian Pitts
+- Darragh Bailey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: contextual_proc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +111,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +158,7 @@ email:
 - ls@elostech.cz
 - pronix.service@gmail.com
 - brian@polibyte.com
+- daragh.bailey@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -165,6 +167,7 @@ files:
 - README.md
 - lib/vagrant-libvirt.rb
 - lib/vagrant-libvirt/action.rb
+- lib/vagrant-libvirt/action/clean_machine_folder.rb
 - lib/vagrant-libvirt/action/create_domain.rb
 - lib/vagrant-libvirt/action/create_domain_volume.rb
 - lib/vagrant-libvirt/action/create_network_interfaces.rb
@@ -197,10 +200,12 @@ files:
 - lib/vagrant-libvirt/action/start_domain.rb
 - lib/vagrant-libvirt/action/suspend_domain.rb
 - lib/vagrant-libvirt/action/wait_till_up.rb
-- lib/vagrant-libvirt/cap/mount_p9.rb
+- lib/vagrant-libvirt/cap/mount_9p.rb
+- lib/vagrant-libvirt/cap/mount_virtiofs.rb
 - lib/vagrant-libvirt/cap/nic_mac_addresses.rb
 - lib/vagrant-libvirt/cap/public_address.rb
-- lib/vagrant-libvirt/cap/synced_folder.rb
+- lib/vagrant-libvirt/cap/synced_folder_9p.rb
+- lib/vagrant-libvirt/cap/synced_folder_virtiofs.rb
 - lib/vagrant-libvirt/config.rb
 - lib/vagrant-libvirt/driver.rb
 - lib/vagrant-libvirt/errors.rb
@@ -211,6 +216,7 @@ files:
 - lib/vagrant-libvirt/templates/private_network.xml.erb
 - lib/vagrant-libvirt/templates/public_interface.xml.erb
 - lib/vagrant-libvirt/util.rb
+- lib/vagrant-libvirt/util/byte_number.rb
 - lib/vagrant-libvirt/util/collection.rb
 - lib/vagrant-libvirt/util/erb_template.rb
 - lib/vagrant-libvirt/util/error_codes.rb
@@ -223,13 +229,26 @@ files:
 - lib/vagrant-libvirt/version.rb
 - locales/en.yml
 - spec/spec_helper.rb
+- spec/support/binding_proc.rb
 - spec/support/environment_helper.rb
 - spec/support/libvirt_context.rb
+- spec/support/matchers/have_file_content.rb
 - 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
+- spec/unit/action/create_domain_volume_spec/one_disk_in_storage.xml
+- spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_0.xml
+- 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_2.xml
 - spec/unit/action/destroy_domain_spec.rb
+- spec/unit/action/forward_ports_spec.rb
+- spec/unit/action/halt_domain_spec.rb
+- spec/unit/action/handle_box_image_spec.rb
 - spec/unit/action/set_name_of_domain_spec.rb
 - spec/unit/action/start_domain_spec.rb
 - spec/unit/action/start_domain_spec/clock_timer_rtc.xml
@@ -245,6 +264,7 @@ files:
 - spec/unit/templates/domain_spec.rb
 - spec/unit/templates/tpm/version_1.2.xml
 - spec/unit/templates/tpm/version_2.0.xml
+- spec/unit/util/byte_number_spec.rb
 homepage: https://github.com/vagrant-libvirt/vagrant-libvirt
 licenses:
 - MIT
@@ -272,7 +292,13 @@ summary: libvirt provider for Vagrant.
 test_files:
 - spec/unit/action/start_domain_spec.rb
 - 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/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/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/start_domain_spec/clock_timer_rtc.xml
 - spec/unit/action/start_domain_spec/default.xml
@@ -280,8 +306,14 @@ test_files:
 - 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/create_domain_spec/additional_disks_domain.xml
+- spec/unit/action/create_domain_spec/default_domain.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/util/byte_number_spec.rb
 - spec/unit/provider_spec.rb
 - spec/unit/templates/domain_defaults.xml
 - spec/unit/templates/domain_all_settings.xml
@@ -290,6 +322,8 @@ test_files:
 - 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