vagrant-libvirt 0.0.43 → 0.3.0

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.43
+  version: 0.3.0
 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-11-16 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,23 +173,29 @@ 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/util/ui.rb
+- lib/vagrant-libvirt/version
 - lib/vagrant-libvirt/version.rb
 - locales/en.yml
 - spec/spec_helper.rb
 - spec/support/environment_helper.rb
 - spec/support/libvirt_context.rb
 - spec/support/sharedcontext.rb
+- spec/unit/action/create_domain_spec.rb
+- spec/unit/action/create_domain_spec/default_storage_pool.xml
 - spec/unit/action/destroy_domain_spec.rb
 - spec/unit/action/set_name_of_domain_spec.rb
+- spec/unit/action/start_domain_spec.rb
+- spec/unit/action/start_domain_spec/default.xml
 - 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 +215,24 @@ 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.8
 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/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/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/action/create_domain_spec/default_storage_pool.xml
+- spec/unit/action/create_domain_spec.rb
+- spec/unit/action/wait_till_up_spec.rb
+- spec/unit/action/destroy_domain_spec.rb
+- spec/unit/action/start_domain_spec.rb
+- spec/unit/action/set_name_of_domain_spec.rb
+- spec/unit/action/start_domain_spec/default.xml
+- spec/unit/config_spec.rb
+- spec/spec_helper.rb

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data/.github/issue_template.md

@@ -1,37 +0,0 @@
-<!--
-Thank you for reporting issues to vagrant-libvirt. 
-
-To make it possible for us to help you quickly, we kindly request that you use the template below to report issues. If the issue you are reporting does not fit the template (a feature request for example) please feel free to adapt it to your needs.
-
-Please be aware that we are not actively testing previous versions of both Vagrant and Vagrant-libvirt, so before reporting an issue, please install the latest Vagrant version from Vagrantup.com, run `vagrant plugin update` and reproduce the issue.
---> 
-### Steps to reproduce
-1.
-2.
-3.
-
-### Expected behaviour
-Tell us what should happen
-
-### Actual behaviour
-Tell us what happens instead
-
-### System configuration
-**OS/Distro version:**:
-
-**Libvirt version:**
-
-**Output of `vagrant version; vagrant plugin list`:**
-
-**Output of `VAGRANT_LOG=debug vagrant ... --provider=libvirt`**
-```
-Insert debug output inside quotes here (replace ... with whatever command you use to trigger the issue)
-```
-
-**A Vagrantfile to reproduce the issue:**
-```
-Insert Vagrantfile inside quotes here (remove sensitive data if needed)
-```
-
-**Are you using upstream vagrant package or your distros package?**
-Upstream / Distro

data/.gitignore

@@ -1,21 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-Vagrantfile
-!example_box/Vagrantfile
-.vagrant
-*.swp

data/.travis.yml

@@ -1,24 +0,0 @@
----
-language: ruby
-dist: trusty
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y libvirt-dev
-  - gem update --system
-  - gem install bundler
-install: bundle install
-script: bundle exec rspec --color --format documentation
-notifications:
-  email: false
-rvm:
-  - 2.2.5
-  - 2.3.3
-env:
-  global:
-    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  matrix:
-    - VAGRANT_VERSION=v2.0.1
-matrix:
-  allow_failures:
-    - env: VAGRANT_VERSION=master
-      rvm: 2.3.3

data/Gemfile

@@ -1,26 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in vagrant-libvirt.gemspec
-gemspec
-
-group :development do
-  # We depend on Vagrant for development, but we don't add it as a
-  # gem dependency because we expect to be installed within the
-  # Vagrant environment itself using `vagrant plugin`.
-  if ENV['VAGRANT_VERSION']
-    gem 'vagrant', :git => 'https://github.com/hashicorp/vagrant.git',
-      tag: ENV['VAGRANT_VERSION']
-  else
-    gem 'vagrant', :git => 'https://github.com/hashicorp/vagrant.git'
-  end
-
-  gem 'vagrant-spec', :github => 'hashicorp/vagrant-spec'
-
-  gem 'pry'
-end
-
-group :plugins do
-  gemspec
-end
-
-gem 'coveralls', require: false