vagrant-libvirt 0.0.33 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fe4ab377dd5768297a0cb9741ee25e889b2d57b
-  data.tar.gz: 3aa4b4af095858c8fdf2b44860c4435d0a42ad19
+  metadata.gz: c8abd22d000a07d146f95e4aeeb4a806af4f7e59
+  data.tar.gz: fea80cb50af868fca9b6da0cbb83573fc6074476
 SHA512:
-  metadata.gz: 05011cb3bd79c255dc215abfd05726738b95fa4c81cfecbe3a30c0d93b56ab3a898bca198502464440a7677345a60494a5d1a264dffdf1e5b05cad20a5aa2d72
-  data.tar.gz: ad8badd8f73e38d599a7ca614e362efa2202da9226c5c99f885178687873f3108b0dd3ca0749062bbff273e6bb804470ebf5759a280ea117f6db1c3a0168dbd1
+  metadata.gz: 5e44a15f9091cd6053e7d64d6bf1bfef267c713ca5d6d65cf11b68ca019d74c1aeb1056a2b985668bc47a8abc4fc03cb7739dc5ecb63e0e9c4cc1d7352da7b52
+  data.tar.gz: d333eb8139e414857a6cf9e40972142604581695f0fc2e48b8e527e871435f0f0d071b0531fcccb789249bced4c16d12ed85a2df62114054689ff6ce442f2178

data/.github/issue_template.md

@@ -0,0 +1,37 @@
+<!--
+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/.travis.yml

@@ -10,12 +10,19 @@ script: bundle _${BUNDLER_VERSION}_ exec rspec --color --format documentation
 notifications:
   email: false
 rvm:
-  - 2.0.0
+  - 2.2.3
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
-    - VAGRANT_VERSION=v1.5.4 BUNDLER_VERSION=1.5.3
-    - VAGRANT_VERSION=v1.6.5 BUNDLER_VERSION=1.6.9
-    - VAGRANT_VERSION=v1.7.0 BUNDLER_VERSION=1.7.9
-    - VAGRANT_VERSION=       BUNDLER_VERSION=1.7.9
+    - VAGRANT_VERSION=v1.8.4 BUNDLER_VERSION=1.12.5
+matrix:
+  include:
+    - env: VAGRANT_VERSION=master BUNDLER_VERSION=1.12.5
+      rvm: 2.2.3
+    - env: VAGRANT_VERSION=v1.7.4 BUNDLER_VERSION=1.7.9
+      rvm: 2.0.0
+  allow_failures:
+    - env: VAGRANT_VERSION=master BUNDLER_VERSION=1.12.5
+      rvm: 2.2.3
+

data/README.md

@@ -1,5 +1,5 @@
 # Vagrant Libvirt Provider
-[![Build Status](https://travis-ci.org/pradels/vagrant-libvirt.svg)](https://travis-ci.org/pradels/vagrant-libvirt)
+[![Build Status](https://travis-ci.org/vagrant-libvirt/vagrant-libvirt.svg)](https://travis-ci.org/vagrant-libvirt/vagrant-libvirt)
 
 This is a [Vagrant](http://www.vagrantup.com) plugin that adds an
 [Libvirt](http://libvirt.org) provider to Vagrant, allowing Vagrant to
@@ -60,13 +60,13 @@ welcome and can help a lot :-)
 
 ## Future work
 
-* Take a look at [open issues](https://github.com/pradels/vagrant-libvirt/issues?state=open).
+* Take a look at [open issues](https://github.com/vagrant-libvirt/vagrant-libvirt/issues?state=open).
 
 ## Installation
 
-First, you should have libvirt installed if you plan to run VMs on your local system. For instructions, refer to your linux distribution's documentation,
+First, you should have both qemu and libvirt installed if you plan to run VMs on your local system. For instructions, refer to your linux distribution's documentation. *Before you start using Vagrant-libvirt, please make sure your libvirt and qemu installation is working correctly and you are able to create qemu or kvm type virtual machines with `virsh` or `virt-manager`.*
 
-Next, you must have [Vagrant installed](http://docs.vagrantup.com/v2/installation/index.html). Vagrant-libvirt supports Vagrant 1.5, 1.6 and 1.7.
+Next, you must have [Vagrant installed](http://docs.vagrantup.com/v2/installation/index.html). Vagrant-libvirt supports Vagrant 1.5, 1.6, 1.7 and 1.8.
 
  Now you're ready to install vagrant-libvirt using standard [Vagrant plugin](http://docs.vagrantup.com/v2/plugins/usage.html) installation methods.
 
@@ -103,8 +103,9 @@ sudo ln -fs /usr/bin/ld.gold /usr/bin/ld
 After installing the plugin (instructions above), the quickest way to get
 started is to add Libvirt box and specify all the details manually within
 a `config.vm.provider` block. So first, add Libvirt box using any name you
-want. This is just an example of Libvirt CentOS 7 box available in
- https://atlas.hashicorp.com :
+want. You can find more libvirt ready boxes at https://atlas.hashicorp.com/boxes/search?provider=libvirt
+
+Some examples:
 
 ```
 vagrant init fedora/23-cloud-base
@@ -186,7 +187,7 @@ end
 
 ### Domain Specific Options
 
-* `disk_bus` - The type of disk device to emulate. Defaults to virtio if not set. Possible values are documented in libvirt's [description for _target_](http://libvirt.org/formatdomain.html#elementsDisks).
+* `disk_bus` - The type of disk device to emulate. Defaults to virtio if not set. Possible values are documented in libvirt's [description for _target_](http://libvirt.org/formatdomain.html#elementsDisks). NOTE: this option applies only to disks associated with a box image. To set the bus type on additional disks, see the [Additional Disks](#additional-disks) section.
 * `nic_model_type` - parameter specifies the model of the network adapter when you create a domain value by default virtio KVM believe possible values, see the [documentation for libvirt](https://libvirt.org/formatdomain.html#elementsNICSModel).
 * `memory` - Amount of memory in MBytes. Defaults to 512 if not set.
 * `cpus` - Number of virtual cpus. Defaults to 1 if not set.
@@ -222,7 +223,7 @@ end
 * `tpm_path` - The path to the TPM device on the host system.
 * `dtb` - The device tree blob file, mostly used for non-x86 platforms. In case the device tree isn't added in-line to the kernel, it can be manually specified here.
 * `autostart` - Automatically start the domain when the host boots. Defaults to 'false'.
-
+* `channel` - [libvirt channels](https://libvirt.org/formatdomain.html#elementCharChannel). Configure a private communication channel between the host and guest, e.g. for use by the [qemu guest agent](http://wiki.libvirt.org/page/Qemu_guest_agent) and the Spice/QXL graphics type.
 
 Specific domain settings can be set for each domain separately in multi-VM
 environment. Example below shows a part of Vagrantfile, where specific options
@@ -412,8 +413,8 @@ starts with 'libvirt__' string. Here is a list of those options:
     the interface xml configuration. _(This feature only works in libvirt 1.2.20 and higher)_
 * `:libvirt__guest_ipv6` - Enable or disable guest-to-guest IPv6 communication.
     See [here](https://libvirt.org/formatnetwork.html#examplesPrivate6), and [here](http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=705e67d40b09a905cd6a4b8b418d5cb94eaa95a8) for for more information.
-* `:libvirt__iface_name` - Define a name for the private network interface. With this feature one can [simulate physical link failures](https://github.com/pradels/vagrant-libvirt/pull/498)
-* `:mac` - MAC address for the interface.
+* `:libvirt__iface_name` - Define a name for the private network interface. With this feature one can [simulate physical link failures](https://github.com/vagrant-libvirt/vagrant-libvirt/pull/498)
+* `:mac` - MAC address for the interface. *Note: specify this in lowercase since Vagrant network scripts assume it will be!*
 * `:model_type` - parameter specifies the model of the network adapter when you create a domain value by default virtio KVM believe possible values, see the documentation for libvirt
 
 
@@ -430,6 +431,8 @@ virtual network.
   Default mode is 'bridge'.
 * `:type` - is type of interface.(`<interface type="#{@type}">`)
 * `:mac` - MAC address for the interface.
+* `:network_name` - Name of libvirt network to connect to.
+* `:portgroup` - Name of libvirt portgroup to connect to.
 * `:ovs` - Support to connect to an open vSwitch bridge device. Default is 'false'.
 
 ### Management Network
@@ -715,9 +718,71 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+## Libvirt communication channels
+
+For certain functionality to be available within a guest, a private
+communication channel must be established with the host. Two notable examples of
+this are the qemu guest agent, and the Spice/QXL graphics type.
+
+Below is a simple example which exposes a virtio serial channel to the guest. Note: in a multi-VM environment, the channel would be created for all VMs.
+
+```ruby
+vagrant.configure(2) do |config|
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.channel :type => 'unix', :target_name => 'org.qemu.guest_agent.0', :target_type => 'virtio'
+  end
+end
+```
+
+Below is the syntax for creating a spicevmc channel for use by a qxl graphics card.
+
+```ruby
+vagrant.configure(2) do |config|
+  config.vm.provider :libvirt do |libvirt|
+	libvirt.channel :type => 'spicevmc', :target_name => 'com.redhat.spice.0', :target_type => 'virtio'
+  end
+end
+```
+
+These settings can be specified on a per-VM basis, however the per-guest settings will OVERRIDE any global 'config' setting. In the following example, we create 3 VM with the following configuration:
+
+master: No channel settings specified, so we default to the provider setting of a single virtio guest agent channel.
+node1: Override the channel setting, setting both the guest agent channel, and a spicevmc channel
+node2: Override the channel setting, setting both the guest agent channel, and a 'guestfwd' channel. TCP traffic sent by the guest to the given IP address and port is forwarded to the host socket /tmp/foo. Note: this device must be unique for each VM.
+
+Example
+
+```ruby
+Vagrant.configure(2) do |config|
+  config.vm.box = "fedora/23-cloud-base"
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.channel :type => 'unix', :target_name => 'org.qemu.guest_agent.0', :target_type => 'virtio'
+  end 
+
+  config.vm.define "master" do |master|
+    master.vm.provider :libvirt do |domain|
+        domain.memory = 1024
+    end 
+  end 
+  config.vm.define "node1" do |node1|
+    node1.vm.provider :libvirt do |domain|
+      domain.channel :type => 'unix', :target_name => 'org.qemu.guest_agent.0', :target_type => 'virtio'
+      domain.channel :type => 'spicevmc', :target_name => 'com.redhat.spice.0', :target_type => 'virtio'
+    end 
+  end 
+  config.vm.define "node2" do |node2|
+    node2.vm.provider :libvirt do |domain|
+      domain.channel :type => 'unix', :target_name => 'org.qemu.guest_agent.0', :target_type => 'virtio'
+      domain.channel :type => 'unix', :target_type => 'guestfwd', :target_address => '192.0.2.42', :target_port => '4242',
+                     :source_path => '/tmp/foo'
+    end 
+  end 
+end
+```
+
 ## Box Format
 
-You can view an example box in the [example_box/directory](https://github.com/pradels/vagrant-libvirt/tree/master/example_box). That directory also contains instructions on how to build a box.
+You can view an example box in the [example_box/directory](https://github.com/vagrant-libvirt/vagrant-libvirt/tree/master/example_box). That directory also contains instructions on how to build a box.
 
 The box is a tarball containing:
 
@@ -740,7 +805,7 @@ To work on the `vagrant-libvirt` plugin, clone this repository out, and use
 [Bundler](http://gembundler.com) to get the dependencies:
 
 ```
-$ git clone https://github.com/pradels/vagrant-libvirt.git
+$ git clone https://github.com/vagrant-libvirt/vagrant-libvirt.git
 $ cd vagrant-libvirt
 $ bundle install
 ```

data/lib/vagrant-libvirt.rb

@@ -13,5 +13,17 @@ module VagrantPlugins
   end
 end
 
+begin
+  require 'vagrant'
+rescue LoadError
+  raise 'The Vagrant Libvirt plugin must be run within Vagrant.'
+end
+
+# This is a sanity check to make sure no one is attempting to install
+# this into an early Vagrant version.
+if Vagrant::VERSION < '1.5.0'
+  raise 'The Vagrant Libvirt plugin is only compatible with Vagrant 1.5+'
+end
+
 # make sure base module class defined before loading plugin
 require 'vagrant-libvirt/plugin'

data/lib/vagrant-libvirt/action/create_domain.rb

@@ -79,6 +79,9 @@ module VagrantPlugins
           # Input
           @inputs = config.inputs
 
+          # Channels
+          @channels = config.channels
+
           # PCI device passthrough
           @pcis = config.pcis
 
@@ -205,6 +208,11 @@ module VagrantPlugins
             env[:ui].info(" -- INPUT:             type=#{input[:type]}, bus=#{input[:bus]}")
           end
 
+          @channels.each do |channel|
+            env[:ui].info(" -- CHANNEL:             type=#{channel[:type]}, mode=#{channel[:source_mode]}")
+            env[:ui].info(" -- CHANNEL:             target_type=#{channel[:target_type]}, target_name=#{channel[:target_name]}")
+          end
+
           @pcis.each do |pci|
             env[:ui].info(" -- PCI passthrough:   #{pci[:bus]}:#{pci[:slot]}.#{pci[:function]}")
           end

data/lib/vagrant-libvirt/action/create_network_interfaces.rb

@@ -77,6 +77,8 @@ module VagrantPlugins
               @mode = iface_configuration.fetch(:mode, 'bridge')
               @type = iface_configuration.fetch(:type, 'direct')
               @model_type = iface_configuration.fetch(:model_type, @nic_model_type)
+              @portgroup = iface_configuration.fetch(:portgroup, nil)
+              @network_name = iface_configuration.fetch(:network_name, @network_name)
               template_name = 'public_interface'
               @logger.info("Setting up public interface using device #{@device} in mode #{@mode}")
               @ovs = iface_configuration.fetch(:ovs, false)
@@ -97,7 +99,7 @@ module VagrantPlugins
               else
                 default_ip = '127.0.0.1'
               end
-              @tunnel_ip = iface_configuration.fetch(:tunnel_address, default_ip)
+              @tunnel_ip = iface_configuration.fetch(:tunnel_ip, default_ip)
               @model_type = iface_configuration.fetch(:model_type, @nic_model_type)
               template_name = 'tunnel_interface'
               @logger.info("Setting up #{@type} tunnel interface using  #{@tunnel_ip} port #{@tunnel_port}")
@@ -125,6 +127,8 @@ module VagrantPlugins
               if iface_configuration[:iface_type] == :public_network
                 if @type == 'direct'
                   @mac = xml.xpath("/domain/devices/interface[source[@dev='#{@device}']]/mac/@address")
+                elsif !@portgroup.nil?
+                  @mac = xml.xpath("/domain/devices/interface[source[@network='#{@network_name}']]/mac/@address")
                 else
                   @mac = xml.xpath("/domain/devices/interface[source[@bridge='#{@device}']]/mac/@address")
                 end
@@ -163,6 +167,7 @@ module VagrantPlugins
                   :type    => :static,
                   :ip      => options[:ip],
                   :netmask => options[:netmask],
+                  :gateway => options[:gateway],
                 }.merge(network)
               else
                 network[:type] = :dhcp

data/lib/vagrant-libvirt/action/destroy_domain.rb

@@ -35,8 +35,10 @@ module VagrantPlugins
 
           domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
 
-          if env[:machine].provider_config.disks.empty?
-            # if using default configuration of disks
+          if env[:machine].provider_config.disks.empty? and
+              env[:machine].provider_config.cdroms.empty?
+            # if using default configuration of disks and cdroms
+            # cdroms are consider volumes, but cannot be destroyed
             domain.destroy(destroy_volumes: true)
           else
             domain.destroy(destroy_volumes: false)

data/lib/vagrant-libvirt/action/prepare_nfs_settings.rb

@@ -77,7 +77,7 @@ module VagrantPlugins
 
         # Check if we can open a connection to the host
         def ping(host, timeout = 3)
-          timeout(timeout) do
+          ::Timeout.timeout(timeout) do
             s = TCPSocket.new(host, 'echo')
             s.close
           end

data/lib/vagrant-libvirt/action/set_boot_order.rb

@@ -36,7 +36,7 @@ module VagrantPlugins
             # Parse the XML and find each defined drive and network interfacee
             hd = xml.search("/domain/devices/disk[@device='disk']")
             cdrom = xml.search("/domain/devices/disk[@device='cdrom']")
-            network = xml.search("/domain/devices/interface[@type='network']")
+            network = xml.search("/domain/devices/interface[@type='network' or @type='udp']")
 
             # Generate an array per device group and a flattened array from all of those
             devices = {"hd" => hd, "cdrom" => cdrom, "network" => network}

data/lib/vagrant-libvirt/config.rb

@@ -56,6 +56,7 @@ module VagrantPlugins
       # Domain specific settings used while creating new domain.
       attr_accessor :uuid
       attr_accessor :memory
+      attr_accessor :channel
       attr_accessor :cpus
       attr_accessor :cpu_mode
       attr_accessor :cpu_model
@@ -103,6 +104,9 @@ module VagrantPlugins
       # Inputs
       attr_accessor :inputs
 
+      # Channels
+      attr_accessor :channels
+
       # PCI device passthrough
       attr_accessor :pcis
 
@@ -177,6 +181,9 @@ module VagrantPlugins
         # Inputs
         @inputs            = UNSET_VALUE
 
+        # Channels
+        @channels          = UNSET_VALUE
+
         # PCI device passthrough
         @pcis              = UNSET_VALUE
 
@@ -255,6 +262,32 @@ module VagrantPlugins
         })
       end
 
+      def channel(options={})
+        if options[:type].nil?
+            raise "Channel type must be specified."
+        elsif options[:type] == 'unix' && options[:target_type] == 'guestfwd'
+            # Guest forwarding requires a target (ip address) and a port
+            if options[:target_address].nil? || options[:target_port].nil? ||
+               options[:source_path].nil?
+              raise 'guestfwd requires target_address, target_port and source_path'
+            end
+        end
+
+        if @channels == UNSET_VALUE
+          @channels = []
+        end
+
+        @channels.push({
+          type: options[:type],
+          source_mode: options[:source_mode],
+          source_path: options[:source_path],
+          target_address: options[:target_address],
+          target_name: options[:target_name],
+          target_port: options[:target_port],
+          target_type: options[:target_type]
+        })
+      end
+
       def pci(options={})
         if options[:bus].nil? || options[:slot].nil? || options[:function].nil?
           raise 'Bus AND slot AND function must be specified. Check `lspci` for that numbers.'
@@ -465,6 +498,9 @@ module VagrantPlugins
         # Inputs
         @inputs = [{:type => "mouse", :bus => "ps2"}] if @inputs == UNSET_VALUE
 
+        # Channels
+        @channels = [ ] if @channels == UNSET_VALUE
+
         # PCI device passthrough
         @pcis = [] if @pcis == UNSET_VALUE
 
@@ -487,6 +523,12 @@ module VagrantPlugins
           end
         end
 
+        machine.config.vm.networks.each do |_type, opts|
+          if opts[:mac] && opts[:mac].downcase! && !(opts[:mac] =~ /\A([0-9a-f]{2}:){5}([0-9a-f]{2})\z/)
+            errors << "Configured NIC MAC '#{opts[:mac]}' is not in 'xx:xx:xx:xx:xx:xx' format"
+          end
+        end
+
          { "Libvirt Provider" => errors }
       end
 

data/lib/vagrant-libvirt/plugin.rb

@@ -4,12 +4,6 @@ rescue LoadError
   raise 'The Vagrant Libvirt plugin must be run within Vagrant.'
 end
 
-# This is a sanity check to make sure no one is attempting to install
-# this into an early Vagrant version.
-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
 
@@ -47,7 +41,7 @@ module VagrantPlugins
       end
 
       # lower priority than nfs or rsync
-      # https://github.com/pradels/vagrant-libvirt/pull/170
+      # https://github.com/vagrant-libvirt/vagrant-libvirt/pull/170
       synced_folder("9p", 4) do
         require_relative "cap/synced_folder"
         VagrantPlugins::SyncedFolder9p::SyncedFolder

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

@@ -96,6 +96,27 @@
       <target port='0'/>
     </console>
 
+<% @channels.each do |channel| %>
+  <channel type='<%= channel[:type] %>' >
+      <source mode='<%= channel[:source_mode] %>'
+          <% if channel[:source_path] %>
+               path="<%= channel[:source_path] %>"
+          <% end %>
+      />
+      <target type='<%= channel[:target_type] %>'
+          <% if channel[:target_name] %>
+               name="<%= channel[:target_name] %>"
+          <% end %>
+          <% if channel[:target_address] %>
+               address="<%= channel[:target_address] %>"
+          <% end %>
+          <% if channel[:target_port] %>
+               port="<%= channel[:target_port] %>"
+          <% end %>
+      />
+  </channel>
+<% end %>
+
 <% @inputs.each do |input| %>
     <input type='<%= input[:type] %>' bus='<%= input[:bus] %>'/>
 <% end %>

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

@@ -4,6 +4,8 @@
   <% end %>
   <%if @type == 'direct'%>
   <source dev='<%= @device %>' mode='<%= @mode %>'/>
+  <% elsif !@portgroup.nil? %>
+  <source network='<%=@network_name%>' portgroup='<%=@portgroup%>'/>
   <% else %>
   <source bridge='<%=@device%>'/>
   <% end %>

data/lib/vagrant-libvirt/version.rb

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

data/spec/support/sharedcontext.rb

@@ -3,12 +3,13 @@ require 'spec_helper'
 shared_context "unit" do
   include_context 'vagrant-unit'
 
-  let(:test_env) do
-    vagrantfile ||= <<-EOF
+  let(:vagrantfile) do <<-EOF
     Vagrant.configure('2') do |config|
       config.vm.define :test
     end
     EOF
+  end
+  let(:test_env) do
     test_env = isolated_environment
     test_env.vagrantfile vagrantfile
     test_env

data/spec/unit/action/destroy_domain_spec.rb

@@ -0,0 +1,96 @@
+require "spec_helper"
+require "support/sharedcontext"
+require "support/libvirt_context"
+
+require "vagrant-libvirt/action/destroy_domain"
+
+describe VagrantPlugins::ProviderLibvirt::Action::DestroyDomain do
+
+  subject { described_class.new(app, env) }
+
+  include_context "unit"
+  include_context "libvirt"
+
+  let(:libvirt_domain) { double("libvirt_domain") }
+  let(:libvirt_client) { double("libvirt_client") }
+  let(:servers) { double("servers") }
+
+  describe "#call" do
+    before do
+      allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver).
+        to receive(:connection).and_return(connection)
+      allow(connection).to receive(:client).and_return(libvirt_client)
+      allow(libvirt_client).to receive(:lookup_domain_by_uuid).
+        and_return(libvirt_domain)
+      allow(connection).to receive(:servers).and_return(servers)
+      allow(servers).to receive(:get).and_return(domain)
+      # always see this at the start of #call
+      expect(ui).to receive(:info).with("Removing domain...")
+    end
+
+    context "when no snapshots" do
+      let(:root_disk) { double("libvirt_root_disk") }
+
+      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")
+      end
+
+      context "when only has root disk" do
+        it "calls fog to destroy volumes" do
+          expect(domain).to receive(:destroy).with(:destroy_volumes => true)
+          expect(subject.call(env)).to be_nil
+        end
+      end
+
+      context "when has additional disks" do
+        let(:vagrantfile) { <<-EOF
+          Vagrant.configure('2') do |config|
+            config.vm.define :test
+            config.vm.provider :libvirt do |libvirt|
+              libvirt.storage :file
+            end
+          end
+          EOF
+        }
+
+        let(:extra_disk) { double("libvirt_extra_disk") }
+        before do
+          extra_disk.stub(:name => "test-vdb.qcow2")
+        end
+
+        it "destroys disks individually" do
+          allow(libvirt_domain).to receive(:name).and_return("test")
+          allow(domain).to receive(:volumes).and_return([extra_disk], [root_disk])
+
+          expect(domain).to receive(:destroy).with(:destroy_volumes => false)
+          expect(extra_disk).to receive(:destroy)  # extra disk remove
+          expect(root_disk).to receive(:destroy)  # root disk remove
+          expect(subject.call(env)).to be_nil
+        end
+      end
+
+      context "when has CDROMs attached" do
+        let(:vagrantfile) { <<-EOF
+          Vagrant.configure('2') do |config|
+            config.vm.define :test
+            config.vm.provider :libvirt do |libvirt|
+              libvirt.storage :file, :device => :cdrom
+            end
+          end
+          EOF
+        }
+
+        it "uses explicit removal of disks" do
+          allow(libvirt_domain).to receive(:name).and_return("test")
+          allow(domain).to receive(:volumes).and_return([root_disk])
+
+          expect(domain).to_not receive(:destroy).with(:destroy_volumes => true)
+          expect(root_disk).to receive(:destroy)  # root disk remove
+          expect(subject.call(env)).to be_nil
+        end
+      end
+    end
+  end
+end

data/tools/prepare_redhat_for_box.sh

@@ -8,7 +8,7 @@
 # After script has finished, nothing else than halting machine should be done.
 
 # For more info about creating custom box refer to
-# https://github.com/pradels/vagrant-libvirt/tree/master/example_box
+# https://github.com/vagrant-libvirt/vagrant-libvirt/tree/master/example_box
 
 # We need to set a hostname.
 if [ $# -ne 1 ]; then

data/vagrant-libvirt.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
   gem.description   = %q{libvirt provider for Vagrant.}
   gem.summary       = %q{libvirt provider for Vagrant.}
-  gem.homepage      = 'https://github.com/pradels/vagrant-libvirt'
+  gem.homepage      = 'https://github.com/vagrant-libvirt/vagrant-libvirt'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.35
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -105,6 +105,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/issue_template.md"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -176,12 +177,13 @@ files:
 - 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
 - tools/create_box.sh
 - tools/prepare_redhat_for_box.sh
 - vagrant-libvirt.gemspec
-homepage: https://github.com/pradels/vagrant-libvirt
+homepage: https://github.com/vagrant-libvirt/vagrant-libvirt
 licenses:
 - MIT
 metadata: {}
@@ -201,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: libvirt provider for Vagrant.
@@ -210,5 +212,6 @@ test_files:
 - 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