vagrant-libvirt 0.0.36 → 0.0.37

data/lib/vagrant-libvirt/provider.rb

@@ -33,8 +33,7 @@ module VagrantPlugins
       # can use this method to load in new data for the actual backing
       # machine or to realize that the machine is now gone (the ID can
       # become `nil`).
-      def machine_id_changed
-      end
+      def machine_id_changed; end
 
       # This should return a hash of information that explains how to
       # SSH into the machine. If the machine is not at a point where
@@ -45,12 +44,12 @@ module VagrantPlugins
         #
         # Ssh info has following format..
         #
-        #{
+        # {
         #  :host => "1.2.3.4",
         #  :port => "22",
         #  :username => "mitchellh",
         #  :private_key_path => "/path/to/my/key"
-        #}
+        # }
         # note that modifing @machine.id or accessing @machine.state is not
         # thread safe, so be careful to avoid these here as this method may
         # be called from other threads of execution.
@@ -60,21 +59,23 @@ module VagrantPlugins
 
         # if can't determine the IP, just return nil and let the core
         # deal with it, similar to the docker provider
-        return nil if !ip
+        return nil unless ip
 
         ssh_info = {
-          :host          => ip,
-          :port          => @machine.config.ssh.guest_port,
-          :forward_agent => @machine.config.ssh.forward_agent,
-          :forward_x11   => @machine.config.ssh.forward_x11,
+          host: ip,
+          port: @machine.config.ssh.guest_port,
+          forward_agent: @machine.config.ssh.forward_agent,
+          forward_x11: @machine.config.ssh.forward_x11
         }
 
-        ssh_info[:proxy_command] = (
-          "ssh '#{@machine.provider_config.host}' " +
-          "-l '#{@machine.provider_config.username}' " +
-          "-i '#{@machine.provider_config.id_ssh_key_file}' " +
-          "nc %h %p"
-        ) if @machine.provider_config.connect_via_ssh
+        if @machine.provider_config.connect_via_ssh
+          ssh_info[:proxy_command] =
+            "ssh '#{@machine.provider_config.host}' " \
+            "-l '#{@machine.provider_config.username}' " \
+            "-i '#{@machine.provider_config.id_ssh_key_file}' " \
+            'nc %h %p'
+
+        end
 
         ssh_info
       end
@@ -94,22 +95,21 @@ module VagrantPlugins
       # This should return the state of the machine within this provider.
       # The state must be an instance of {MachineState}.
       def state
-
         state_id = nil
-        state_id = :not_created if !@machine.id
-        state_id = :not_created if (
-          !state_id && (!@machine.id || !driver.created?(@machine.id)))
+        state_id = :not_created unless @machine.id
+        state_id = :not_created if
+          !state_id && (!@machine.id || !driver.created?(@machine.id))
         # Query the driver for the current state of the machine
         state_id = driver.state(@machine) if @machine.id && !state_id
-        state_id = :unknown if !state_id
+        state_id = :unknown unless state_id
 
         # This is a special pseudo-state so that we don't set the
         # NOT_CREATED_ID while we're setting up the machine. This avoids
         # clearing the data dir.
-        state_id = :preparing if @machine.id == "preparing"
+        state_id = :preparing if @machine.id == 'preparing'
 
         # Get the short and long description
-        short = state_id.to_s.gsub("_", " ")
+        short = state_id.to_s.tr('_', ' ')
         long  = I18n.t("vagrant_libvirt.states.#{state_id}")
 
         # If we're not created, then specify the special ID flag
@@ -122,10 +122,9 @@ module VagrantPlugins
       end
 
       def to_s
-        id = @machine.id.nil? ? "new" : @machine.id
+        id = @machine.id.nil? ? 'new' : @machine.id
         "Libvirt (#{id})"
       end
     end
   end
 end
-

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

@@ -7,7 +7,7 @@
 
   <cpu mode='<%= @cpu_mode %>'>
     <% if @cpu_mode != 'host-passthrough' %>
-      <model fallback='<%= @cpu_fallback %>'><%= @cpu_model %></model>
+      <model fallback='<%= @cpu_fallback %>'><% if @cpu_mode == 'custom' %><%= @cpu_model %><% end %></model>
       <% if @nested %>
         <feature policy='optional' name='vmx'/>
         <feature policy='optional' name='svm'/>
@@ -170,6 +170,19 @@
         </source>
       </hostdev>
     <% end %>
+    <% unless @redirdevs.empty? %>
+      <% @redirdevs.each do |redirdev| %>
+        <redirdev bus='usb' type='<%= redirdev[:type] %>'>
+        </redirdev>
+      <% end %>
+      <% unless @redirfilters.empty? %>
+        <redirfilter>
+        <% @redirfilters.each do |usbdev| %>
+          <usbdev class='<%= usbdev[:class]  %>' vendor='<%= usbdev[:vendor] %>' product='<%= usbdev[:product] %>' version='<%= usbdev[:version] %>' allow='<%= usbdev[:allow] %>'/>
+        <% end %>
+        </redirfilter>
+      <% end %>
+    <% end %>
 
     <% if @tpm_path -%>
     <%# TPM Device -%>

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

@@ -27,4 +27,8 @@
     </ip>
   <% end %>
 
+  <% if !@network_ipv6_address.nil? && !@network_ipv6_prefix.nil? %>
+    <ip family='ipv6' address="<%= @network_ipv6_address %>" prefix="<%= @network_ipv6_prefix %>"></ip>
+  <% end %>
+
 </network>

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

@@ -2,7 +2,6 @@ module VagrantPlugins
   module ProviderLibvirt
     module Util
       module Collection
-
         # This method finds a matching _thing_ in a collection of
         # _things_. This works matching if the ID or NAME equals to
         # `name`. Or, if `name` is a regexp, a partial match is chosen
@@ -14,9 +13,7 @@ module VagrantPlugins
 
           nil
         end
-
       end
     end
   end
 end
-

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

@@ -4,22 +4,18 @@ module VagrantPlugins
   module ProviderLibvirt
     module Util
       module ErbTemplate
-
-        
-        # TODO might be a chance to use vagrant template system according to https://github.com/mitchellh/vagrant/issues/3231
-        def to_xml template_name = nil, data = binding
-          erb = template_name || self.class.to_s.split("::").last.downcase
-          path = File.join(File.dirname(__FILE__), "..", "templates",
+        # TODO: might be a chance to use vagrant template system according to https://github.com/mitchellh/vagrant/issues/3231
+        def to_xml(template_name = nil, data = binding)
+          erb = template_name || self.class.to_s.split('::').last.downcase
+          path = File.join(File.dirname(__FILE__), '..', 'templates',
                            "#{erb}.xml.erb")
           template = File.read(path)
 
-          # TODO according to erubis documentation, we should rather use evaluate and forget about 
+          # TODO: according to erubis documentation, we should rather use evaluate and forget about
           # binding since the template may then change variables values
-          Erubis::Eruby.new(template, :trim => true).result(data)
+          Erubis::Eruby.new(template, trim: true).result(data)
         end
- 
       end
     end
   end
 end
-

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

@@ -6,19 +6,19 @@ module VagrantPlugins
         VIR_ERR_OK = 0
         VIR_ERR_INTERNAL_ERROR = 1 # internal error
         VIR_ERR_NO_MEMORY = 2 # memory allocation failure
-        VIR_ERR_NO_SUPPORT  = 3 # no support for this function
-        VIR_ERR_UNKNOWN_HOST  = 4 # could not resolve hostname
-        VIR_ERR_NO_CONNECT  = 5 # can't connect to hypervisor
-        VIR_ERR_INVALID_CONN  = 6 # invalid connection object
-        VIR_ERR_INVALID_DOMAIN  = 7 # invalid domain object
+        VIR_ERR_NO_SUPPORT = 3 # no support for this function
+        VIR_ERR_UNKNOWN_HOST = 4 # could not resolve hostname
+        VIR_ERR_NO_CONNECT = 5 # can't connect to hypervisor
+        VIR_ERR_INVALID_CONN = 6 # invalid connection object
+        VIR_ERR_INVALID_DOMAIN = 7 # invalid domain object
         VIR_ERR_INVALID_ARG = 8 # invalid function argument
-        VIR_ERR_OPERATION_FAILED  = 9 # a command to hypervisor failed
+        VIR_ERR_OPERATION_FAILED = 9 # a command to hypervisor failed
         VIR_ERR_GET_FAILED  = 10 # a HTTP GET command to failed
         VIR_ERR_POST_FAILED = 11 # a HTTP POST command to failed
         VIR_ERR_HTTP_ERROR  = 12 # unexpected HTTP error code
-        VIR_ERR_SEXPR_SERIAL  = 13 # failure to serialize an S-Expr
-        VIR_ERR_NO_XEN  = 14 # could not open Xen hypervisor control
-        VIR_ERR_XEN_CALL  = 15 # failure doing an hypervisor call
+        VIR_ERR_SEXPR_SERIAL = 13 # failure to serialize an S-Expr
+        VIR_ERR_NO_XEN = 14 # could not open Xen hypervisor control
+        VIR_ERR_XEN_CALL = 15 # failure doing an hypervisor call
         VIR_ERR_OS_TYPE = 16 # unknown OS type
         VIR_ERR_NO_KERNEL = 17 # missing kernel information
         VIR_ERR_NO_ROOT = 18 # missing root device information
@@ -32,31 +32,31 @@ module VagrantPlugins
         VIR_ERR_CALL_FAILED = 26 # not supported by the drivers (DEPRECATED)
         VIR_ERR_XML_ERROR = 27 # an XML description is not well formed or broken
         VIR_ERR_DOM_EXIST = 28 # the domain already exist
-        VIR_ERR_OPERATION_DENIED  = 29 # operation forbidden on read-only connections
+        VIR_ERR_OPERATION_DENIED = 29 # operation forbidden on read-only connections
         VIR_ERR_OPEN_FAILED = 30 # failed to open a conf file
         VIR_ERR_READ_FAILED = 31 # failed to read a conf file
-        VIR_ERR_PARSE_FAILED  = 32 # failed to parse a conf file
+        VIR_ERR_PARSE_FAILED = 32 # failed to parse a conf file
         VIR_ERR_CONF_SYNTAX = 33 # failed to parse the syntax of a conf file
-        VIR_ERR_WRITE_FAILED  = 34 # failed to write a conf file
-        VIR_ERR_XML_DETAIL  = 35 # detail of an XML error
+        VIR_ERR_WRITE_FAILED = 34 # failed to write a conf file
+        VIR_ERR_XML_DETAIL = 35 # detail of an XML error
         VIR_ERR_INVALID_NETWORK = 36 # invalid network object
         VIR_ERR_NETWORK_EXIST = 37 # the network already exist
         VIR_ERR_SYSTEM_ERROR  = 38 # general system call failure
         VIR_ERR_RPC = 39 # some sort of RPC error
-        VIR_ERR_GNUTLS_ERROR  = 40 # error from a GNUTLS call
-        VIR_WAR_NO_NETWORK  = 41 # failed to start network
+        VIR_ERR_GNUTLS_ERROR = 40 # error from a GNUTLS call
+        VIR_WAR_NO_NETWORK = 41 # failed to start network
         VIR_ERR_NO_DOMAIN = 42 # domain not found or unexpectedly disappeared
         VIR_ERR_NO_NETWORK  = 43 # network not found
         VIR_ERR_INVALID_MAC = 44 # invalid MAC address
         VIR_ERR_AUTH_FAILED = 45 # authentication failed
-        VIR_ERR_INVALID_STORAGE_POOL  = 46 # invalid storage pool object
+        VIR_ERR_INVALID_STORAGE_POOL = 46 # invalid storage pool object
         VIR_ERR_INVALID_STORAGE_VOL = 47 # invalid storage vol object
-        VIR_WAR_NO_STORAGE  = 48 # failed to start storage
+        VIR_WAR_NO_STORAGE = 48 # failed to start storage
         VIR_ERR_NO_STORAGE_POOL = 49 # storage pool not found
         VIR_ERR_NO_STORAGE_VOL  = 50 # storage volume not found
         VIR_WAR_NO_NODE = 51 # failed to start node driver
         VIR_ERR_INVALID_NODE_DEVICE = 52 # invalid node device object
-        VIR_ERR_NO_NODE_DEVICE  = 53 # node device not found
+        VIR_ERR_NO_NODE_DEVICE = 53 # node device not found
         VIR_ERR_NO_SECURITY_MODEL = 54 # security model not found
         VIR_ERR_OPERATION_INVALID = 55 # operation is not applicable at this time
         VIR_WAR_NO_INTERFACE  = 56 # failed to start interface driver
@@ -64,32 +64,32 @@ module VagrantPlugins
         VIR_ERR_INVALID_INTERFACE = 58 # invalid interface object
         VIR_ERR_MULTIPLE_INTERFACES = 59 # more than one matching interface found
         VIR_WAR_NO_NWFILTER = 60 # failed to start nwfilter driver
-        VIR_ERR_INVALID_NWFILTER  = 61 # invalid nwfilter object
+        VIR_ERR_INVALID_NWFILTER = 61 # invalid nwfilter object
         VIR_ERR_NO_NWFILTER = 62 # nw filter pool not found
-        VIR_ERR_BUILD_FIREWALL  = 63 # nw filter pool not found
+        VIR_ERR_BUILD_FIREWALL = 63 # nw filter pool not found
         VIR_WAR_NO_SECRET = 64 # failed to start secret storage
-        VIR_ERR_INVALID_SECRET  = 65 # invalid secret
+        VIR_ERR_INVALID_SECRET = 65 # invalid secret
         VIR_ERR_NO_SECRET = 66 # secret not found
-        VIR_ERR_CONFIG_UNSUPPORTED  = 67 # unsupported configuration construct
+        VIR_ERR_CONFIG_UNSUPPORTED = 67 # unsupported configuration construct
         VIR_ERR_OPERATION_TIMEOUT = 68 # timeout occurred during operation
-        VIR_ERR_MIGRATE_PERSIST_FAILED  = 69 # a migration worked, but making the VM persist on the dest host failed
-        VIR_ERR_HOOK_SCRIPT_FAILED  = 70 # a synchronous hook script failed
+        VIR_ERR_MIGRATE_PERSIST_FAILED = 69 # a migration worked, but making the VM persist on the dest host failed
+        VIR_ERR_HOOK_SCRIPT_FAILED = 70 # a synchronous hook script failed
         VIR_ERR_INVALID_DOMAIN_SNAPSHOT = 71 # invalid domain snapshot
-        VIR_ERR_NO_DOMAIN_SNAPSHOT  = 72 # domain snapshot not found
-        VIR_ERR_INVALID_STREAM  = 73 # stream pointer not valid
+        VIR_ERR_NO_DOMAIN_SNAPSHOT = 72 # domain snapshot not found
+        VIR_ERR_INVALID_STREAM = 73 # stream pointer not valid
         VIR_ERR_ARGUMENT_UNSUPPORTED  = 74 # valid API use but unsupported by the given driver
         VIR_ERR_STORAGE_PROBE_FAILED  = 75 # storage pool probe failed
-        VIR_ERR_STORAGE_POOL_BUILT  = 76 # storage pool already built
+        VIR_ERR_STORAGE_POOL_BUILT = 76 # storage pool already built
         VIR_ERR_SNAPSHOT_REVERT_RISKY = 77 # force was not requested for a risky domain snapshot revert
         VIR_ERR_OPERATION_ABORTED = 78 # operation on a domain was canceled/aborted by user
-        VIR_ERR_AUTH_CANCELLED  = 79 # authentication cancelled
-        VIR_ERR_NO_DOMAIN_METADATA  = 80 # The metadata is not present
-        VIR_ERR_MIGRATE_UNSAFE  = 81 # Migration is not safe
-        VIR_ERR_OVERFLOW  = 82 # integer overflow
+        VIR_ERR_AUTH_CANCELLED = 79 # authentication cancelled
+        VIR_ERR_NO_DOMAIN_METADATA = 80 # The metadata is not present
+        VIR_ERR_MIGRATE_UNSAFE = 81 # Migration is not safe
+        VIR_ERR_OVERFLOW = 82 # integer overflow
         VIR_ERR_BLOCK_COPY_ACTIVE = 83 # action prevented by block copy job
         VIR_ERR_OPERATION_UNSUPPORTED = 84 # The requested operation is not supported
         VIR_ERR_SSH = 85 # error in ssh transport driver
-        VIR_ERR_AGENT_UNRESPONSIVE  = 86 # guest agent is unresponsive, not running or not usable
+        VIR_ERR_AGENT_UNRESPONSIVE = 86 # guest agent is unresponsive, not running or not usable
         VIR_ERR_RESOURCE_BUSY = 87 # resource is already in use
         VIR_ERR_ACCESS_DENIED = 88 # operation on the object/resource was denied
         VIR_ERR_DBUS_SERVICE  = 89 # error from a dbus service
@@ -98,4 +98,3 @@ module VagrantPlugins
     end
   end
 end
-

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

@@ -13,39 +13,51 @@ module VagrantPlugins
           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
+          management_network_autostart = env[:machine].provider_config.management_network_autostart
           logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode"
 
           begin
             management_network_ip = IPAddr.new(management_network_address)
           rescue ArgumentError
             raise Errors::ManagementNetworkError,
-              error_message: "#{management_network_address} is not a valid IP address"
+                  error_message: "#{management_network_address} is not a valid IP address"
           end
 
           # capture address into $1 and mask into $2
           management_network_ip.inspect =~ /IPv4:(.*)\/(.*)>/
 
-          if $2 == '255.255.255.255'
+          if Regexp.last_match(2) == '255.255.255.255'
             raise Errors::ManagementNetworkError,
-              error_message: "#{management_network_address} does not include both an address and subnet mask"
+                  error_message: "#{management_network_address} does not include both an address and subnet mask"
           end
 
           management_network_options = {
             iface_type: :private_network,
             network_name: management_network_name,
-            ip: $1,
-            netmask: $2,
+            ip: Regexp.last_match(1),
+            netmask: Regexp.last_match(2),
             dhcp_enabled: true,
             forward_mode: management_network_mode,
             guest_ipv6: management_network_guest_ipv6,
+            autostart: management_network_autostart
           }
 
           unless management_network_mac.nil?
             management_network_options[:mac] = management_network_mac
           end
 
+          if (env[:machine].config.vm.box &&
+              !env[:machine].provider_config.mgmt_attach)
+            raise Errors::ManagementNetworkRequired
+          end
+
           # add management network to list of networks to check
-          networks = [ management_network_options ]
+          # unless mgmt_attach set to false
+          networks = if env[:machine].provider_config.mgmt_attach
+                       [management_network_options]
+                     else
+                       []
+                     end
 
           env[:machine].config.vm.networks.each do |type, original_options|
             logger.debug "In config found network type #{type} options #{original_options}"
@@ -59,18 +71,18 @@ module VagrantPlugins
               iface_type:  type,
               netmask:      '255.255.255.0',
               dhcp_enabled: true,
-              forward_mode: 'nat',
+              forward_mode: 'nat'
             }.merge(options)
 
             if options[:type].to_s == 'dhcp' && options[:ip].nil?
-              options[:network_name] = "vagrant-private-dhcp"
+              options[:network_name] = 'vagrant-private-dhcp'
             end
 
             # add to list of networks to check
             networks.push(options)
           end
 
-          return networks
+          networks
         end
 
         # Return a list of all (active and inactive) libvirt networks as a list
@@ -84,7 +96,8 @@ module VagrantPlugins
           # Iterate over all (active and inactive) networks.
           active.concat(inactive).each do |network_name|
             libvirt_network = libvirt_client.lookup_network_by_name(
-              network_name)
+              network_name
+            )
 
             # Parse ip address and netmask from the network xml description.
             xml = Nokogiri::XML(libvirt_network.xml_desc)
@@ -93,19 +106,15 @@ module VagrantPlugins
             netmask = xml.xpath('/network/ip/@netmask').first
             netmask = netmask.value if netmask
 
-            if xml.at_xpath('//network/ip/dhcp')
-              dhcp_enabled = true
-            else
-              dhcp_enabled = false
-            end
+            dhcp_enabled = if xml.at_xpath('//network/ip/dhcp')
+                             true
+                           else
+                             false
+                           end
 
             # Calculate network address of network from ip address and
             # netmask.
-            if ip && netmask
-              network_address = network_address(ip, netmask)
-            else
-              network_address = nil
-            end
+            network_address = (network_address(ip, netmask) if ip && netmask)
 
             libvirt_networks << {
               name:             network_name,
@@ -123,7 +132,6 @@ module VagrantPlugins
 
           libvirt_networks
         end
-
       end
     end
   end

data/lib/vagrant-libvirt/util.rb

@@ -3,10 +3,9 @@ module VagrantPlugins
     module Util
       autoload :ErbTemplate, 'vagrant-libvirt/util/erb_template'
       autoload :Collection,  'vagrant-libvirt/util/collection'
-      autoload :Timer,  'vagrant-libvirt/util/timer'
-      autoload :NetworkUtil,  'vagrant-libvirt/util/network_util'
-      autoload :ErrorCodes,  'vagrant-libvirt/util/error_codes'
+      autoload :Timer, 'vagrant-libvirt/util/timer'
+      autoload :NetworkUtil, 'vagrant-libvirt/util/network_util'
+      autoload :ErrorCodes, 'vagrant-libvirt/util/error_codes'
     end
   end
 end
-

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.36'
+    VERSION = '0.0.37'.freeze
   end
 end

data/locales/en.yml

@@ -137,6 +137,9 @@ en:
         Error while deleting snapshot: %{error_message}.
       tunnel_port_not_defined: |-
          tunnel UDP or TCP port not defined.
+      management_network_required: |-
+        Management network can't be disabled when VM use box.
+        Please fix your configuration and run vagrant again.
 
     states:
       paused: |-

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'vagrant-libvirt'
 require 'support/environment_helper'
 require 'vagrant-spec/unit'

data/spec/support/environment_helper.rb

@@ -1,14 +1,13 @@
-require "ostruct"
-require "pathname"
+require 'ostruct'
+require 'pathname'
 
 class EnvironmentHelper
-
   attr_writer :domain_name
 
   attr_accessor :random_hostname, :name, :default_prefix
 
   def [](value)
-    self.send(value.to_sym)
+    send(value.to_sym)
   end
 
   def cpus
@@ -34,15 +33,14 @@ class EnvironmentHelper
   end
 
   def root_path
-    Pathname.new("./spec/support/foo")
+    Pathname.new('./spec/support/foo')
   end
 
   def domain_name
-    #noop
+    # noop
   end
 
   def libvirt_compute
     OpenStruct.new(servers: [])
   end
-
 end

data/spec/support/libvirt_context.rb

@@ -1,28 +1,30 @@
 require 'fog/libvirt'
 
-shared_context "libvirt" do
-  include_context "unit"
+shared_context 'libvirt' do
+  include_context 'unit'
 
   let(:libvirt_context) { true                      }
-  let(:id)              { "dummy-vagrant_dummy"     }
-  let(:connection)      { double("connection")  }
-  let(:domain)          { double("domain") }
+  let(:id)              { 'dummy-vagrant_dummy'     }
+  let(:connection)      { double('connection') }
+  let(:domain)          { double('domain') }
 
-  def connection_result(options={})
+  def connection_result(options = {})
     result = options.fetch(:result, nil)
-    double("connection_result" => result)
+    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)
+    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))
+    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")
+    allow(domain).to receive(:mac).and_return('9C:D5:53:F1:5A:E7')
+
+    machine.stub(id: id)
   end
 end

data/spec/support/sharedcontext.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
-shared_context "unit" do
+shared_context 'unit' do
   include_context 'vagrant-unit'
 
-  let(:vagrantfile) do <<-EOF
+  let(:vagrantfile) do
+    <<-EOF
     Vagrant.configure('2') do |config|
       config.vm.define :test
     end
@@ -15,21 +16,19 @@ shared_context "unit" do
     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(: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() }
+  let(:app)              { ->(env) {} }
+  let(:plugin)           { register_plugin }
 
   before (:each) do
-    machine.stub(:guest => guest)
-    machine.stub(:communicator => communicator)
-    machine.stub(:id => id)
+    machine.stub(guest: guest)
+    machine.stub(communicator: communicator)
   end
-
 end