vagrant-libvirt 0.0.42 → 0.2.1

data/spec/support/environment_helper.rb

@@ -18,7 +18,7 @@ class EnvironmentHelper
     1024
   end
 
-  %w(cpus cpu_mode loader boot_order machine_type disk_bus disk_device nested volume_cache kernel cmd_line initrd graphics_type graphics_autoport graphics_port graphics_ip graphics_passwd video_type video_vram keymap storage_pool_name disks cdroms driver).each do |name|
+  %w(cpus cpu_mode loader nvram boot_order machine_type disk_bus disk_device nested volume_cache kernel cmd_line initrd graphics_type graphics_autoport graphics_port graphics_ip graphics_passwd video_type video_vram keymap storage_pool_name disks cdroms driver).each do |name|
     define_method(name.to_sym) do
       nil
     end

data/spec/support/libvirt_context.rb

@@ -25,6 +25,6 @@ shared_context 'libvirt' do
     # return some information for domain when needed
     allow(domain).to receive(:mac).and_return('9C:D5:53:F1:5A:E7')
 
-    machine.stub(id: id)
+    allow(machine).to receive(:id).and_return(id)
   end
 end

data/spec/support/sharedcontext.rb

@@ -28,7 +28,7 @@ shared_context 'unit' do
   let(:plugin)           { register_plugin }
 
   before (:each) do
-    machine.stub(guest: guest)
-    machine.stub(communicator: communicator)
+    allow(machine).to receive(:guest).and_return(guest)
+    allow(machine).to receive(:communicator).and_return(communicator)
   end
 end

data/spec/unit/action/destroy_domain_spec.rb

@@ -33,7 +33,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::DestroyDomain do
       before do
         allow(libvirt_domain).to receive(:list_snapshots).and_return([])
         allow(libvirt_domain).to receive(:has_managed_save?).and_return(nil)
-        root_disk.stub(name: 'test.img')
+        allow(root_disk).to receive(:name).and_return('test.img')
       end
 
       context 'when only has root disk' do
@@ -57,7 +57,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::DestroyDomain do
 
         let(:extra_disk) { double('libvirt_extra_disk') }
         before do
-          extra_disk.stub(name: 'test-vdb.qcow2')
+          allow(extra_disk).to receive(:name).and_return('test-vdb.qcow2')
         end
 
         it 'destroys disks individually' do

data/spec/unit/action/set_name_of_domain_spec.rb

@@ -10,12 +10,12 @@ describe VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain do
     dmn = VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain.new(Object.new, @env)
     first  = dmn.build_domain_name(@env)
     second = dmn.build_domain_name(@env)
-    first.should_not eq(second)
+    expect(first).to_not eq(second)
   end
 
   it 'builds simple domain name' do
-    @env.default_prefix = 'pre'
+    @env.default_prefix = 'pre_'
     dmn = VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain.new(Object.new, @env)
-    dmn.build_domain_name(@env).should eq('pre_')
+    expect(dmn.build_domain_name(@env)).to eq('pre_')
   end
 end

data/spec/unit/config_spec.rb

@@ -6,12 +6,185 @@ require 'vagrant-libvirt/config'
 describe VagrantPlugins::ProviderLibvirt::Config do
   include_context 'unit'
 
+  let(:fake_env) { Hash.new }
+
+  describe '#finalize!' do
+    it 'is valid with defaults' do
+      subject.finalize!
+    end
+
+    context '@uri' do
+      before(:example) do
+        stub_const("ENV", fake_env)
+      end
+
+      context 'when LIBVIRT_DEFAULT_URI is defined' do
+        it 'should always use this value' do
+          fake_env['LIBVIRT_DEFAULT_URI'] = "custom:///custom_path"
+
+          subject.finalize!
+          expect(subject.uri).to eq("custom:///custom_path")
+          expect(subject.qemu_use_session).to eq(false)
+        end
+
+        context 'when LIBVIRT_DEFAULT_URI contains "qemu"' do
+          [
+            [
+              'set qemu_use_session if "session" present',
+              'qemu:///session',
+              true,
+            ],
+            [
+              'handle different protocol additions',
+              'qemu+ssh:///session',
+              true,
+            ],
+            [
+              'handle options before and after path',
+              'qemu://remote/session?keyfile=my_id_rsa',
+              true,
+            ],
+            [
+              'identify when session not set',
+              'qemu://remote/system',
+              false,
+            ],
+            [
+              'handle session appearing elsewhere',
+              'qemu://remote/system?keyfile=my_session_id',
+              false,
+            ],
+          ].each do |title, uri, session|
+            it "should #{title}" do
+              fake_env['LIBVIRT_DEFAULT_URI'] = uri
+
+              subject.finalize!
+              expect(subject.uri).to eq(uri)
+              expect(subject.qemu_use_session).to eq(session)
+            end
+          end
+        end
+      end
+
+      context 'when @driver is defined' do
+        defaults = {'id_ssh_key_file' => nil}
+        [
+          [
+            {'driver' => 'kvm'},
+            'qemu:///system?no_verify=1',
+            false,
+          ],
+          [
+            {'driver' => 'qemu'},
+            'qemu:///system?no_verify=1',
+            false,
+          ],
+          [
+            {'driver' => 'qemu', 'qemu_use_session' => true},
+            'qemu:///session?no_verify=1',
+            true,
+          ],
+          [
+            {'driver' => 'openvz'},
+            'openvz:///system?no_verify=1',
+            false,
+          ],
+          [
+            {'driver' => 'vbox'},
+            'vbox:///session?no_verify=1',
+            false,
+          ],
+        ].each do |inputs, output_uri, output_session|
+          it "should detect #{inputs}" do
+            inputs.merge(defaults).each do |k, v|
+              subject.instance_variable_set("@#{k}", v)
+            end
+
+            subject.finalize!
+            expect(subject.uri).to eq(output_uri)
+            expect(subject.qemu_use_session).to eq(output_session)
+          end
+        end
+
+        it "should raise exception for unrecognized" do
+          subject.driver = "bad-driver"
+
+          expect { subject.finalize! }.to raise_error("Require specify driver bad-driver")
+        end
+      end
+
+      context 'when @connect_via_ssh defined' do
+        defaults = {'driver' => 'qemu', 'id_ssh_key_file' => nil}
+        [
+          [
+            {'connect_via_ssh' => true},
+            'qemu+ssh://localhost/system?no_verify=1',
+          ],
+          [
+            {'connect_via_ssh' => true, 'username' => 'my_user'},
+            'qemu+ssh://my_user@localhost/system?no_verify=1',
+          ],
+          [
+            {'connect_via_ssh' => true, 'host' => 'remote_server'},
+            'qemu+ssh://remote_server/system?no_verify=1',
+          ],
+        ].each do |inputs, output_uri|
+          it "should detect #{inputs}" do
+            inputs.merge(defaults).each do |k, v|
+              subject.instance_variable_set("@#{k}", v)
+            end
+
+            subject.finalize!
+            expect(subject.uri).to eq(output_uri)
+          end
+        end
+      end
+
+      context 'when @id_ssh_key_file defined' do
+        defaults = {'driver' => 'qemu'}
+        [
+          [
+            {},
+            'qemu:///system?no_verify=1&keyfile=/home/user/.ssh/id_rsa',
+          ],
+          [
+            {'id_ssh_key_file' => '/path/to/keyfile'},
+            'qemu:///system?no_verify=1&keyfile=/path/to/keyfile',
+          ],
+        ].each do |inputs, output_uri|
+          it "should detect #{inputs}" do
+            inputs.merge(defaults).each do |k, v|
+              subject.instance_variable_set("@#{k}", v)
+            end
+
+            fake_env['HOME'] = '/home/user'
+
+            subject.finalize!
+            expect(subject.uri).to eq(output_uri)
+          end
+        end
+      end
+
+      context 'when @socket defined' do
+        it "should detect @socket set" do
+          subject.socket = '/var/run/libvirt/libvirt-sock'
+          subject.id_ssh_key_file = false
+
+          subject.finalize!
+          expect(subject.uri).to eq('qemu:///system?no_verify=1&socket=/var/run/libvirt/libvirt-sock')
+        end
+      end
+    end
+  end
+
   def assert_invalid
+    subject.finalize!
     errors = subject.validate(machine)
     raise "No errors: #{errors.inspect}" if errors.values.all?(&:empty?)
   end
 
   def assert_valid
+    subject.finalize!
     errors = subject.validate(machine)
     raise "Errors: #{errors.inspect}" unless errors.values.all?(&:empty?)
   end

data/spec/unit/templates/domain_all_settings.xml

@@ -1,8 +1,10 @@
 <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
   <name></name>
+  <title>title</title>
+  <description>description</description>
   <uuid></uuid>
   <memory></memory>
-  <vcpu>1</vcpu>
+  <vcpu cpuset='1-4,^3,6'>1</vcpu>
 
 
   <cpu mode='custom'>
@@ -11,10 +13,16 @@
         <topology sockets='1' cores='3' threads='2'/>
   </cpu>
 
+  <numatune>
+    <memory nodeset='1-4,^3,6'/>
+  </numatune>
+  <cputune>
+    <shares>1024</shares>
+  </cputune>
 
   <os>
         <type arch='x86_64' machine='pc-compatible'>hvm</type>
-      <loader readonly='yes' type='rom'>/efi/loader</loader>
+        <loader readonly='yes' type='rom'>/efi/loader</loader>
       <bootmenu enable='yes'/>
     <kernel></kernel>
     <initrd></initrd>
@@ -24,6 +32,9 @@
     <acpi/>
     <apic/>
     <pae/>
+    <hyperv>
+      <BBB state='on' />
+    </hyperv>
   </features>
   <clock offset='utc'/>
   <devices>
@@ -101,7 +112,7 @@
       </hostdev>
       <hostdev mode='subsystem' type='pci' managed='yes'>
         <source>
-          <address domain='0x0000'
+          <address domain='0x0001'
             bus='0x03'
             slot='0x00'
             function='0x0'/>
@@ -117,7 +128,7 @@
         <redirdev bus='usb' type='tcp'>
         </redirdev>
         <redirfilter>
-          <usbdev class='0x0b' vendor='0x0b' product='0x0b' version='0x0b' allow='yes'/>
+          <usbdev class='0x0b' vendor='0x08e6' product='0x3437' version='2.00' allow='yes'/>
         </redirfilter>
     <watchdog model='i6300esb' action='reset'/>
 
@@ -128,10 +139,15 @@
         <device path='/dev/tpm0'/>
       </backend>
     </tpm>
+    <controller type='usb' model='nec-xhci' ports="4" />
   </devices>
 
   <qemu:commandline>
     <qemu:arg value='-device'/>
     <qemu:arg value='dummy-device'/>
+    <qemu:env name='QEMU_AUDIO_DRV' value='pa'/>
+    <qemu:env name='QEMU_AUDIO_TIMER_PERIOD' value='150'/>
+    <qemu:env name='QEMU_PA_SAMPLES' value='1024'/>
+    <qemu:env name='QEMU_PA_SERVER' value='/run/user/1000/pulse/native'/>
   </qemu:commandline>
 </domain>

data/spec/unit/templates/domain_custom_cpu_model.xml

@@ -0,0 +1,48 @@
+<domain type='' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name></name>
+  <title></title>
+  <description></description>
+  <uuid></uuid>
+  <memory></memory>
+  <vcpu>1</vcpu>
+
+
+  <cpu mode='custom'>
+      <model fallback='allow'>SandyBridge</model>
+  </cpu>
+
+
+  <os>
+        <type>hvm</type>
+    <kernel></kernel>
+    <initrd></initrd>
+    <cmdline></cmdline>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='utc'/>
+  <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/templates/domain_defaults.xml

@@ -1,5 +1,7 @@
 <domain type='' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
   <name></name>
+  <title></title>
+  <description></description>
   <uuid></uuid>
   <memory></memory>
   <vcpu>1</vcpu>

data/spec/unit/templates/domain_spec.rb

@@ -11,7 +11,6 @@ describe 'templates/domain' do
 
     def finalize!
       super
-      @qargs = @qemu_args
     end
   end
 
@@ -28,9 +27,12 @@ describe 'templates/domain' do
 
   context 'when all settings enabled' do
     before do
+      domain.title = 'title'
+      domain.description = 'description'
       domain.instance_variable_set('@domain_type', 'kvm')
       domain.cpu_mode = 'custom'
       domain.cpu_feature(name: 'AAA', policy: 'required')
+      domain.hyperv_feature(name: 'BBB', state: 'on')
       domain.cputopology(sockets: '1', cores: '3', threads: '2')
       domain.machine_type = 'pc-compatible'
       domain.machine_arch = 'x86_64'
@@ -63,7 +65,8 @@ describe 'templates/domain' do
                      source_path: '/tmp/foo')
       domain.random(model: 'random')
       domain.pci(bus: '0x06', slot: '0x12', function: '0x5')
-      domain.pci(bus: '0x03', slot: '0x00', function: '0x0')
+      domain.pci(domain: '0x0001', bus: '0x03', slot: '0x00', function: '0x0')
+      domain.usb_controller(model: 'nec-xhci', ports: '4')
       domain.usb(bus: '1', device: '2', vendor: '0x1234', product: '0xabcd')
       domain.redirdev(type: 'tcp', host: 'localhost', port: '4000')
       domain.redirfilter(class: '0x0b', vendor: '0x08e6',
@@ -74,6 +77,15 @@ describe 'templates/domain' do
 
       domain.qemuargs(value: '-device')
       domain.qemuargs(value: 'dummy-device')
+
+      domain.qemuenv(QEMU_AUDIO_DRV: 'pa')
+      domain.qemuenv(QEMU_AUDIO_TIMER_PERIOD: '150')
+      domain.qemuenv(QEMU_PA_SAMPLES: '1024')
+      domain.qemuenv(QEMU_PA_SERVER: '/run/user/1000/pulse/native')
+
+      domain.shares = '1024'
+      domain.cpuset = '1-4,^3,6'
+      domain.nodeset = '1-4,^3,6'
     end
     let(:test_file) { 'domain_all_settings.xml' }
     it 'renders template' do
@@ -81,4 +93,16 @@ describe 'templates/domain' do
       expect(domain.to_xml('domain')).to eq xml_expected
     end
   end
+
+  context 'when custom cpu model enabled' do
+    before do
+      domain.cpu_mode = 'custom'
+      domain.cpu_model = 'SandyBridge'
+    end
+    let(:test_file) { 'domain_custom_cpu_model.xml' }
+    it 'renders template' do
+      domain.finalize!
+      expect(domain.to_xml('domain')).to eq xml_expected
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.2.1
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -60,42 +60,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: fog-core
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,17 +119,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".github/issue_template.md"
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- example_box/README.md
-- example_box/Vagrantfile
-- example_box/metadata.json
 - lib/vagrant-libvirt.rb
 - lib/vagrant-libvirt/action.rb
 - lib/vagrant-libvirt/action/create_domain.rb
@@ -166,6 +157,7 @@ files:
 - lib/vagrant-libvirt/action/wait_till_up.rb
 - lib/vagrant-libvirt/cap/mount_p9.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/config.rb
 - lib/vagrant-libvirt/driver.rb
@@ -181,6 +173,8 @@ files:
 - lib/vagrant-libvirt/util/erb_template.rb
 - lib/vagrant-libvirt/util/error_codes.rb
 - lib/vagrant-libvirt/util/network_util.rb
+- lib/vagrant-libvirt/util/nfs.rb
+- lib/vagrant-libvirt/util/storage_util.rb
 - lib/vagrant-libvirt/util/timer.rb
 - lib/vagrant-libvirt/version.rb
 - locales/en.yml
@@ -193,11 +187,9 @@ files:
 - spec/unit/action/wait_till_up_spec.rb
 - spec/unit/config_spec.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
-- tools/create_box.sh
-- tools/prepare_redhat_for_box.sh
-- vagrant-libvirt.gemspec
 homepage: https://github.com/vagrant-libvirt/vagrant-libvirt
 licenses:
 - MIT
@@ -217,20 +209,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: libvirt provider for Vagrant.
 test_files:
-- spec/spec_helper.rb
-- spec/support/environment_helper.rb
-- spec/support/libvirt_context.rb
-- spec/support/sharedcontext.rb
+- spec/unit/action/wait_till_up_spec.rb
 - spec/unit/action/destroy_domain_spec.rb
 - spec/unit/action/set_name_of_domain_spec.rb
-- spec/unit/action/wait_till_up_spec.rb
 - spec/unit/config_spec.rb
-- spec/unit/templates/domain_all_settings.xml
 - spec/unit/templates/domain_defaults.xml
+- spec/unit/templates/domain_all_settings.xml
 - spec/unit/templates/domain_spec.rb
+- spec/unit/templates/domain_custom_cpu_model.xml
+- spec/support/libvirt_context.rb
+- spec/support/environment_helper.rb
+- spec/support/sharedcontext.rb
+- spec/spec_helper.rb