vagrant-libvirt 0.0.36 → 0.0.37

data/lib/vagrant-libvirt/config.rb

@@ -3,9 +3,10 @@ require 'vagrant'
 class Numeric
   Alphabet = ('a'..'z').to_a
   def vdev
-    s, q = '', self
+    s = ''
+    q = self
     (q, r = (q - 1).divmod(26)) && s.prepend(Alphabet[r]) until q.zero?
-    'vd'+s
+    'vd' + s
   end
 end
 
@@ -49,6 +50,7 @@ module VagrantPlugins
       attr_accessor :management_network_mode
       attr_accessor :management_network_mac
       attr_accessor :management_network_guest_ipv6
+      attr_accessor :management_network_autostart
 
       # Default host prefix (alternative to use project folder name)
       attr_accessor :default_prefix
@@ -117,12 +119,19 @@ module VagrantPlugins
       # USB device passthrough
       attr_accessor :usbs
 
+      # Redirected devices
+      attr_accessor :redirdevs
+      attr_accessor :redirfilters
+
       # Suspend mode
       attr_accessor :suspend_mode
 
       # Autostart
       attr_accessor :autostart
 
+      # Attach mgmt network
+      attr_accessor :mgmt_attach
+
       def initialize
         @uri               = UNSET_VALUE
         @driver            = UNSET_VALUE
@@ -137,7 +146,8 @@ module VagrantPlugins
         @management_network_address = UNSET_VALUE
         @management_network_mode = UNSET_VALUE
         @management_network_mac  = UNSET_VALUE
-        @management_network_guest_ipv6  = UNSET_VALUE
+        @management_network_guest_ipv6 = UNSET_VALUE
+        @management_network_autostart = UNSET_VALUE
 
         # Domain specific settings.
         @uuid              = UNSET_VALUE
@@ -193,41 +203,46 @@ module VagrantPlugins
         @pcis              = UNSET_VALUE
 
         # Random number device passthrough
-        @rng              = UNSET_VALUE
+        @rng = UNSET_VALUE
 
         # USB device passthrough
         @usbs              = UNSET_VALUE
 
+        # Redirected devices
+        @redirdevs         = UNSET_VALUE
+        @redirfilters      = UNSET_VALUE
+
         # Suspend mode
         @suspend_mode      = UNSET_VALUE
 
         # Autostart
         @autostart         = UNSET_VALUE
+
+        # Attach mgmt network
+        @mgmt_attach       = UNSET_VALUE
       end
 
       def boot(device)
-        @boot_order << device  # append
+        @boot_order << device # append
       end
 
       def _get_device(disks)
         # skip existing devices and also the first one (vda)
-        exist = disks.collect {|x| x[:device]}+[1.vdev.to_s]
-        skip = 1  # we're 1 based, not 0 based...
-        while true do
-          dev = skip.vdev  # get lettered device
-          if !exist.include?(dev)
-            return dev
-          end
-          skip+=1
+        exist = disks.collect { |x| x[:device] } + [1.vdev.to_s]
+        skip = 1 # we're 1 based, not 0 based...
+        loop do
+          dev = skip.vdev # get lettered device
+          return dev unless exist.include?(dev)
+          skip += 1
         end
       end
 
       def _get_cdrom_dev(cdroms)
-        exist = Hash[cdroms.collect{|x| [x[:dev],true]}]
+        exist = Hash[cdroms.collect { |x| [x[:dev], true] }]
         # hda - hdc
-        curr = "a".ord
-        while curr <= "d".ord
-          dev = "hd" + curr.chr
+        curr = 'a'.ord
+        while curr <= 'd'.ord
+          dev = 'hd' + curr.chr
           if exist[dev]
             curr += 1
             next
@@ -241,9 +256,7 @@ module VagrantPlugins
       end
 
       def _generate_numa
-        if @cpus % @numa_nodes != 0
-          raise 'NUMA nodes must be a factor of CPUs'
-        end
+        raise 'NUMA nodes must be a factor of CPUs' if @cpus % @numa_nodes != 0
 
         if @memory % @numa_nodes != 0
           raise 'NUMA nodes must be a factor of memory'
@@ -257,120 +270,116 @@ module VagrantPlugins
           numa_cpu = Array(numa_cpu_start..numa_cpu_end).join(',')
           numa_mem = @memory / @numa_nodes
 
-          numa.push({
-            id: node,
-            cpu: numa_cpu,
-            mem: numa_mem
-          })
+          numa.push(id: node,
+                    cpu: numa_cpu,
+                    mem: numa_mem)
         end
 
         @numa_nodes = numa
       end
 
-      def cpu_feature(options={})
+      def cpu_feature(options = {})
         if options[:name].nil? || options[:policy].nil?
           raise 'CPU Feature name AND policy must be specified'
         end
 
-        if @cpu_features == UNSET_VALUE
-          @cpu_features = []
-        end
+        @cpu_features = [] if @cpu_features == UNSET_VALUE
 
-        @cpu_features.push({
-          name:   options[:name],
-          policy: options[:policy]
-        })
+        @cpu_features.push(name:   options[:name],
+                           policy: options[:policy])
       end
 
-      def input(options={})
+      def input(options = {})
         if options[:type].nil? || options[:bus].nil?
           raise 'Input type AND bus must be specified'
         end
 
-        if @inputs == UNSET_VALUE
-          @inputs = []
-        end
+        @inputs = [] if @inputs == UNSET_VALUE
 
-        @inputs.push({
-          type: options[:type],
-          bus:  options[:bus]
-        })
+        @inputs.push(type: options[:type],
+                     bus:  options[:bus])
       end
 
-      def channel(options={})
+      def channel(options = {})
         if options[:type].nil?
-            raise "Channel type must be specified."
+          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
+          # 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 = [] if @channels == UNSET_VALUE
 
-        @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]
-        })
+        @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 random(options={})
-        if !options[:model].nil? && options[:model] != "random"
+      def random(options = {})
+        if !options[:model].nil? && options[:model] != 'random'
           raise 'The only supported rng backend is "random".'
         end
 
-        if @rng == UNSET_VALUE
-          @rng = {}
-        end
+        @rng = {} if @rng == UNSET_VALUE
 
         @rng[:model] = options[:model]
       end
 
-      def pci(options={})
+      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.'
         end
 
-        if @pcis == UNSET_VALUE
-          @pcis = []
-        end
+        @pcis = [] if @pcis == UNSET_VALUE
 
-        @pcis.push({
-          bus:       options[:bus],
-          slot:      options[:slot],
-          function:  options[:function]
-        })
+        @pcis.push(bus:       options[:bus],
+                   slot:      options[:slot],
+                   function:  options[:function])
       end
 
-      def usb(options={})
+      def usb(options = {})
         if (options[:bus].nil? || options[:device].nil?) && options[:vendor].nil? && options[:product].nil?
           raise 'Bus and device and/or vendor and/or product must be specified. Check `lsusb` for these.'
         end
 
-        if @usbs == UNSET_VALUE
-          @usbs = []
-        end
+        @usbs = [] if @usbs == UNSET_VALUE
+
+        @usbs.push(bus:           options[:bus],
+                   device:        options[:device],
+                   vendor:        options[:vendor],
+                   product:       options[:product],
+                   startupPolicy: options[:startupPolicy])
+      end
+
+      def redirdev(options = {})
+        raise 'Type must be specified.' if options[:type].nil?
+
+        @redirdevs = [] if @redirdevs == UNSET_VALUE
 
-        @usbs.push({
-          bus:           options[:bus],
-          device:        options[:device],
-          vendor:        options[:vendor],
-          product:       options[:product],
-          startupPolicy: options[:startupPolicy],
-        })
+        @redirdevs.push(type: options[:type])
+      end
+
+      def redirfilter(options = {})
+        raise 'Option allow must be specified.' if options[:allow].nil?
+
+        @redirfilters = [] if @redirfilters == UNSET_VALUE
+
+        @redirfilters.push(class: options[:class] || -1,
+                           vendor: options[:class] || -1,
+                           product: options[:class] || -1,
+                           version: options[:class] || -1,
+                           allow: options[:allow])
       end
 
       # NOTE: this will run twice for each time it's needed- keep it idempotent
-      def storage(storage_type, options={})
+      def storage(storage_type, options = {})
         if storage_type == :file
           if options[:device] == :cdrom
             _handle_cdrom_storage(options)
@@ -380,7 +389,7 @@ module VagrantPlugins
         end
       end
 
-      def _handle_cdrom_storage(options={})
+      def _handle_cdrom_storage(options = {})
         # <disk type="file" device="cdrom">
         #   <source file="/home/user/virtio-win-0.1-100.iso"/>
         #   <target dev="hdc"/>
@@ -392,41 +401,39 @@ module VagrantPlugins
         # as will the address unit number (unit=0, unit=1, etc)
 
         options = {
-          :dev => self._get_cdrom_dev(@cdroms),
-          :bus => "ide",
-          :path => nil,
+          bus: 'ide',
+          path: nil
         }.merge(options)
 
         cdrom = {
-          :dev => options[:dev],
-          :bus => options[:bus],
-          :path => options[:path]
+          dev: options[:dev],
+          bus: options[:bus],
+          path: options[:path]
         }
 
         @cdroms << cdrom
       end
 
-      def _handle_disk_storage(options={})
+      def _handle_disk_storage(options = {})
         options = {
-          :device => _get_device(@disks),
-          :type => 'qcow2',
-          :size => '10G',  # matches the fog default
-          :path => nil,
-          :bus => 'virtio'
+          type: 'qcow2',
+          size: '10G', # matches the fog default
+          path: nil,
+          bus: 'virtio'
         }.merge(options)
 
         disk = {
-          :device => options[:device],
-          :type => options[:type],
-          :size => options[:size],
-          :path => options[:path],
-          :bus => options[:bus],
-          :cache => options[:cache] || 'default',
-          :allow_existing => options[:allow_existing],
-          :shareable => options[:shareable],
+          device: options[:device],
+          type: options[:type],
+          size: options[:size],
+          path: options[:path],
+          bus: options[:bus],
+          cache: options[:cache] || 'default',
+          allow_existing: options[:allow_existing],
+          shareable: options[:shareable]
         }
 
-        @disks << disk  # append
+        @disks << disk # append
       end
 
       # code to generate URI from a config moved out of the connect action
@@ -435,30 +442,28 @@ module VagrantPlugins
         # Setup connection uri.
         uri = @driver.dup
         virt_path = case uri
-        when 'qemu', 'openvz', 'uml', 'phyp', 'parallels', 'kvm'
-          '/system'
-        when '@en', 'esx'
-          '/'
-        when 'vbox', 'vmwarews', 'hyperv'
-          '/session'
-        else
-          raise "Require specify driver #{uri}"
+                    when 'qemu', 'openvz', 'uml', 'phyp', 'parallels', 'kvm'
+                      '/system'
+                    when '@en', 'esx'
+                      '/'
+                    when 'vbox', 'vmwarews', 'hyperv'
+                      '/session'
+                    else
+                      raise "Require specify driver #{uri}"
         end
         if uri == 'kvm'
-          uri = 'qemu'  # use qemu uri for kvm domain type
+          uri = 'qemu' # use qemu uri for kvm domain type
         end
 
         if @connect_via_ssh
           uri << '+ssh://'
-          if @username
-            uri << @username + '@'
-          end
+          uri << @username + '@' if @username
 
-          if @host
-            uri << @host
-          else
-            uri << 'localhost'
-          end
+          uri << if @host
+                   @host
+                 else
+                   'localhost'
+                 end
         else
           uri << '://'
           uri << @host if @host
@@ -475,8 +480,8 @@ module VagrantPlugins
           uri << @id_ssh_key_file
         end
         # set path to libvirt socket
-        uri << "\&socket="+@socket if @socket
-        return uri
+        uri << "\&socket=" + @socket if @socket
+        uri
       end
 
       def finalize!
@@ -493,19 +498,24 @@ module VagrantPlugins
         @management_network_mode = 'nat' if @management_network_mode == UNSET_VALUE
         @management_network_mac = nil if @management_network_mac == UNSET_VALUE
         @management_network_guest_ipv6 = 'yes' if @management_network_guest_ipv6 == UNSET_VALUE
+        @management_network_autostart = false if @management_network_autostart == UNSET_VALUE
 
         # generate a URI if none is supplied
-        @uri = _generate_uri() if @uri == UNSET_VALUE
+        @uri = _generate_uri if @uri == UNSET_VALUE
 
         # Domain specific settings.
         @uuid = '' if @uuid == UNSET_VALUE
         @memory = 512 if @memory == UNSET_VALUE
         @cpus = 1 if @cpus == UNSET_VALUE
         @cpu_mode = 'host-model' if @cpu_mode == UNSET_VALUE
-        @cpu_model = 'qemu64' if @cpu_model == UNSET_VALUE
+        @cpu_model = if (@cpu_model == UNSET_VALUE) && (@cpu_mode == 'custom')
+                       'qemu64'
+                     elsif @cpu_mode != 'custom'
+                       ''
+          end
         @cpu_fallback = 'allow' if @cpu_fallback == UNSET_VALUE
         @cpu_features = [] if @cpu_features == UNSET_VALUE
-        @numa_nodes = @numa_nodes == UNSET_VALUE ? nil : _generate_numa()
+        @numa_nodes = @numa_nodes == UNSET_VALUE ? nil : _generate_numa
         @loader = nil if @loader == UNSET_VALUE
         @machine_type = nil if @machine_type == UNSET_VALUE
         @machine_arch = nil if @machine_arch == UNSET_VALUE
@@ -522,7 +532,7 @@ module VagrantPlugins
         @graphics_autoport = 'yes' if @graphics_port == UNSET_VALUE
         @graphics_autoport = 'no' if @graphics_port != UNSET_VALUE
         if (@graphics_type != 'vnc' && @graphics_type != 'spice') ||
-            @graphics_passwd == UNSET_VALUE
+           @graphics_passwd == UNSET_VALUE
           @graphics_passwd = nil
         end
         @graphics_port = 5900 if @graphics_port == UNSET_VALUE
@@ -542,13 +552,21 @@ module VagrantPlugins
 
         # Storage
         @disks = [] if @disks == UNSET_VALUE
+        @disks.map! do |disk|
+          disk[:device] = _get_device(@disks) if disk[:device].nil?
+          disk
+        end
         @cdroms = [] if @cdroms == UNSET_VALUE
+        @cdroms.map! do |cdrom|
+          cdrom[:dev] = _get_cdrom_dev(@cdroms) if cdrom[:dev].nil?
+          cdrom
+        end
 
         # Inputs
-        @inputs = [{:type => "mouse", :bus => "ps2"}] if @inputs == UNSET_VALUE
+        @inputs = [{ type: 'mouse', bus: 'ps2' }] if @inputs == UNSET_VALUE
 
         # Channels
-        @channels = [ ] if @channels == UNSET_VALUE
+        @channels = [] if @channels == UNSET_VALUE
 
         # PCI device passthrough
         @pcis = [] if @pcis == UNSET_VALUE
@@ -559,18 +577,25 @@ module VagrantPlugins
         # USB device passthrough
         @usbs = [] if @usbs == UNSET_VALUE
 
+        # Redirected devices
+        @redirdevs = [] if @redirdevs == UNSET_VALUE
+        @redirfilters = [] if @redirfilters == UNSET_VALUE
+
         # Suspend mode
-        @suspend_mode = "pause" if @suspend_mode == UNSET_VALUE
+        @suspend_mode = 'pause' if @suspend_mode == UNSET_VALUE
 
         # Autostart
         @autostart = false if @autostart == UNSET_VALUE
+
+        # Attach mgmt network
+        @mgmt_attach = true if @mgmt_attach == UNSET_VALUE
       end
 
       def validate(machine)
         errors = _detected_errors
 
         machine.provider_config.disks.each do |disk|
-          if disk[:path] and disk[:path][0] == '/'
+          if disk[:path] && (disk[:path][0] == '/')
             errors << "absolute volume paths like '#{disk[:path]}' not yet supported"
           end
         end
@@ -581,7 +606,7 @@ module VagrantPlugins
           end
         end
 
-         { "Libvirt Provider" => errors }
+        { 'Libvirt Provider' => errors }
       end
 
       def merge(other)
@@ -589,6 +614,9 @@ module VagrantPlugins
           c = disks.dup
           c += other.disks
           result.disks = c
+          c = cdroms.dup
+          c += other.cdroms
+          result.cdroms = c
         end
       end
     end

data/lib/vagrant-libvirt/driver.rb

@@ -4,7 +4,6 @@ require 'log4r'
 module VagrantPlugins
   module ProviderLibvirt
     class Driver
-
       # store the connection at the process level
       #
       # possibly this should be a connection pool using the connection
@@ -34,7 +33,7 @@ module VagrantPlugins
 
         # Setup command for retrieving IP address for newly created machine
         # with some MAC address. Get it from dnsmasq leases table
-        ip_command = %q[ awk "/$mac/ {print \$1}" /proc/net/arp ]
+        ip_command = %q( awk "/$mac/ {print \$1}" /proc/net/arp )
         conn_attr[:libvirt_ip_command] = ip_command
 
         @logger.info("Connecting to Libvirt (#{uri}) ...")
@@ -42,7 +41,7 @@ module VagrantPlugins
           @@connection = Fog::Compute.new(conn_attr)
         rescue Fog::Errors::Error => e
           raise Errors::FogLibvirtConnectionError,
-            :error_message => e.message
+                error_message: e.message
         end
 
         @@connection
@@ -81,19 +80,19 @@ module VagrantPlugins
         ip_address = nil
         begin
           domain.wait_for(2) do
-            addresses.each_pair do |type, ip|
+            addresses.each_pair do |_type, ip|
               # Multiple leases are separated with a newline, return only
               # the most recent address
-              ip_address = ip[0].split("\n").first if ip[0] != nil
+              ip_address = ip[0].split("\n").first unless ip[0].nil?
             end
-            ip_address != nil
+            !ip_address.nil?
           end
         rescue Fog::Errors::TimeoutError
-          @logger.info("Timeout at waiting for an ip address for machine %s" % machine.name)
+          @logger.info('Timeout at waiting for an ip address for machine %s' % machine.name)
         end
 
-        if not ip_address
-          @logger.info("No arp table entry found for machine %s" % machine.name)
+        unless ip_address
+          @logger.info('No arp table entry found for machine %s' % machine.name)
           return nil
         end
 
@@ -110,11 +109,9 @@ module VagrantPlugins
         end
 
         # TODO: terminated no longer appears to be a valid fog state, remove?
-        if domain.nil? || domain.state.to_sym == :terminated
-          return :not_created
-        end
+        return :not_created if domain.nil? || domain.state.to_sym == :terminated
 
-        return domain.state.gsub("-", "_").to_sym
+        domain.state.tr('-', '_').to_sym
       end
     end
   end

data/lib/vagrant-libvirt/errors.rb

@@ -33,7 +33,6 @@ module VagrantPlugins
         error_key(:image_upload_error)
       end
 
-
       # Box exceptions
       class NoBoxVolume < VagrantLibvirtError
         error_key(:no_box_volume)
@@ -51,7 +50,6 @@ module VagrantPlugins
         error_key(:wrong_box_format)
       end
 
-
       # Fog libvirt exceptions
       class FogError < VagrantLibvirtError
         error_key(:fog_error)
@@ -110,6 +108,10 @@ module VagrantPlugins
         error_key(:tunnel_port_not_defined)
       end
 
+      class ManagementNetworkRequired < VagrantLibvirtError
+        error_key(:management_network_required)
+      end
+
       # Other exceptions
       class InterfaceSlotNotAvailable < VagrantLibvirtError
         error_key(:interface_slot_not_available)
@@ -142,7 +144,6 @@ module VagrantPlugins
       class DeleteSnapshotError < VagrantLibvirtError
         error_key(:delete_snapshot_error)
       end
-
     end
   end
 end

data/lib/vagrant-libvirt/plugin.rb

@@ -29,21 +29,20 @@ module VagrantPlugins
         hook.after Vagrant::Action::Builtin::BoxRemove, Action.remove_libvirt_image
       end
 
-
       guest_capability('linux', 'mount_p9_shared_folder') do
         require_relative 'cap/mount_p9'
         Cap::MountP9
       end
 
       provider_capability(:libvirt, :nic_mac_addresses) do
-        require_relative "cap/nic_mac_addresses"
+        require_relative 'cap/nic_mac_addresses'
         Cap::NicMacAddresses
       end
 
       # lower priority than nfs or rsync
       # https://github.com/vagrant-libvirt/vagrant-libvirt/pull/170
-      synced_folder("9p", 4) do
-        require_relative "cap/synced_folder"
+      synced_folder('9p', 4) do
+        require_relative 'cap/synced_folder'
         VagrantPlugins::SyncedFolder9p::SyncedFolder
       end
 
@@ -71,7 +70,7 @@ module VagrantPlugins
         # Some constants, such as "true" resolve to booleans, so the
         # above error checking doesn't catch it. This will check to make
         # sure that the log level is an integer, as Log4r requires.
-        level = nil if !level.is_a?(Integer)
+        level = nil unless level.is_a?(Integer)
 
         # Set the logging level on all "vagrant" namespaced
         # logs as long as we have a valid level.
@@ -88,7 +87,6 @@ module VagrantPlugins
       # from the parent logger.
       setup_logging
       setup_i18n
-
     end
   end
 end