vagrant-libvirt 0.7.0 → 0.8.0

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

@@ -22,60 +22,34 @@ module VagrantPlugins
           # Initialize metrics if they haven't been
           env[:metrics] ||= {}
 
-          # Get domain object
-          domain = env[:machine].provider.driver.get_domain(env[:machine])
+          driver = env[:machine].provider.driver
+          domain = driver.get_domain(env[:machine])
+
           if domain.nil?
             raise Errors::NoDomainError,
                   error_message: "Domain #{env[:machine].id} not found"
           end
 
-          # Wait for domain to obtain an ip address. Ip address is searched
-          # from arp table, either locally or remotely via ssh, if Libvirt
-          # connection was done via ssh.
           env[:ip_address] = nil
           @logger.debug("Searching for IP for MAC address: #{domain.mac}")
           env[:ui].info(I18n.t('vagrant_libvirt.waiting_for_ip'))
 
+          # Wait for domain to obtain an ip address. Ip address is searched
+          # from dhcp leases table via libvirt, or via qemu agent if enabled.
           env[:metrics]['instance_ip_time'] = Util::Timer.time do
             retryable(on: Fog::Errors::TimeoutError, tries: 300) do
               # just return if interrupted and let the warden call recover
               return if env[:interrupted]
 
               # Wait for domain to obtain an ip address
-              env[:ip_address] = env[:machine].provider.driver.get_domain_ipaddress(env[:machine], domain)
+              env[:ip_address] = driver.get_domain_ipaddress(env[:machine], domain)
             end
           end
-
           @logger.info("Got IP address #{env[:ip_address]}")
           @logger.info("Time for getting IP: #{env[:metrics]['instance_ip_time']}")
 
           @app.call(env)
         end
-
-        def recover(env)
-          # Undo the import
-          terminate(env)
-        end
-
-        def terminate(env)
-          if env[:machine].state.id != :not_created
-            # If we're not supposed to destroy on error then just return
-            return unless env[:destroy_on_error]
-
-            if env[:halt_on_error]
-              halt_env = env.dup
-              halt_env.delete(:interrupted)
-              halt_env[:config_validate] = false
-              env[:action_runner].run(Action.action_halt, halt_env)
-            else
-              destroy_env = env.dup
-              destroy_env.delete(:interrupted)
-              destroy_env[:config_validate] = false
-              destroy_env[:force_confirm_destroy] = true
-              env[:action_runner].run(Action.action_destroy, destroy_env)
-            end
-          end
-        end
       end
     end
   end

data/lib/vagrant-libvirt/action.rb

@@ -6,6 +6,58 @@ require 'log4r'
 module VagrantPlugins
   module ProviderLibvirt
     module Action
+      action_root = Pathname.new(File.expand_path('../action', __FILE__))
+      autoload :CleanupOnFailure, action_root.join('cleanup_on_failure')
+      autoload :ClearForwardedPorts, action_root.join('forward_ports')
+      autoload :CreateDomain, action_root.join('create_domain')
+      autoload :CreateDomainVolume, action_root.join('create_domain_volume')
+      autoload :CreateNetworkInterfaces, action_root.join('create_network_interfaces')
+      autoload :CreateNetworks, action_root.join('create_networks')
+      autoload :CleanMachineFolder, action_root.join('clean_machine_folder')
+      autoload :DestroyDomain, action_root.join('destroy_domain')
+      autoload :DestroyNetworks, action_root.join('destroy_networks')
+      autoload :ForwardPorts, action_root.join('forward_ports')
+      autoload :HaltDomain, action_root.join('halt_domain')
+      autoload :HandleBoxImage, action_root.join('handle_box_image')
+      autoload :HandleStoragePool, action_root.join('handle_storage_pool')
+      autoload :IsCreated, action_root.join('is_created')
+      autoload :IsRunning, action_root.join('is_running')
+      autoload :IsSuspended, action_root.join('is_suspended')
+      autoload :MessageAlreadyCreated, action_root.join('message_already_created')
+      autoload :MessageNotCreated, action_root.join('message_not_created')
+      autoload :MessageNotRunning, action_root.join('message_not_running')
+      autoload :MessageNotSuspended, action_root.join('message_not_suspended')
+      autoload :MessageWillNotDestroy, action_root.join('message_will_not_destroy')
+      autoload :PackageDomain, action_root.join('package_domain')
+      autoload :PrepareNFSSettings, action_root.join('prepare_nfs_settings')
+      autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
+      autoload :PruneNFSExports, action_root.join('prune_nfs_exports')
+      autoload :ReadMacAddresses, action_root.join('read_mac_addresses')
+      autoload :RemoveLibvirtImage, action_root.join('remove_libvirt_image')
+      autoload :RemoveStaleVolume, action_root.join('remove_stale_volume')
+      autoload :ResumeDomain, action_root.join('resume_domain')
+      autoload :SetNameOfDomain, action_root.join('set_name_of_domain')
+      autoload :SetBootOrder, action_root.join('set_boot_order')
+      autoload :SetupComplete, action_root.join('cleanup_on_failure')
+      # I don't think we need it anymore
+      autoload :ShareFolders, action_root.join('share_folders')
+      autoload :ShutdownDomain, action_root.join('shutdown_domain')
+      autoload :StartDomain, action_root.join('start_domain')
+      autoload :StartShutdownTimer, action_root.join('shutdown_domain')
+      autoload :SuspendDomain, action_root.join('suspend_domain')
+      autoload :TimedProvision, action_root.join('timed_provision')
+      autoload :WaitTillUp, action_root.join('wait_till_up')
+
+      autoload :HandleBox, 'vagrant/action/builtin/handle_box'
+      autoload :Package, 'vagrant/action/general/package'
+      autoload :PackageSetupFiles, 'vagrant/action/general/package_setup_files'
+      autoload :PackageSetupFolders, 'vagrant/action/general/package_setup_folders'
+      autoload :ProvisionerCleanup, 'vagrant/action/builtin/provisioner_cleanup'
+      autoload :SSHRun, 'vagrant/action/builtin/ssh_run'
+      autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
+      autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
+      autoload :WaitForCommunicator, 'vagrant/action/builtin/wait_for_communicator'
+
       # Include the built-in & general modules so we can use them as top-level things.
       include Vagrant::Action::Builtin
       include Vagrant::Action::General
@@ -24,6 +76,8 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use BoxCheckOutdated
           b.use Call, IsCreated do |env, b2|
+            b2.use CleanupOnFailure
+
             # Create VM if not yet created.
             if !env[:result]
               b2.use SetNameOfDomain
@@ -31,37 +85,31 @@ module VagrantPlugins
                 b2.use CreateDomain
                 b2.use CreateNetworks
                 b2.use CreateNetworkInterfaces
-                b2.use SetBootOrder
-                b2.use StartDomain
+
+                b2.use action_start
+
+                b2.use SetupComplete
               else
                 b2.use HandleStoragePool
                 b2.use HandleBox
                 b2.use HandleBoxImage
                 b2.use CreateDomainVolume
                 b2.use CreateDomain
-
-                b2.use Provision
-                b2.use PrepareNFSValidIds
-                b2.use SyncedFolderCleanup
-                b2.use SyncedFolders
-                b2.use PrepareNFSSettings
-                b2.use ShareFolders
                 b2.use CreateNetworks
                 b2.use CreateNetworkInterfaces
-                b2.use SetBootOrder
 
-                b2.use StartDomain
-                b2.use WaitTillUp
-                b2.use WaitForCommunicator, [:running]
+                b2.use action_start
 
-                b2.use ForwardPorts
                 b2.use SetHostname
-                # b2.use SyncFolders
               end
             else
               env[:halt_on_error] = true
+              b2.use CreateNetworks
               b2.use action_start
             end
+
+            # corresponding action to CleanupOnFailure
+            b2.use SetupComplete
           end
         end
       end
@@ -82,28 +130,25 @@ module VagrantPlugins
             b2.use Call, IsSuspended do |env2, b3|
               # if vm is suspended resume it then exit
               if env2[:result]
-                b3.use CreateNetworks
                 b3.use ResumeDomain
                 next
               end
 
               if !env[:machine].config.vm.box
                 # With no box, we just care about network creation and starting it
-                b3.use CreateNetworks
                 b3.use SetBootOrder
                 b3.use StartDomain
               else
                 # VM is not running or suspended.
-
                 b3.use Provision
 
-                # Ensure networks are created and active
-                b3.use CreateNetworks
-                b3.use SetBootOrder
-
                 b3.use PrepareNFSValidIds
                 b3.use SyncedFolderCleanup
                 b3.use SyncedFolders
+                b3.use PrepareNFSSettings
+                b3.use ShareFolders
+
+                b3.use SetBootOrder
 
                 # Start it..
                 b3.use StartDomain
@@ -114,8 +159,6 @@ module VagrantPlugins
                 b3.use WaitForCommunicator, [:running]
 
                 b3.use ForwardPorts
-                b3.use PrepareNFSSettings
-                b3.use ShareFolders
               end
             end
           end
@@ -264,7 +307,6 @@ module VagrantPlugins
               end
 
               b3.use Provision
-              # b3.use SyncFolders
             end
           end
         end
@@ -342,61 +384,6 @@ module VagrantPlugins
         end
       end
 
-      action_root = Pathname.new(File.expand_path('../action', __FILE__))
-      autoload :PackageDomain, action_root.join('package_domain')
-      autoload :CreateDomain, action_root.join('create_domain')
-      autoload :CreateDomainVolume, action_root.join('create_domain_volume')
-      autoload :CreateNetworkInterfaces, action_root.join('create_network_interfaces')
-      autoload :CreateNetworks, action_root.join('create_networks')
-      autoload :CleanMachineFolder, action_root.join('clean_machine_folder')
-      autoload :DestroyDomain, action_root.join('destroy_domain')
-      autoload :DestroyNetworks, action_root.join('destroy_networks')
-      autoload :ForwardPorts, action_root.join('forward_ports')
-      autoload :ClearForwardedPorts, action_root.join('forward_ports')
-      autoload :HaltDomain, action_root.join('halt_domain')
-      autoload :StartShutdownTimer, action_root.join('shutdown_domain')
-      autoload :ShutdownDomain, action_root.join('shutdown_domain')
-      autoload :HandleBoxImage, action_root.join('handle_box_image')
-      autoload :HandleStoragePool, action_root.join('handle_storage_pool')
-      autoload :RemoveLibvirtImage, action_root.join('remove_libvirt_image')
-      autoload :IsCreated, action_root.join('is_created')
-      autoload :IsRunning, action_root.join('is_running')
-      autoload :IsSuspended, action_root.join('is_suspended')
-      autoload :MessageAlreadyCreated, action_root.join('message_already_created')
-      autoload :MessageNotCreated, action_root.join('message_not_created')
-      autoload :MessageNotRunning, action_root.join('message_not_running')
-      autoload :MessageNotSuspended, action_root.join('message_not_suspended')
-      autoload :MessageWillNotDestroy, action_root.join('message_will_not_destroy')
-
-      autoload :RemoveStaleVolume, action_root.join('remove_stale_volume')
-
-      autoload :PrepareNFSSettings, action_root.join('prepare_nfs_settings')
-      autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
-      autoload :PruneNFSExports, action_root.join('prune_nfs_exports')
-
-      autoload :ReadMacAddresses, action_root.join('read_mac_addresses')
-      autoload :ResumeDomain, action_root.join('resume_domain')
-      autoload :SetNameOfDomain, action_root.join('set_name_of_domain')
-      autoload :SetBootOrder, action_root.join('set_boot_order')
-
-      # I don't think we need it anymore
-      autoload :ShareFolders, action_root.join('share_folders')
-      autoload :StartDomain, action_root.join('start_domain')
-      autoload :SuspendDomain, action_root.join('suspend_domain')
-      autoload :TimedProvision, action_root.join('timed_provision')
-
-      autoload :WaitTillUp, action_root.join('wait_till_up')
-      autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
-
-      autoload :Package, 'vagrant/action/general/package'
-      autoload :PackageSetupFiles, 'vagrant/action/general/package_setup_files'
-      autoload :PackageSetupFolders, 'vagrant/action/general/package_setup_folders'
-      autoload :SSHRun, 'vagrant/action/builtin/ssh_run'
-      autoload :HandleBox, 'vagrant/action/builtin/handle_box'
-      autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
-      autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
-      autoload :ProvisionerCleanup, 'vagrant/action/builtin/provisioner_cleanup'
-      autoload :WaitForCommunicator, 'vagrant/action/builtin/wait_for_communicator'
     end
   end
 end

data/lib/vagrant-libvirt/config.rb

@@ -4,15 +4,8 @@ require 'cgi'
 
 require 'vagrant'
 
-class Numeric
-  Alphabet = ('a'..'z').to_a
-  def vdev
-    s = String.new
-    q = self
-    (q, r = (q - 1).divmod(26)) && s.prepend(Alphabet[r]) until q.zero?
-    "vd#{s}"
-  end
-end
+require 'vagrant-libvirt/errors'
+require 'vagrant-libvirt/util/resolvers'
 
 module VagrantPlugins
   module ProviderLibvirt
@@ -69,6 +62,7 @@ module VagrantPlugins
       attr_accessor :management_network_pci_slot
       attr_accessor :management_network_domain
       attr_accessor :management_network_mtu
+      attr_accessor :management_network_keep
 
       # System connection information
       attr_accessor :system_uri
@@ -227,6 +221,7 @@ module VagrantPlugins
         @management_network_pci_bus = UNSET_VALUE
         @management_network_domain = UNSET_VALUE
         @management_network_mtu = UNSET_VALUE
+        @management_network_keep = UNSET_VALUE
 
         # System connection information
         @system_uri      = UNSET_VALUE
@@ -346,24 +341,13 @@ module VagrantPlugins
         # Use Qemu agent to get ip address
         @qemu_use_agent  = UNSET_VALUE
 
-        @serials           = []
+        @serials           = UNSET_VALUE
       end
 
       def boot(device)
         @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...
-        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] }]
         # hda - hdc
@@ -516,7 +500,9 @@ module VagrantPlugins
                        target_address: options[:target_address],
                        target_name: options[:target_name],
                        target_port: options[:target_port],
-                       target_type: options[:target_type])
+                       target_type: options[:target_type],
+                       disabled: options[:disabled],
+                      )
       end
 
       def random(options = {})
@@ -715,6 +701,8 @@ module VagrantPlugins
       end
 
       def serial(options={})
+        @serials = [] if @serials == UNSET_VALUE
+
         options = {
           :type => "pty",
           :source => nil,
@@ -840,6 +828,7 @@ module VagrantPlugins
         @management_network_pci_slot = nil if @management_network_pci_slot == UNSET_VALUE
         @management_network_domain = nil if @management_network_domain == UNSET_VALUE
         @management_network_mtu = nil if @management_network_mtu == UNSET_VALUE
+        @management_network_keep = false if @management_network_keep == UNSET_VALUE
 
         # Domain specific settings.
         @title = '' if @title == UNSET_VALUE
@@ -892,7 +881,7 @@ module VagrantPlugins
         @graphics_port = -1 if @graphics_port == UNSET_VALUE
         @graphics_ip = '127.0.0.1' if @graphics_ip == UNSET_VALUE
         @video_type = 'cirrus' if @video_type == UNSET_VALUE
-        @video_vram = 9216 if @video_vram == UNSET_VALUE
+        @video_vram = 16384 if @video_vram == UNSET_VALUE
         @video_accel3d = false if @video_accel3d == UNSET_VALUE
         @graphics_gl = @video_accel3d if @graphics_gl == UNSET_VALUE
         @sound_type = nil if @sound_type == UNSET_VALUE
@@ -914,10 +903,6 @@ 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?
@@ -928,7 +913,18 @@ module VagrantPlugins
         @inputs = [{ type: 'mouse', bus: 'ps2' }] if @inputs == UNSET_VALUE
 
         # Channels
-        @channels = [] if @channels == UNSET_VALUE
+        if @channels == UNSET_VALUE
+          @channels = []
+          if @qemu_use_agent == true
+            if @channels.all? { |channel| !channel.fetch(:target_name, '').start_with?('org.qemu.guest_agent.') }
+              channel(:type => 'unix', :target_name => 'org.qemu.guest_agent.0', :target_type => 'virtio')
+            end
+          end
+        end
+
+        # filter channels of anything explicitly disabled so it's possible to inject an entry to
+        # avoid the automatic addition of the guest_agent above, and disable it from subsequent use.
+        @channels = @channels.reject { |channel| channel[:disabled] }.tap {|channel| channel.delete(:disabled) }
 
         # PCI device passthrough
         @pcis = [] if @pcis == UNSET_VALUE
@@ -971,12 +967,17 @@ module VagrantPlugins
 
         @qemu_use_agent = false if @qemu_use_agent == UNSET_VALUE
 
-        @serials = [{:type => 'pty', :source => nil}] if @serials == []
+        @serials = [{:type => 'pty', :source => nil}] if @serials == UNSET_VALUE
       end
 
       def validate(machine)
         errors = _detected_errors
 
+        # technically this shouldn't occur, but ensure that if somehow it does, it gets rejected.
+        if @cpu_mode == 'host-passthrough' && @cpu_model != ''
+          errors << "cannot set cpu_model with cpu_mode of 'host-passthrough'. leave model unset or switch mode."
+        end
+
         # The @uri and @qemu_use_session should not conflict
         uri = _parse_uri(@uri)
         if (uri.scheme.start_with? "qemu") && (uri.path.include? "session")
@@ -998,7 +999,6 @@ module VagrantPlugins
           end
         end
 
-
         machine.provider_config.disks.each do |disk|
           if disk[:path] && (disk[:path][0] == '/')
             errors << "absolute volume paths like '#{disk[:path]}' not yet supported"
@@ -1011,6 +1011,16 @@ module VagrantPlugins
           end
         end
 
+        # this won't be able to fully resolve the disks until the box has
+        # been downloaded and any devices that need to be assigned to the
+        # disks contained have been allocated
+        disk_resolver = ::VagrantPlugins::ProviderLibvirt::Util::DiskDeviceResolver.new
+        begin
+          disk_resolver.resolve(machine.provider_config.disks)
+        rescue Errors::VagrantLibvirtError => e
+          errors << "#{e}"
+        end
+
         machine.config.vm.networks.each do |_type, opts|
           if opts[:mac]
             if opts[:mac] =~ /\A([0-9a-fA-F]{12})\z/
@@ -1053,9 +1063,11 @@ module VagrantPlugins
           c.merge!(other.qemu_env) if other.qemu_env != UNSET_VALUE
           result.qemu_env = c
 
-          s = serials.dup
-          s += other.serials
-          result.serials = s
+          if serials != UNSET_VALUE
+            s = serials.dup
+            s += other.serials
+            result.serials = s
+          end
         end
       end
 

data/lib/vagrant-libvirt/driver.rb

@@ -135,7 +135,9 @@ module VagrantPlugins
         end
 
         # TODO: terminated no longer appears to be a valid fog state, remove?
-        return :not_created if domain.nil? || domain.state.to_sym == :terminated
+        return :not_created if domain.nil?
+        return :unknown if domain.state.nil?
+        return :not_created if domain.state.to_sym == :terminated
 
         state = domain.state.tr('-', '_').to_sym
         if state == :running

data/lib/vagrant-libvirt/errors.rb

@@ -18,6 +18,14 @@ module VagrantPlugins
         error_key(:package_not_supported)
       end
 
+      class DuplicateDiskDevice < VagrantLibvirtError
+        error_key(:duplicate_disk_device)
+      end
+
+      class NoDiskDeviceAvailable < VagrantLibvirtError
+        error_key(:no_disk_device_available)
+      end
+
       # Storage pools and volumes exceptions
       class NoStoragePool < VagrantLibvirtError
         error_key(:no_storage_pool)