vagrant-libvirt 0.0.30 → 0.0.31

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

@@ -17,7 +17,7 @@ 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[:libvirt_compute].client.lookup_domain_by_uuid(
+          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}'")
@@ -28,7 +28,7 @@ module VagrantPlugins
             end
           end
 
-          domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
+          domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
 
           if env[:machine].provider_config.disks.empty?
             # if using default configuration of disks
@@ -37,10 +37,10 @@ module VagrantPlugins
             domain.destroy(destroy_volumes: false)
 
             env[:machine].provider_config.disks.each do |disk|
-              # shared disks remove only manualy or ???
+              # shared disks remove only manually or ???
               next if disk[:allow_existing]
               diskname = libvirt_domain.name + '-' + disk[:device] + '.' + disk[:type].to_s
-              # diskname is uniq
+              # diskname is unique
               libvirt_disk = domain.volumes.select do |x|
                 x.name == diskname
               end.first

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

@@ -36,7 +36,7 @@ module VagrantPlugins
             # lookup_network_by_uuid throws same exception
             # if there is an error or if the network just doesn't exist
             begin
-              libvirt_network = env[:libvirt_compute].client.lookup_network_by_uuid(
+              libvirt_network = env[:machine].provider.driver.connection.client.lookup_network_by_uuid(
                 network_uuid)
             rescue Libvirt::RetrieveError => e
               # this network is already destroyed, so move on
@@ -66,7 +66,7 @@ module VagrantPlugins
               libvirt_network.undefine
               @logger.info "Undefined it"
             rescue => e
-              raise Error::DestroyNetworkError,
+              raise Errors::DestroyNetworkError,
                 network_name: libvirt_network.name,
                 error_message: e.message
             end

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

@@ -13,7 +13,7 @@ module VagrantPlugins
         def call(env)
           env[:ui].info(I18n.t("vagrant_libvirt.halt_domain"))
 
-          domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
+          domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
           raise Errors::NoDomainError if domain == nil
 
           @logger.info("Trying gracefull shutdown.")

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

@@ -37,10 +37,30 @@ module VagrantPlugins
           env[:box_volume_name] = env[:machine].box.name.to_s.dup.gsub("/", "-VAGRANTSLASH-")
           env[:box_volume_name] << "_vagrant_box_image_#{env[:machine].box.version.to_s rescue ''}.img"
 
+          # Override box_virtual_size
+          if config.machine_virtual_size
+            if config.machine_virtual_size < box_virtual_size
+              # Warn that a virtual size less than the box metadata size
+              # is not supported and will be ignored
+              env[:ui].warn I18n.t(
+                'vagrant_libvirt.warnings.ignoring_virtual_size_too_small',
+                requested: config.machine_virtual_size, minimum: box_virtual_size
+              )
+            else
+              env[:ui].info I18n.t('vagrant_libvirt.manual_resize_required')
+              box_virtual_size = config.machine_virtual_size
+            end
+          end
+          # save for use by later actions
+          env[:box_virtual_size] = box_virtual_size
+
+          # while inside the synchronize block take care not to call the next
+          # action in the chain, as must exit this block first to prevent
+          # locking all subsequent actions as well.
           @@lock.synchronize do
             # Don't continue if image already exists in storage pool.
-            return @app.call(env) if ProviderLibvirt::Util::Collection.find_matching(
-              env[:libvirt_compute].volumes.all, env[:box_volume_name])
+            break if ProviderLibvirt::Util::Collection.find_matching(
+              env[:machine].provider.driver.connection.volumes.all, env[:box_volume_name])
 
             # Box is not available as a storage pool volume. Create and upload
             # it as a copy of local box image.
@@ -53,7 +73,7 @@ module VagrantPlugins
             message << " in storage pool #{config.storage_pool_name}."
             @logger.info(message)
             begin
-              fog_volume = env[:libvirt_compute].volumes.create(
+              fog_volume = env[:machine].provider.driver.connection.volumes.create(
                 name:         env[:box_volume_name],
                 allocation:   "#{box_image_size/1024/1024}M",
                 capacity:     "#{box_virtual_size}G",
@@ -97,10 +117,10 @@ module VagrantPlugins
           image_size = File.size(image_file) # B
 
           begin
-            pool = env[:libvirt_compute].client.lookup_storage_pool_by_name(
+            pool = env[:machine].provider.driver.connection.client.lookup_storage_pool_by_name(
               pool_name)
             volume = pool.lookup_volume_by_name(volume_name)
-            stream = env[:libvirt_compute].client.stream
+            stream = env[:machine].provider.driver.connection.client.stream
             volume.upload(stream, offset=0, length=image_size)
 
             # Exception ProviderLibvirt::RetrieveError can be raised if buffer is

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

@@ -14,14 +14,16 @@ module VagrantPlugins
         end
 
         def call(env)
-          @@lock.synchronize do
-            # Get config options.
-            config = env[:machine].provider_config
+          # Get config options.
+          config = env[:machine].provider_config
 
+          # while inside the synchronize block take care not to call the next
+          # action in the chain, as must exit this block first to prevent
+          # locking all subsequent actions as well.
+          @@lock.synchronize do
             # Check for storage pool, where box image should be created
-            fog_pool = ProviderLibvirt::Util::Collection.find_matching(
-              env[:libvirt_compute].pools.all, config.storage_pool_name)
-            return @app.call(env) if fog_pool
+            break if ProviderLibvirt::Util::Collection.find_matching(
+              env[:machine].provider.driver.connection.pools.all, config.storage_pool_name)
 
             @logger.info("No storage pool '#{config.storage_pool_name}' is available.")
 
@@ -34,7 +36,7 @@ module VagrantPlugins
             # Fog libvirt currently doesn't support creating pools. Use
             # ruby-libvirt client directly.
             begin
-              libvirt_pool = env[:libvirt_compute].client.define_storage_pool_xml(
+              libvirt_pool = env[:machine].provider.driver.connection.client.define_storage_pool_xml(
                 to_xml('default_storage_pool'))
               libvirt_pool.build
               libvirt_pool.create

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

@@ -9,7 +9,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
+          domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
           raise Errors::NoDomainError if domain == nil
           env[:result] = domain.state.to_s == 'running'
 

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

@@ -9,7 +9,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
+          domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
           raise Errors::NoDomainError if domain == nil
           env[:result] = domain.state.to_s == 'paused'
 

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

@@ -14,9 +14,9 @@ module VagrantPlugins
 
         def call(env)
           env[:ui].info(I18n.t('vagrant_libvirt.package_domain'))
-          libvirt_domain =  env[:libvirt_compute].client.lookup_domain_by_uuid(
+          libvirt_domain =  env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(
                               env[:machine].id)
-          domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
+          domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
           root_disk = domain.volumes.select do |x|
             x.name == libvirt_domain.name + '.img'
           end.first
@@ -37,7 +37,7 @@ module VagrantPlugins
           `qemu-img rebase -p -b "" #{@tmp_img}`
           # remove hw association with interface
           # working for centos with lvs default disks
-          `virt-sysprep --no-logfile  -a #{@tmp_img} `
+          `virt-sysprep --no-logfile --operations defaults,-ssh-userdir -a #{@tmp_img} `
           Dir.chdir(@tmp_dir)
           img_size = `qemu-img info #{@tmp_img} | grep 'virtual size' | awk '{print $3;}' | tr -d 'G'`.chomp
           File.write(@tmp_dir + '/metadata.json', metadata_content(img_size))

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

@@ -39,13 +39,16 @@ module VagrantPlugins
         #
         # @param [Machine] machine
         # @return [String]
-        def read_host_ip(ip)
-          UDPSocket.open do |s|
+	def read_host_ip(ip)
+      UDPSocket.open do |s|
+        if(ip.kind_of?(Array))
+            s.connect(ip.last, 1)
+        else
             s.connect(ip, 1)
-            s.addr.last
-          end
         end
-
+        s.addr.last
+      end
+    end
         # Returns the IP address of the guest
         #
         # @param [Machine] machine

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

@@ -8,7 +8,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:nfs_valid_ids] = env[:libvirt_compute].servers.all.map(&:id)
+          env[:nfs_valid_ids] = env[:machine].provider.driver.connection.servers.all.map(&:id)
           @app.call(env)
         end
       end

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

@@ -12,7 +12,7 @@ module VagrantPlugins
           if env[:host]
             uuid = env[:machine].id
             # get all uuids
-            uuids = env[:libvirt_compute].servers.all.map(&:id)
+            uuids = env[:machine].provider.driver.connection.servers.all.map(&:id)
             # not exiisted in array will removed from nfs
             uuids.delete(uuid)
             env[:host].capability(

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

@@ -10,7 +10,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:machine_mac_addresses] = read_mac_addresses(env[:libvirt_compute], env[:machine])
+          env[:machine_mac_addresses] = read_mac_addresses(env[:machine].provider.driver.connection, env[:machine])
         end
 
         def read_mac_addresses(libvirt, machine)

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

@@ -11,7 +11,7 @@ module VagrantPlugins
 
         def call(env)
           env[:ui].info("Vagrant-libvirt plugin removed box only from you LOCAL ~/.vagrant/boxes directory")
-          env[:ui].info("From libvirt storage pool you have to delete image manualy(virsh, virt-manager or by any other tool)")
+          env[:ui].info("From libvirt storage pool you have to delete image manually(virsh, virt-manager or by any other tool)")
           @app.call(env)
         end
       end

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

@@ -22,7 +22,7 @@ module VagrantPlugins
           config = env[:machine].provider_config
           # Check for storage pool, where box image should be created
           fog_pool = ProviderLibvirt::Util::Collection.find_matching(
-            env[:libvirt_compute].pools.all, config.storage_pool_name)
+            env[:machine].provider.driver.connection.pools.all, config.storage_pool_name)
           @logger.debug("**** Pool #{fog_pool.name}")
 
           # This is name of newly created image for vm.
@@ -31,7 +31,7 @@ module VagrantPlugins
 
           # remove root storage
           box_volume = ProviderLibvirt::Util::Collection.find_matching(
-            env[:libvirt_compute].volumes.all, name)
+            env[:machine].provider.driver.connection.volumes.all, name)
           if box_volume && box_volume.pool_name == fog_pool.name
             @logger.info("Deleting volume #{box_volume.key}")
             box_volume.destroy

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

@@ -13,7 +13,7 @@ module VagrantPlugins
         def call(env)
           env[:ui].info(I18n.t("vagrant_libvirt.resuming_domain"))
 
-          domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
+          domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
           raise Errors::NoDomainError if domain == nil
 
           domain.resume

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

@@ -0,0 +1,66 @@
+require "log4r"
+require 'nokogiri'
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Action
+      class SetBootOrder
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_libvirt::action::set_boot_order")
+          config = env[:machine].provider_config
+          @boot_order = config.boot_order
+        end
+
+        def call(env)
+         # Get domain first
+          begin
+            domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(
+              env[:machine].id.to_s)
+          rescue => e
+            raise Errors::NoDomainError,
+              :error_message => e.message
+          end
+
+          # Only execute specific boot ordering if this is defined in the Vagrant file
+          if @boot_order.count >= 1
+          
+            # If a domain is initially defined with no box or disk or with an explicit boot order, libvirt adds <boot dev="foo">
+            # This conflicts with an explicit boot_order configuration, so we need to remove it from the domain xml and feed it back.
+            # Also see https://bugzilla.redhat.com/show_bug.cgi?id=1248514 as to why we have to do this after all devices have been defined.
+            xml = Nokogiri::XML(domain.xml_desc)
+            xml.search("/domain/os/boot").each do |node|
+              node.remove
+            end
+
+            # Parse the XML and find each defined drive and network interfacee
+            hd = xml.search("/domain/devices/disk[@device='disk']")
+            cdrom = xml.search("/domain/devices/disk[@device='cdrom']")
+            network = xml.search("/domain/devices/interface[@type='network']")
+
+            # Generate an array per device group and a flattened array from all of those
+            devices = {"hd" => hd, "cdrom" => cdrom, "network" => network}
+            final_boot_order = @boot_order.flat_map {|category| devices[category] }
+
+            # Loop over the entire defined boot order array and create boot order entries in the domain XML
+            final_boot_order.each_with_index do |node, index|
+              boot = "<boot order='#{index+1}'/>"
+              node.add_child(boot)
+              if node.name == 'disk'
+                @logger.debug "Setting #{node['device']} to boot index #{index+1}"
+              elsif node.name == 'interface'
+                @logger.debug "Setting #{node.name} to boot index #{index+1}"
+              end
+            end
+
+            # Finally redefine the domain XML through libvirt to apply the boot ordering
+            env[:machine].provider.driver.connection.client.define_domain_xml(xml.to_s)
+          end
+
+          @app.call(env)
+
+        end
+      end
+    end
+  end
+end

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

@@ -14,11 +14,12 @@ module VagrantPlugins
           env[:domain_name] = build_domain_name(env)
 
           begin
-            @logger.info("Looking for domain #{env[:domain_name]} through list #{env[:libvirt_compute].servers.all}")
+            @logger.info("Looking for domain #{env[:domain_name]} through list " +
+                         "#{env[:machine].provider.driver.connection.servers.all}")
             # Check if the domain name is not already taken
 
             domain = ProviderLibvirt::Util::Collection.find_matching(
-              env[:libvirt_compute].servers.all, env[:domain_name])
+              env[:machine].provider.driver.connection.servers.all, env[:domain_name])
           rescue Fog::Errors::Error => e
             @logger.info("#{e}")
             domain = nil

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

@@ -14,7 +14,7 @@ module VagrantPlugins
         def call(env)
           env[:ui].info(I18n.t("vagrant_libvirt.starting_domain"))
 
-          domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
+          domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
           raise Errors::NoDomainError if domain == nil
 
           begin

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

@@ -14,7 +14,7 @@ module VagrantPlugins
         def call(env)
           env[:ui].info(I18n.t("vagrant_libvirt.suspending_domain"))
 
-          domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
+          domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
           raise Errors::NoDomainError if domain == nil
 
           domain.suspend

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

@@ -21,7 +21,7 @@ module VagrantPlugins
           env[:metrics] ||= {}
 
           # Get domain object
-          domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
+          domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
           raise NoDomainError if domain == nil
 
           # Wait for domain to obtain an ip address. Ip address is searched

data/lib/vagrant-libvirt/cap/mount_p9.rb

@@ -1,3 +1,4 @@
+require "digest/md5"
 require "vagrant/util/retryable"
 
 module VagrantPlugins
@@ -16,7 +17,7 @@ module VagrantPlugins
             machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
 
             # Mount
-            mount_tag = name.dup
+            mount_tag = Digest::MD5.new.update(opts[:hostpath]).to_s[0,31]
 
             mount_opts="-o trans=virtio"
             mount_opts += ",access=#{opts[:owner]}" if opts[:owner]

data/lib/vagrant-libvirt/cap/synced_folder.rb

@@ -1,6 +1,7 @@
 require 'log4r'
 require 'ostruct'
 require 'nokogiri'
+require "digest/md5"
 
 require 'vagrant/util/subprocess'
 require 'vagrant/errors'
@@ -24,13 +25,13 @@ module VagrantPlugins
 
         # <filesystem/> support in device attach/detach introduced in 1.2.2
         # version number format is major * 1,000,000 + minor * 1,000 + release
-        libvirt_version = ProviderLibvirt.libvirt_connection.client.libversion
+        libvirt_version = machine.provider.driver.connection.client.libversion
         libvirt_version >= 1_002_002
       end
 
       def prepare(machine, folders, _opts)
-        raise Vagrant::Errors::Error('No libvirt connection') if ProviderLibvirt.libvirt_connection.nil?
-        @conn = ProviderLibvirt.libvirt_connection.client
+        raise Vagrant::Errors::Error('No libvirt connection') if machine.provider.driver.connection.nil?
+        @conn = machine.provider.driver.connection.client
 
         begin
           # loop through folders
@@ -38,7 +39,12 @@ module VagrantPlugins
             folder_opts.merge!({  target: id,
                                   accessmode: 'passthrough',
                                   readonly: nil }) { |_k, ov, _nv| ov }
+
+            mount_tag = Digest::MD5.new.update(folder_opts[:hostpath]).to_s[0,31]
+            folder_opts[:mount_tag] = mount_tag
+            
             machine.ui.info "================\nMachine id: #{machine.id}\nShould be mounting folders\n #{id}, opts: #{folder_opts}"
+            
             xml =  to_xml('filesystem', folder_opts)
             # puts "<<<<< XML:\n #{xml}\n >>>>>"
             @conn.lookup_domain_by_uuid(machine.id).attach_device(xml, 0)
@@ -67,10 +73,10 @@ module VagrantPlugins
       end
 
       def cleanup(machine, _opts)
-        if ProviderLibvirt.libvirt_connection.nil?
+        if machine.provider.driver.connection.nil?
           raise Vagrant::Errors::Error('No libvirt connection')
         end
-        @conn = ProviderLibvirt.libvirt_connection.client
+        @conn = machine.provider.driver.connection.client
         begin
           if machine.id && machine.id != ''
             dom = @conn.lookup_domain_by_uuid(machine.id)