vagrant-libvirt 0.0.32 → 0.0.33

data/lib/vagrant-libvirt/plugin.rb

@@ -10,6 +10,9 @@ if Vagrant::VERSION < '1.5.0'
   raise 'The Vagrant Libvirt plugin is only compatible with Vagrant 1.5+'
 end
 
+# compatibility fix to define constant not available vagrant <1.6
+::Vagrant::MachineState::NOT_CREATED_ID ||= :not_created
+
 module VagrantPlugins
   module ProviderLibvirt
     class Plugin < Vagrant.plugin('2')

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

@@ -7,11 +7,14 @@
 
   <cpu mode='<%= @cpu_mode %>'>
     <% if @cpu_mode != 'host-passthrough' %>
-      <model fallback='allow'>qemu64</model>
+      <model fallback='<%= @cpu_fallback %>'><%= @cpu_model %></model>
       <% if @nested %>
         <feature policy='optional' name='vmx'/>
         <feature policy='optional' name='svm'/>
       <% end %>
+      <% @cpu_features.each do |cpu_feature| %>
+        <feature name='<%= cpu_feature[:name] %>' policy='<%= cpu_feature[:policy] %>'/>
+      <% end %>
     <% end %>
   </cpu>
 
@@ -39,14 +42,25 @@
     <kernel><%= @kernel %></kernel>
     <initrd><%= @initrd %></initrd>
     <cmdline><%= @cmd_line %></cmdline>
+    <% if @dtb %>
+      <dtb><%= @dtb %></dtb>
+    <% end %>
   </os>
   <features>
     <acpi/>
     <apic/>
     <pae/>
+    <% if @kvm_hidden %>
+      <kvm>
+        <hidden state='on'/>
+      </kvm>
+    <% end %>
   </features>
   <clock offset='utc'/>
   <devices>
+    <% if @emulator_path %>
+    <emulator><%= @emulator_path %></emulator>
+    <% end %>
     <% if @domain_volume_path %>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2' cache='<%= @domain_volume_cache %>'/>
@@ -86,11 +100,47 @@
     <input type='<%= input[:type] %>' bus='<%= input[:bus] %>'/>
 <% end %>
 
-    <%# Video device -%>
-    <graphics type='<%= @graphics_type %>' port='<%= @graphics_port %>' autoport='<%= @graphics_autoport %>' listen='<%= @graphics_ip %>' keymap='<%= @keymap %>' <%= @graphics_passwd%> />
-    <video>
-      <model type='<%= @video_type %>' vram='<%= @video_vram %>' heads='1'/>
-    </video>
-    <%#End Video -%>
+    <% if @graphics_type != 'none' %>
+      <%# Video device -%>
+      <graphics type='<%= @graphics_type %>' port='<%= @graphics_port %>' autoport='<%= @graphics_autoport %>' listen='<%= @graphics_ip %>' keymap='<%= @keymap %>' <%= @graphics_passwd%> />
+      <video>
+        <model type='<%= @video_type %>' vram='<%= @video_vram %>' heads='1'/>
+      </video>
+      <%#End Video -%>
+    <% end %>
+    <% @pcis.each do |pci| %>
+      <hostdev mode='subsystem' type='pci' managed='yes'>
+        <source>
+          <address domain='0x0000'
+            bus='<%= pci[:bus] %>'
+            slot='<%= pci[:slot] %>'
+            function='<%= pci[:function] %>'/>
+        </source>
+      </hostdev>
+    <% end %>
+    <% @usbs.each do |usb| %>
+      <hostdev mode='subsystem' type='usb'>
+        <source startupPolicy='<%= usb[:startupPolicy] || "mandatory" %>'>
+          <% if usb[:vendor] %>
+          <vendor id='<%= usb[:vendor] %>'/>
+          <% end %>
+          <% if usb[:product] %>
+          <product id='<%= usb[:product] %>'/>
+          <% end %>
+          <% if usb[:bus] && usb[:device] %>
+          <address bus='<%= usb[:bus] %>' device='<%= usb[:device] %>'/>
+          <% end %>
+        </source>
+      </hostdev>
+    <% end %>
+
+    <% if @tpm_path -%>
+    <%# TPM Device -%>
+    <tpm model='<%= @tpm_model %>'>
+      <backend type='<%= @tpm_type %>'>
+        <device path='<%= @tpm_path %>'/>
+      </backend>
+    </tpm>
+    <% end -%>
   </devices>
 </domain>

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

@@ -3,7 +3,11 @@
 	<% if @mac %>
   	<mac address='<%= @mac %>'/>
 	<% end %>
-  <target dev='vnet<%= @iface_number %>'/>
+	<% if @device_name %>
+	<target dev='<%= @device_name %>'/>
+	<% else %>
+	<target dev='vnet<%= @iface_number %>'/>
+	<% end %>
   <alias name='net<%= @iface_number %>'/>
   <model type='<%=@model_type%>'/>
 </interface>

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

@@ -1,4 +1,4 @@
-<network ipv6='yes'>
+<network ipv6='<%= @guest_ipv6 %>'>
   <name><%= @network_name %></name>
   <bridge name="<%= @network_bridge_name %>" />
 

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

@@ -7,5 +7,11 @@
     <local address='<%=@udp_tunnel_local_ip%>' port='<%=@udp_tunnel_local_port%>' />
   <% end %>
   </source>
+  <% if @device_name %>
+    <target dev='<%= @device_name %>'/>
+  <% else %>
+    <target dev='tnet<%= @iface_number %>'/>
+  <% end %>
+  <alias name='net<%= @iface_number %>'/>
   <model type='<%=@model_type%>'/>
 </interface>

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

@@ -12,6 +12,7 @@ module VagrantPlugins
           management_network_address = env[:machine].provider_config.management_network_address
           management_network_mode = env[:machine].provider_config.management_network_mode
           management_network_mac = env[:machine].provider_config.management_network_mac
+          management_network_guest_ipv6 = env[:machine].provider_config.management_network_guest_ipv6
           logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode"
 
           begin
@@ -36,6 +37,7 @@ module VagrantPlugins
             netmask: $2,
             dhcp_enabled: true,
             forward_mode: management_network_mode,
+            guest_ipv6: management_network_guest_ipv6,
           }
 
           unless management_network_mac.nil?

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.32'
+    VERSION = '0.0.33'
   end
 end

data/locales/en.yml

@@ -53,7 +53,7 @@ en:
     warnings:
       ignoring_virtual_size_too_small: |-
         Ignoring requested virtual disk size of '%{requested}' as it is below
-        the minimum box image size of '%{box_virtual_size}'.
+        the minimum box image size of '%{minimum}'.
 
     errors:
       package_not_supported: No support for package with libvirt. Create box manually.

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'vagrant-libvirt'
 require 'support/environment_helper'
+require 'vagrant-spec/unit'
 
 RSpec.configure do |spec|
 end

data/spec/support/libvirt_context.rb

@@ -0,0 +1,28 @@
+require 'fog/libvirt'
+
+shared_context "libvirt" do
+  include_context "unit"
+
+  let(:libvirt_context) { true                      }
+  let(:id)              { "dummy-vagrant_dummy"     }
+  let(:connection)      { double("connection")  }
+  let(:domain)          { double("domain") }
+
+  def connection_result(options={})
+    result = options.fetch(:result, nil)
+    double("connection_result" => result)
+  end
+
+  before (:each) do
+    # we don't want unit tests to ever run commands on the system; so we wire
+    # in a double to ensure any unexpected messages raise exceptions
+    stub_const("::Fog::Compute", connection)
+
+    # drivers also call vm_exists? during init;
+    allow(connection).to receive(:servers).with(kind_of(String)).
+      and_return(connection_result(result: nil))
+
+    # return some information for domain when needed
+    allow(domain).to receive(:mac).and_return("9C:D5:53:F1:5A:E7")
+  end
+end

data/spec/support/sharedcontext.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+shared_context "unit" do
+  include_context 'vagrant-unit'
+
+  let(:test_env) do
+    vagrantfile ||= <<-EOF
+    Vagrant.configure('2') do |config|
+      config.vm.define :test
+    end
+    EOF
+    test_env = isolated_environment
+    test_env.vagrantfile vagrantfile
+    test_env
+  end
+  let(:env)              { { env: iso_env, machine: machine, ui: ui, root_path: '/rootpath' } }
+  let(:conf)             { Vagrant::Config::V2::DummyConfig.new() }
+  let(:ui)               { Vagrant::UI::Basic.new() }
+  let(:iso_env)          { test_env.create_vagrant_env ui_class: Vagrant::UI::Basic }
+  let(:machine)          { iso_env.machine(:test, :libvirt) }
+  # Mock the communicator to prevent SSH commands for being executed.
+  let(:communicator)     { double('communicator') }
+  # Mock the guest operating system.
+  let(:guest)            { double('guest') }
+  let(:app)              { lambda { |env| } }
+  let(:plugin)           { register_plugin() }
+
+  before (:each) do
+    machine.stub(:guest => guest)
+    machine.stub(:communicator => communicator)
+    machine.stub(:id => id)
+  end
+
+end

data/spec/unit/action/wait_till_up_spec.rb

@@ -0,0 +1,128 @@
+require "vagrant-libvirt/action/wait_till_up"
+require "vagrant-libvirt/errors"
+
+require "spec_helper"
+require "support/sharedcontext"
+require "support/libvirt_context"
+
+describe VagrantPlugins::ProviderLibvirt::Action::WaitTillUp do
+
+  subject { described_class.new(app, env) }
+
+  include_context "vagrant-unit"
+  include_context "libvirt"
+  include_context "unit"
+
+  describe "#call" do
+    before do
+      allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver).
+        to receive(:get_domain).and_return(domain)
+      allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver).to receive(:state).
+        and_return(:running)
+    end
+
+    context "when machine does not exist" do
+      before do
+        allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver).
+          to receive(:get_domain).and_return(nil)
+      end
+
+      it "raises exception" do
+        expect(app).to_not receive(:call)
+        expect{subject.call(env)}.to raise_error(::VagrantPlugins::ProviderLibvirt::Errors::NoDomainError,
+                                                 /No domain found. Domain dummy-vagrant_dummy not found/)
+      end
+    end
+
+    context "when machine is booting" do
+      context "if interrupted looking for IP" do
+        before do
+          env[:interrupted] = true
+        end
+        it "should exit" do
+          expect(app).to_not receive(:call)
+          expect(ui).to receive(:info).with("Waiting for domain to get an IP address...")
+          expect(subject.call(env)).to be_nil
+        end
+      end
+
+      context "if interrupted waiting for SSH" 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(env).to receive(:[]).with(:ip_address).and_return("192.168.121.2")
+        end
+        it "should exit after getting IP" do
+          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...")
+          logger = subject.instance_variable_get(:@logger)
+          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(env[:machine].communicate).to_not receive(:ready?)
+          expect(subject.call(env)).to be_nil
+        end
+      end
+    end
+
+    context "when machine boots and ssh available" 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)
+        allow(env).to receive(:[]).with(:ip_address).and_return("192.168.121.2")
+      end
+      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(env[:machine].communicate).to receive(:ready?).and_return(true)
+        expect(subject.call(env)).to be_nil
+      end
+    end
+  end
+
+  describe "#recover" do
+    before do
+      allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver).to receive(:get_domain).and_return(machine)
+      allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver).to receive(:state).
+        and_return(:not_created)
+      allow(env).to receive(:[]).and_call_original
+    end
+
+    it "should do nothing by default" do
+      expect(env).to_not receive(:[]).with(:action_runner) # cleanup
+      expect(subject.recover(env)).to be_nil
+    end
+
+    context "with machine coming up" do
+      before do
+        allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver).to receive(:state).
+          and_return(:running)
+        env[:destroy_on_error] = true
+      end
+
+      context "and user has disabled destroy on failure" do
+        before do
+          env[:destroy_on_error] = false
+        end
+
+        it "skips terminate on failure" do
+          expect(env).to_not receive(:[]).with(:action_runner) # cleanup
+          expect(subject.recover(env)).to be_nil
+        end
+      end
+
+      context "and using default settings" do
+        let(:runner) { double('runner') }
+        it "deletes VM on failure" do
+          expect(env).to receive(:[]).with(:action_runner).and_return(runner) # cleanup
+          expect(runner).to receive(:run)
+          expect(subject.recover(env)).to be_nil
+        end
+      end
+    end
+  end
+end

data/tools/create_box.sh

@@ -84,7 +84,9 @@ cd "$TMP_DIR"
 #Using the awk int function here to truncate the virtual image size to an
 #integer since the fog-libvirt library does not seem to properly handle
 #floating point.
-IMG_SIZE=$(qemu-img info "$TMP_IMG" | awk '/virtual size/{print int($3);}' | tr -d 'G')
+IMG_SIZE=$(qemu-img info "$TMP_IMG" | awk '/virtual size/{print int($3)+1;}' | tr -d 'G')
+
+echo "{$IMG_SIZE}"
 
 cat > metadata.json <<EOF
 {

data/vagrant-libvirt.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = VagrantPlugins::ProviderLibvirt::VERSION
 
-  gem.add_development_dependency "rspec-core", "~> 2.12.2"
-  gem.add_development_dependency "rspec-expectations", "~> 2.12.1"
-  gem.add_development_dependency "rspec-mocks", "~> 2.12.1"
+  gem.add_development_dependency "rspec-core", "~> 2.14.0"
+  gem.add_development_dependency "rspec-expectations", "~> 2.14.0"
+  gem.add_development_dependency "rspec-mocks", "~> 2.14.0"
 
-  gem.add_runtime_dependency 'fog-libvirt', '~> 0.0.1'
+  gem.add_runtime_dependency 'fog-libvirt', '0.0.3'
   gem.add_runtime_dependency 'nokogiri', '~> 1.6.0'
 
   gem.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: fog-libvirt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,10 @@ files:
 - locales/en.yml
 - spec/spec_helper.rb
 - spec/support/environment_helper.rb
-- spec/vagrant-libvirt/action/set_name_of_domain_spec.rb
+- spec/support/libvirt_context.rb
+- spec/support/sharedcontext.rb
+- spec/unit/action/set_name_of_domain_spec.rb
+- spec/unit/action/wait_till_up_spec.rb
 - tools/create_box.sh
 - tools/prepare_redhat_for_box.sh
 - vagrant-libvirt.gemspec
@@ -198,11 +201,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: libvirt provider for Vagrant.
 test_files:
 - spec/spec_helper.rb
 - spec/support/environment_helper.rb
-- spec/vagrant-libvirt/action/set_name_of_domain_spec.rb
+- spec/support/libvirt_context.rb
+- spec/support/sharedcontext.rb
+- spec/unit/action/set_name_of_domain_spec.rb
+- spec/unit/action/wait_till_up_spec.rb