vagrant-libvirt 0.0.36 → 0.0.37

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

@@ -5,7 +5,6 @@ require 'vagrant/util/scoped_hash_override'
 module VagrantPlugins
   module ProviderLibvirt
     module Action
-
       # Create network interfaces for domain, before domain is running.
       # Networks for connecting those interfaces should be already prepared.
       class CreateNetworkInterfaces
@@ -27,10 +26,11 @@ module VagrantPlugins
           # Get domain first.
           begin
             domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(
-              env[:machine].id.to_s)
+              env[:machine].id.to_s
+            )
           rescue => e
             raise Errors::NoDomainError,
-              :error_message => e.message
+                  error_message: e.message
           end
 
           # Setup list of interfaces before creating them.
@@ -39,11 +39,10 @@ module VagrantPlugins
           # Vagrant gives you adapter 0 by default
           # Assign interfaces to slots.
           configured_networks(env, @logger).each do |options|
-
             # dont need to create interface for this type
             next if options[:iface_type] == :forwarded_port
 
-            # TODO fill first ifaces with adapter option specified.
+            # TODO: fill first ifaces with adapter option specified.
             if options[:adapter]
               if adapters[options[:adapter]]
                 raise Errors::InterfaceSlotNotAvailable
@@ -54,13 +53,14 @@ module VagrantPlugins
             else
               free_slot = find_empty(adapters)
               @logger.debug "Adapter not specified so found slot #{free_slot}"
-              raise Errors::InterfaceSlotNotAvailable if free_slot == nil
+              raise Errors::InterfaceSlotNotAvailable if free_slot.nil?
             end
 
             # We have slot for interface, fill it with interface configuration.
             adapters[free_slot] = options
             adapters[free_slot][:network_name] = interface_network(
-              env[:machine].provider.driver.connection.client, adapters[free_slot])
+              env[:machine].provider.driver.connection.client, adapters[free_slot]
+            )
           end
 
           # Create each interface as new domain device.
@@ -95,18 +95,17 @@ module VagrantPlugins
               end
               # default mcast tunnel to 239.255.1.1. Web search says this
               # 239.255.x.x is a safe range to use for general use mcast
-              if @type == 'mcast'
-                default_ip = '239.255.1.1'
-              else
-                default_ip = '127.0.0.1'
-              end
+              default_ip = if @type == 'mcast'
+                             '239.255.1.1'
+                           else
+                             '127.0.0.1'
+                           end
               @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}")
             end
 
-
             message = "Creating network interface eth#{@iface_number}"
             message << " connected to network #{@network_name}."
             if @mac
@@ -119,31 +118,29 @@ module VagrantPlugins
               domain.attach_device(to_xml(template_name))
             rescue => e
               raise Errors::AttachDeviceError,
-                :error_message => e.message
+                    error_message: e.message
             end
 
             # Re-read the network configuration and grab the MAC address
-            unless @mac
-              xml = Nokogiri::XML(domain.xml_desc)
-              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
-              else
+            next if @mac
+            xml = Nokogiri::XML(domain.xml_desc)
+            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
-              iface_configuration[:mac] = @mac.to_s
+            else
+              @mac = xml.xpath("/domain/devices/interface[source[@network='#{@network_name}']]/mac/@address")
             end
+            iface_configuration[:mac] = @mac.to_s
           end
 
           # Continue the middleware chain.
           @app.call(env)
 
-
           if env[:machine].config.vm.box
             # Configure interfaces that user requested. Machine should be up and
             # running now.
@@ -158,17 +155,17 @@ module VagrantPlugins
               @logger.debug "Configuring interface slot_number #{slot_number} options #{options}"
 
               network = {
-                :interface                       => slot_number,
-                :use_dhcp_assigned_default_route => options[:use_dhcp_assigned_default_route],
-                :mac_address => options[:mac],
+                interface: slot_number,
+                use_dhcp_assigned_default_route: options[:use_dhcp_assigned_default_route],
+                mac_address: options[:mac]
               }
 
               if options[:ip]
                 network = {
-                  :type    => :static,
-                  :ip      => options[:ip],
-                  :netmask => options[:netmask],
-                  :gateway => options[:gateway],
+                  type: :static,
+                  ip: options[:ip],
+                  netmask: options[:netmask],
+                  gateway: options[:gateway]
                 }.merge(network)
               else
                 network[:type] = :dhcp
@@ -182,18 +179,19 @@ module VagrantPlugins
 
             env[:ui].info I18n.t('vagrant.actions.vm.network.configuring')
             env[:machine].guest.capability(
-              :configure_networks, networks_to_configure)
+              :configure_networks, networks_to_configure
+            )
 
           end
         end
 
         private
 
-        def find_empty(array, start=0, stop=@nic_adapter_count)
+        def find_empty(array, start = 0, stop = @nic_adapter_count)
           (start..stop).each do |i|
             return i unless array[i]
           end
-          return nil
+          nil
         end
 
         # Return network name according to interface options.
@@ -202,7 +200,7 @@ module VagrantPlugins
           return 'tunnel_interface' if options.fetch(:tunnel_type, nil)
 
           if options[:network_name]
-            @logger.debug "Found network by name"
+            @logger.debug 'Found network by name'
             return options[:network_name]
           end
 
@@ -215,7 +213,7 @@ module VagrantPlugins
             address = network_address(options[:ip], options[:netmask])
             available_networks.each do |network|
               if address == network[:network_address]
-                @logger.debug "Found network by ip"
+                @logger.debug 'Found network by ip'
                 return network[:name]
               end
             end

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

@@ -36,7 +36,7 @@ module VagrantPlugins
             configured_networks(env, @logger).each do |options|
               # Only need to create private networks
               next if options[:iface_type] != :private_network ||
-                options.fetch(:tunnel_type, nil)
+                      options.fetch(:tunnel_type, nil)
               @logger.debug "Searching for network with options #{options}"
 
               # should fix other methods so this doesn't have to be instance var
@@ -46,7 +46,8 @@ module VagrantPlugins
               # list is used throughout this class and should be easier to
               # process than libvirt API calls.
               @available_networks = libvirt_networks(
-                                      env[:machine].provider.driver.connection.client)
+                env[:machine].provider.driver.connection.client
+              )
 
               # Prepare a hash describing network for this specific interface.
               @interface_network = {
@@ -55,9 +56,11 @@ module VagrantPlugins
                 netmask:          @options[:netmask],
                 network_address:  nil,
                 bridge_name:      nil,
+                ipv6_address:     options[:ipv6_address] || nil,
+                ipv6_prefix:      options[:ipv6_prefix] || nil,
                 created:          false,
                 active:           false,
-                autostart:        false,
+                autostart:        options[:autostart] || false,
                 guest_ipv6:       @options[:guest_ipv6] || 'yes',
                 libvirt_network:  nil
               }
@@ -129,24 +132,22 @@ module VagrantPlugins
           @interface_network[:network_address] = net_address
 
           # if network is veryisolated, search by name
-          if @options[:libvirt__forward_mode] == "veryisolated"
-            network = lookup_network_by_name(@options[:network_name])
-          elsif net_address
-            # otherwise, search by ip (if set)
-            network = lookup_network_by_ip(net_address)
-          else
-            # leaving this here to mimic prior behavior. If we get
-            # here, something's probably broken.
-            network = lookup_network_by_name(@options[:network_name])
-          end
+          network = if @options[:libvirt__forward_mode] == 'veryisolated'
+                      lookup_network_by_name(@options[:network_name])
+                    elsif net_address
+                      # otherwise, search by ip (if set)
+                      lookup_network_by_ip(net_address)
+                    else
+                      # leaving this here to mimic prior behavior. If we get
+                      # here, something's probably broken.
+                      lookup_network_by_name(@options[:network_name])
+                    end
           @interface_network = network if network
 
-          if @interface_network[:created]
-            verify_dhcp
-          end
+          verify_dhcp if @interface_network[:created]
 
           if @options[:network_name]
-            @logger.debug "Checking that network name does not clash with ip"
+            @logger.debug 'Checking that network name does not clash with ip'
             if @interface_network[:created]
               # Just check for mismatch error here - if name and ip from
               # config match together.
@@ -178,7 +179,7 @@ module VagrantPlugins
             # Is name for new network set? If not, generate a unique one.
             count = 0
             while @interface_network[:name].nil?
-              @logger.debug "generating name for network"
+              @logger.debug 'generating name for network'
 
               # Generate a network name.
               network_name = env[:root_path].basename.to_s.dup
@@ -205,12 +206,12 @@ module VagrantPlugins
         def handle_network_name_option(env)
           return if @options[:ip] || \
                     !@options[:network_name] || \
-                    !@options[:libvirt__forward_mode] == "veryisolated"
+                    !@options[:libvirt__forward_mode] == 'veryisolated'
 
           network = lookup_network_by_name(@options[:network_name])
           @interface_network = network if network
 
-          if @options[:libvirt__forward_mode] == "veryisolated"
+          if @options[:libvirt__forward_mode] == 'veryisolated'
             # if this interface has a network address, something's wrong.
             if @interface_network[:network_address]
               raise Errors::NetworkNotAvailableError,
@@ -228,6 +229,7 @@ module VagrantPlugins
           # Do we need to create new network?
           unless @interface_network[:created]
             @interface_network[:name] = @options[:network_name]
+            @interface_network[:ip_address] ||= @options[:host_ip]
 
             # Generate a unique name for network bridge.
             @interface_network[:bridge_name] = generate_bridge_name
@@ -266,7 +268,7 @@ module VagrantPlugins
 
         # Return the first available virbr interface name
         def generate_bridge_name
-          @logger.debug "generating name for bridge"
+          @logger.debug 'generating name for bridge'
           count = 0
           while lookup_bridge_by_name(bridge_name = "virbr#{count}")
             count += 1
@@ -282,6 +284,9 @@ module VagrantPlugins
           @network_netmask = @interface_network[:netmask]
           @guest_ipv6 = @interface_network[:guest_ipv6]
 
+          @network_ipv6_address = @interface_network[:ipv6_address]
+          @network_ipv6_prefix = @interface_network[:ipv6_prefix]
+
           @network_forward_mode = @options[:forward_mode]
           if @options[:forward_device]
             @network_forward_device = @options[:forward_device]
@@ -290,7 +295,7 @@ module VagrantPlugins
           if @options[:dhcp_enabled]
             # Find out DHCP addresses pool range.
             network_address = "#{@interface_network[:network_address]}/"
-            network_address << "#{@interface_network[:netmask]}"
+            network_address << (@interface_network[:netmask]).to_s
             net = @interface_network[:network_address] ? IPAddr.new(network_address) : nil
 
             # First is address of network, second is gateway (by default).
@@ -313,7 +318,7 @@ module VagrantPlugins
           begin
             @interface_network[:libvirt_network] = \
               @libvirt_client.define_network_xml(to_xml('private_network'))
-            @logger.debug "created network"
+            @logger.debug 'created network'
           rescue => e
             raise Errors::CreateNetworkError, error_message: e.message
           end
@@ -332,21 +337,16 @@ module VagrantPlugins
         end
 
         def autostart_network
-          begin
-            @interface_network[:libvirt_network].autostart = true
-          rescue => e
-            raise Errors::AutostartNetworkError, error_message: e.message
-          end
+          @interface_network[:libvirt_network].autostart = true
+        rescue => e
+          raise Errors::AutostartNetworkError, error_message: e.message
         end
 
         def activate_network
-          begin
-            @interface_network[:libvirt_network].create
-          rescue => e
-            raise Errors::ActivateNetworkError, error_message: e.message
-          end
+          @interface_network[:libvirt_network].create
+        rescue => e
+          raise Errors::ActivateNetworkError, error_message: e.message
         end
-
       end
     end
   end

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

@@ -17,8 +17,9 @@ module VagrantPlugins
           # Fog libvirt currently doesn't support snapshots. Use
           # ruby-libvirt client directly. Note this is racy, see
           # http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotListNames
-          libvirt_domain =  env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(
-                              env[:machine].id)
+          libvirt_domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(
+            env[:machine].id
+          )
           libvirt_domain.list_snapshots.each do |name|
             @logger.info("Deleting snapshot '#{name}'")
             begin
@@ -29,14 +30,12 @@ module VagrantPlugins
           end
 
           # must remove managed saves
-          if libvirt_domain.has_managed_save?
-            libvirt_domain.managed_save_remove
-          end
+          libvirt_domain.managed_save_remove if libvirt_domain.has_managed_save?
 
           domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
 
-          if env[:machine].provider_config.disks.empty? and
-              env[:machine].provider_config.cdroms.empty?
+          if env[:machine].provider_config.disks.empty? &&
+             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)
@@ -56,7 +55,7 @@ module VagrantPlugins
               elsif disk[:path]
                 poolname = env[:machine].provider_config.storage_pool_name
                 libvirt_disk = domain.volumes.select do |x|
-                  # FIXME can remove pool/target.img and pool/123/target.img
+                  # FIXME: can remove pool/target.img and pool/123/target.img
                   x.path =~ /\/#{disk[:path]}$/ && x.pool_name == poolname
                 end.first
                 libvirt_disk.destroy if libvirt_disk

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

@@ -7,8 +7,7 @@ module VagrantPlugins
       # Destroy all networks created for this specific domain. Skip
       # removing if network has still active connections.
       class DestroyNetworks
-
-        def initialize(app, env)
+        def initialize(app, _env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::destroy_networks')
           @app = app
         end
@@ -37,11 +36,12 @@ module VagrantPlugins
             # if there is an error or if the network just doesn't exist
             begin
               libvirt_network = env[:machine].provider.driver.connection.client.lookup_network_by_uuid(
-                network_uuid)
+                network_uuid
+              )
             rescue Libvirt::RetrieveError => e
               # this network is already destroyed, so move on
               if e.message =~ /Network not found/
-                @logger.info "It is already undefined"
+                @logger.info 'It is already undefined'
                 next
               # some other error occured, so raise it again
               else
@@ -52,38 +52,37 @@ module VagrantPlugins
             # Skip removing if network has still active connections.
             xml = Nokogiri::XML(libvirt_network.xml_desc)
             connections = xml.xpath('/network/@connections').first
-            if connections != nil
-              @logger.info "Still has connections so will not undefine"
+            unless connections.nil?
+              @logger.info 'Still has connections so will not undefine'
               created_networks << network_uuid
               next
             end
 
-
             # Shutdown network first.
             # Undefine network.
             begin
               libvirt_network.destroy
               libvirt_network.undefine
-              @logger.info "Undefined it"
+              @logger.info 'Undefined it'
             rescue => e
               raise Errors::DestroyNetworkError,
-                network_name: libvirt_network.name,
-                error_message: e.message
+                    network_name: libvirt_network.name,
+                    error_message: e.message
             end
           end
           file.close
 
           # Update status of created networks after removing some/all of them.
           # Not sure why we are doing this, something else seems to always delete the file
-          if created_networks.length > 0
+          if !created_networks.empty?
             File.open(created_networks_file, 'w') do |file|
-              @logger.info "Writing new created_networks file"
+              @logger.info 'Writing new created_networks file'
               created_networks.each do |network_uuid|
                 file.puts network_uuid
               end
             end
           else
-            @logger.info "Deleting created_networks file"
+            @logger.info 'Deleting created_networks file'
             File.delete(created_networks_file)
           end
 

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

@@ -5,7 +5,7 @@ module VagrantPlugins
       class ForwardPorts
         @@lock = Mutex.new
 
-        def initialize(app, env)
+        def initialize(app, _env)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_libvirt::action::forward_ports')
         end
@@ -18,12 +18,11 @@ module VagrantPlugins
 
           # Warn if we're port forwarding to any privileged ports
           env[:forwarded_ports].each do |fp|
-            if fp[:host] <= 1024
-              env[:ui].warn I18n.t(
-                'vagrant.actions.vm.forward_ports.privileged_ports'
-              )
-              break
-            end
+            next unless fp[:host] <= 1024
+            env[:ui].warn I18n.t(
+              'vagrant.actions.vm.forward_ports.privileged_ports'
+            )
+            break
           end
 
           # Continue, we need the VM to be booted in order to grab its IP
@@ -44,8 +43,8 @@ module VagrantPlugins
             }
 
             @env[:ui].info(I18n.t(
-                'vagrant.actions.vm.forward_ports.forwarding_entry',
-                message_attributes
+                             'vagrant.actions.vm.forward_ports.forwarding_entry',
+                             message_attributes
             ))
 
             ssh_pid = redirect_port(
@@ -68,12 +67,11 @@ module VagrantPlugins
           config.vm.networks.each do |type, options|
             next if options[:disabled]
 
-            if type == :forwarded_port && options[:id] != 'ssh'
-              if options.fetch(:host_ip, '').to_s.strip.empty?
-                options.delete(:host_ip)
-              end
-              mappings[options[:host]] = options
+            next unless type == :forwarded_port && options[:id] != 'ssh'
+            if options.fetch(:host_ip, '').to_s.strip.empty?
+              options.delete(:host_ip)
             end
+            mappings[options[:host]] = options
           end
 
           mappings.values
@@ -98,8 +96,8 @@ module VagrantPlugins
             PasswordAuthentication=no
             ForwardX11=#{ssh_info[:forward_x11] ? 'yes' : 'no'}
           ) + ssh_info[:private_key_path].map do |pk|
-              "IdentityFile='\"#{pk}\"'"
-            end).map { |s| s.prepend('-o ') }.join(' ')
+                "IdentityFile='\"#{pk}\"'"
+              end).map { |s| s.prepend('-o ') }.join(' ')
 
           options += " -o ProxyCommand=\"#{ssh_info[:proxy_command]}\"" if machine.provider_config.connect_via_ssh
 
@@ -111,7 +109,7 @@ module VagrantPlugins
               @env[:ui].info 'Requesting sudo for host port(s) <= 1024'
               r = system('sudo -v')
               if r
-                ssh_cmd << 'sudo '  # add sudo prefix
+                ssh_cmd << 'sudo ' # add sudo prefix
               end
             end
           end
@@ -122,7 +120,7 @@ module VagrantPlugins
           log_file = ssh_forward_log_file(host_ip, host_port,
                                           guest_ip, guest_port)
           @logger.info "Logging to #{log_file}"
-          spawn(ssh_cmd,  [:out, :err] => [log_file, 'w'])
+          spawn(ssh_cmd, [:out, :err] => [log_file, 'w'])
         end
 
         def ssh_forward_log_file(host_ip, host_port, guest_ip, guest_port)
@@ -131,7 +129,7 @@ module VagrantPlugins
           File.join(
             log_dir,
             'ssh-forwarding-%s_%s-%s_%s.log' %
-              [ host_ip, host_port, guest_ip, guest_port ]
+              [host_ip, host_port, guest_ip, guest_port]
           )
         end
 
@@ -155,7 +153,7 @@ module VagrantPlugins
       class ClearForwardedPorts
         @@lock = Mutex.new
 
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
           @logger = Log4r::Logger.new(
             'vagrant_libvirt::action::clear_forward_ports'
@@ -175,7 +173,7 @@ module VagrantPlugins
               kill_cmd = ''
 
               if tag[:port] <= 1024
-                kill_cmd << 'sudo '  # add sudo prefix
+                kill_cmd << 'sudo ' # add sudo prefix
               end
 
               kill_cmd << "kill #{tag[:pid]}"
@@ -199,8 +197,8 @@ module VagrantPlugins
           glob = @env[:machine].data_dir.join('pids').to_s + '/ssh_*.pid'
           @ssh_pids = Dir[glob].map do |file|
             {
-              :pid => File.read(file).strip.chomp,
-              :port => File.basename(file)['ssh_'.length..-1*('.pid'.length+1)].to_i
+              pid: File.read(file).strip.chomp,
+              port: File.basename(file)['ssh_'.length..-1 * ('.pid'.length + 1)].to_i
             }
           end
         end

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

@@ -5,25 +5,25 @@ module VagrantPlugins
     module Action
       # Halt the domain.
       class HaltDomain
-        def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::halt_domain")
+        def initialize(app, _env)
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::halt_domain')
           @app = app
         end
 
         def call(env)
-          env[:ui].info(I18n.t("vagrant_libvirt.halt_domain"))
+          env[:ui].info(I18n.t('vagrant_libvirt.halt_domain'))
 
           domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
-          raise Errors::NoDomainError if domain == nil
+          raise Errors::NoDomainError if domain.nil?
 
-          @logger.info("Trying gracefull shutdown.")
+          @logger.info('Trying gracefull shutdown.')
           domain.shutdown
           begin
-            domain.wait_for(30) {
+            domain.wait_for(30) do
               !ready?
-            }
+            end
           rescue Fog::Errors::TimeoutError
-            @logger.info("VM is still running. Calling force poweroff.")
+            @logger.info('VM is still running. Calling force poweroff.')
             domain.poweroff
           end
 
@@ -33,4 +33,3 @@ module VagrantPlugins
     end
   end
 end
-