vagrant-libvirt 0.0.45 → 0.1.0

data/lib/vagrant-libvirt/driver.rb

@@ -19,11 +19,11 @@ module VagrantPlugins
       end
 
       def connection
-        # If already connected to libvirt, just use it and don't connect
+        # If already connected to Libvirt, just use it and don't connect
         # again.
         return @@connection if @@connection
 
-        # Get config options for libvirt provider.
+        # Get config options for Libvirt provider.
         config = @machine.provider_config
         uri = config.uri
 
@@ -50,7 +50,7 @@ module VagrantPlugins
       end
 
       def system_connection
-        # If already connected to libvirt, just use it and don't connect
+        # If already connected to Libvirt, just use it and don't connect
         # again.
         return @@system_connection if @@system_connection
 

data/lib/vagrant-libvirt/errors.rb

@@ -29,14 +29,14 @@ module VagrantPlugins
         error_key(:creating_storage_pool_error)
       end
 
-      class CreatingVolumeError < VagrantLibvirtError
-        error_key(:creating_volume_error)
-      end
-
       class ImageUploadError < VagrantLibvirtError
         error_key(:image_upload_error)
       end
 
+      class ImageDownloadError < VagrantLibvirtError
+        error_key(:image_download_error)
+      end
+
       # Box exceptions
       class NoBoxVolume < VagrantLibvirtError
         error_key(:no_box_volume)
@@ -54,7 +54,7 @@ module VagrantPlugins
         error_key(:wrong_box_format)
       end
 
-      # Fog libvirt exceptions
+      # Fog Libvirt exceptions
       class FogError < VagrantLibvirtError
         error_key(:fog_error)
       end

data/lib/vagrant-libvirt/plugin.rb

@@ -4,7 +4,7 @@ rescue LoadError
   raise 'The Vagrant Libvirt plugin must be run within Vagrant.'
 end
 
-# compatibility fix to define constant not available vagrant <1.6
+# compatibility fix to define constant not available Vagrant <1.6
 ::Vagrant::MachineState::NOT_CREATED_ID ||= :not_created
 
 module VagrantPlugins
@@ -12,7 +12,7 @@ module VagrantPlugins
     class Plugin < Vagrant.plugin('2')
       name 'libvirt'
       description <<-DESC
-      Vagrant plugin to manage VMs in libvirt.
+      Vagrant plugin to manage VMs in Libvirt.
       DESC
 
       config('libvirt', :provider) do

data/lib/vagrant-libvirt/templates/domain.xml.erb

@@ -2,7 +2,7 @@
   <name><%= @name %></name>
   <uuid><%= @uuid %></uuid>
   <memory><%= @memory_size %></memory>
-  <vcpu><%= @cpus %></vcpu>
+  <vcpu<% if @cpuset %> cpuset='<%= @cpuset %>'<% end %>><%= @cpus %></vcpu>
 
 
   <cpu mode='<%= @cpu_mode %>'>
@@ -33,6 +33,11 @@
     <% end %>
   </cpu>
 
+<%- if @nodeset -%>
+  <numatune>
+    <memory nodeset='<%= @nodeset %>'/>
+  </numatune>
+<%- end -%>
 <% unless @memory_backing.empty? %>
   <memoryBacking>
   <% @memory_backing.each do |backing| %>
@@ -40,6 +45,11 @@
   <% end %>
   </memoryBacking>
 <% end%>
+<% if @shares %>
+  <cputune>
+    <shares><%= @shares %></shares>
+  </cputune>
+<% end %>
 
   <os>
     <% if @machine_type %>
@@ -117,7 +127,7 @@
       <% if d[:serial] %>
         <serial><%= d[:serial] %></serial>
       <% end %>
-<%# this will get auto generated by libvirt
+<%# this will get auto generated by Libvirt
       <address type='pci' domain='0x0000' bus='0x00' slot='???' function='0x0'/>
 -%>
     </disk>
@@ -190,7 +200,7 @@
     <% @pcis.each do |pci| %>
       <hostdev mode='subsystem' type='pci' managed='yes'>
         <source>
-          <address domain='0x0000'
+          <address domain='<%= pci[:domain] %>'
             bus='<%= pci[:bus] %>'
             slot='<%= pci[:slot] %>'
             function='<%= pci[:function] %>'/>
@@ -256,11 +266,14 @@
     <% end %>
   </devices>
 
-  <% unless @qargs.empty? %>
+  <% if not @qemu_args.empty? or not @qemu_env.empty? %>
   <qemu:commandline>
-    <% @qargs.each do |arg| %>
+    <% @qemu_args.each do |arg| %>
     <qemu:arg value='<%= arg[:value] %>'/>
     <% end %>
+    <% @qemu_env.each do |env_var, env_value| %>
+    <qemu:env name='<%= env_var.to_s %>' value='<%= env_value %>'/>
+    <% end %>
   </qemu:commandline>
   <% end %>
 </domain>

data/lib/vagrant-libvirt/util/network_util.rb

@@ -18,6 +18,7 @@ module VagrantPlugins
           management_network_autostart = env[:machine].provider_config.management_network_autostart
           management_network_pci_bus = env[:machine].provider_config.management_network_pci_bus
           management_network_pci_slot = env[:machine].provider_config.management_network_pci_slot
+          management_network_domain = env[:machine].provider_config.management_network_domain
           logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode"
 
           begin
@@ -65,6 +66,10 @@ module VagrantPlugins
             management_network_options[:mac] = management_network_mac
           end
 
+          unless management_network_domain.nil?
+            management_network_options[:domain_name] = management_network_domain
+          end
+
           unless management_network_pci_bus.nil? and management_network_pci_slot.nil?
             management_network_options[:bus] = management_network_pci_bus
             management_network_options[:slot] = management_network_pci_slot
@@ -109,7 +114,7 @@ module VagrantPlugins
           networks
         end
 
-        # Return a list of all (active and inactive) libvirt networks as a list
+        # Return a list of all (active and inactive) Libvirt networks as a list
         # of hashes with their name, network address and status (active or not)
         def libvirt_networks(libvirt_client)
           libvirt_networks = []

data/lib/vagrant-libvirt/util/nfs.rb

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module ProviderLibvirt
+    module Util
+      module Nfs
+        include Vagrant::Action::Builtin::MixinSyncedFolders
+
+        # We're using NFS if we have any synced folder with NFS configured. If
+        # we are not using NFS we don't need to do the extra work to
+        # populate these fields in the environment.
+        def using_nfs?
+          !!synced_folders(@machine)[:nfs]
+        end
+      end
+    end
+  end
+end
+

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.45'.freeze
+    VERSION = '0.1.0'.freeze
   end
 end

data/locales/en.yml

@@ -16,7 +16,7 @@ en:
       Created volume larger than box defaults, will require manual resizing of
       filesystems to utilize.
     uploading_volume: |-
-      Uploading base box image as volume into libvirt storage...
+      Uploading base box image as volume into Libvirt storage...
     creating_domain_volume: |-
       Creating image (snapshot of base box volume).
     removing_domain_volume: |-
@@ -60,7 +60,7 @@ en:
         Forwarding UDP ports is not supported. Ignoring.
 
     errors:
-      package_not_supported: No support for package with libvirt. Create box manually.
+      package_not_supported: No support for package with Libvirt. Create box manually.
       fog_error: |-
         There was an error talking to Libvirt. The error message is shown
         below:
@@ -97,7 +97,7 @@ en:
       wrong_box_format: |-
         Wrong image format specified for box.
       fog_libvirt_connection_error: |-
-        Error while connecting to libvirt: %{error_message}
+        Error while connecting to Libvirt: %{error_message}
       fog_create_volume_error: |-
         Error while creating a storage pool volume: %{error_message}
       fog_create_domain_volume_error: |-
@@ -108,11 +108,11 @@ en:
         Name `%{domain_name}` of domain about to create is already taken. Please try to run
         `vagrant up` command again.
       creating_storage_pool_error: |-
-        There was error while creating libvirt storage pool: %{error_message}
-      creating_volume_error: |-
-        There was error while creating libvirt volume: %{error_message}
+        There was error while creating Libvirt storage pool: %{error_message}
       image_upload_error: |-
         Error while uploading image to storage pool: %{error_message}
+      image_download_error: |-
+        Error while downloading volume '%{volume_name}' from storage pool '%{pool_name}': %{error_message}
       no_domain_error: |-
         No domain found. %{error_message}
       attach_device_error: |-

data/spec/unit/action/set_name_of_domain_spec.rb

@@ -14,7 +14,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::SetNameOfDomain do
   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_')
   end

data/spec/unit/templates/domain_all_settings.xml

@@ -2,7 +2,7 @@
   <name></name>
   <uuid></uuid>
   <memory></memory>
-  <vcpu>1</vcpu>
+  <vcpu cpuset='1-4,^3,6'>1</vcpu>
 
 
   <cpu mode='custom'>
@@ -11,6 +11,12 @@
         <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>
@@ -104,7 +110,7 @@
       </hostdev>
       <hostdev mode='subsystem' type='pci' managed='yes'>
         <source>
-          <address domain='0x0000'
+          <address domain='0x0001'
             bus='0x03'
             slot='0x00'
             function='0x0'/>
@@ -137,5 +143,9 @@
   <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_spec.rb

@@ -11,7 +11,6 @@ describe 'templates/domain' do
 
     def finalize!
       super
-      @qargs = @qemu_args
     end
   end
 
@@ -64,7 +63,7 @@ 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')
@@ -76,6 +75,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.1.0
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2020-05-10 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
@@ -173,7 +164,6 @@ files:
 - lib/vagrant-libvirt/plugin.rb
 - lib/vagrant-libvirt/provider.rb
 - lib/vagrant-libvirt/templates/default_storage_pool.xml.erb
-- lib/vagrant-libvirt/templates/default_storage_volume.xml.erb
 - lib/vagrant-libvirt/templates/domain.xml.erb
 - lib/vagrant-libvirt/templates/private_network.xml.erb
 - lib/vagrant-libvirt/templates/public_interface.xml.erb
@@ -182,6 +172,7 @@ 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
@@ -198,9 +189,6 @@ files:
 - 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
@@ -220,21 +208,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+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_custom_cpu_model.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