vagrant-libvirt 0.0.42 → 0.2.1

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

@@ -19,7 +19,7 @@ module VagrantPlugins
           begin
             env[:machine].guest.capability(:halt)
           rescue
-            @logger.info('Trying libvirt graceful shutdown.')
+            @logger.info('Trying Libvirt graceful shutdown.')
             domain.shutdown
           end
 

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

@@ -4,6 +4,9 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class HandleBoxImage
+        include VagrantPlugins::ProviderLibvirt::Util::StorageUtil
+
+
         @@lock = Mutex.new
 
         def initialize(app, _env)
@@ -31,11 +34,12 @@ module VagrantPlugins
           config = env[:machine].provider_config
           box_image_file = env[:machine].box.directory.join('box.img').to_s
           env[:box_volume_name] = env[:machine].box.name.to_s.dup.gsub('/', '-VAGRANTSLASH-')
-          env[:box_volume_name] << "_vagrant_box_image_#{begin
-                                                           env[:machine].box.version.to_s
-                                                         rescue
-                                                           ''
-                                                         end}.img"
+          env[:box_volume_name] << "_vagrant_box_image_#{
+          begin
+            env[:machine].box.version.to_s
+          rescue
+            ''
+          end}.img"
 
           # Override box_virtual_size
           if config.machine_virtual_size
@@ -44,7 +48,7 @@ module VagrantPlugins
               # 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
+                  requested: config.machine_virtual_size, minimum: box_virtual_size
               )
             else
               env[:ui].info I18n.t('vagrant_libvirt.manual_resize_required')
@@ -59,9 +63,10 @@ module VagrantPlugins
           # locking all subsequent actions as well.
           @@lock.synchronize do
             # Don't continue if image already exists in storage pool.
-            break if ProviderLibvirt::Util::Collection.find_matching(
-              env[:machine].provider.driver.connection.volumes.all, env[:box_volume_name]
-            )
+            box_volume = env[:machine].provider.driver.connection.volumes.all(
+              name: env[:box_volume_name]
+            ).first
+            break if box_volume && box_volume.id
 
             # Box is not available as a storage pool volume. Create and upload
             # it as a copy of local box image.
@@ -75,13 +80,19 @@ module VagrantPlugins
             message = "Creating volume #{env[:box_volume_name]}"
             message << " in storage pool #{config.storage_pool_name}."
             @logger.info(message)
+
+            @storage_volume_uid = storage_uid env
+            @storage_volume_gid = storage_gid env
+
             begin
               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",
-                format_type:  box_format,
-                pool_name:    config.storage_pool_name
+                name: env[:box_volume_name],
+                allocation: "#{box_image_size / 1024 / 1024}M",
+                capacity: "#{box_virtual_size}G",
+                format_type: box_format,
+                owner: @storage_volume_uid,
+                group: @storage_volume_gid,
+                pool_name: config.storage_pool_name
               )
             rescue Fog::Errors::Error => e
               raise Errors::FogCreateVolumeError,
@@ -115,7 +126,7 @@ module VagrantPlugins
 
         protected
 
-        # Fog libvirt currently doesn't support uploading images to storage
+        # Fog Libvirt currently doesn't support uploading images to storage
         # pool volumes. Use ruby-libvirt client instead.
         def upload_image(image_file, pool_name, volume_name, env)
           image_size = File.size(image_file) # B

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

@@ -5,6 +5,8 @@ module VagrantPlugins
     module Action
       class HandleStoragePool
         include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
+        include VagrantPlugins::ProviderLibvirt::Util::StorageUtil
+
 
         @@lock = Mutex.new
 
@@ -22,9 +24,9 @@ module VagrantPlugins
           # locking all subsequent actions as well.
           @@lock.synchronize do
             # Check for storage pool, where box image should be created
-            break if ProviderLibvirt::Util::Collection.find_matching(
-              env[:machine].provider.driver.connection.pools.all, config.storage_pool_name
-            )
+            break unless env[:machine].provider.driver.connection.pools.all(
+              name: config.storage_pool_name
+            ).empty?
 
             @logger.info("No storage pool '#{config.storage_pool_name}' is available.")
 
@@ -34,9 +36,12 @@ module VagrantPlugins
 
             @logger.info("Creating storage pool 'default'")
 
-            # Fog libvirt currently doesn't support creating pools. Use
+            # Fog Libvirt currently doesn't support creating pools. Use
             # ruby-libvirt client directly.
             begin
+              @storage_pool_path = storage_pool_path(env)
+              @storage_pool_uid = storage_uid(env)
+              @storage_pool_gid = storage_gid(env)
               libvirt_pool = env[:machine].provider.driver.connection.client.define_storage_pool_xml(
                 to_xml('default_storage_pool')
               )

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

@@ -1,9 +1,10 @@
+require 'fileutils'
 require 'log4r'
 
 module VagrantPlugins
   module ProviderLibvirt
     module Action
-      # Action for create new box for libvirt provider
+      # Action for create new box for Libvirt provider
       class PackageDomain
         def initialize(app, env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::package_domain')
@@ -21,24 +22,31 @@ module VagrantPlugins
           root_disk = domain.volumes.select do |x|
             x.name == libvirt_domain.name + '.img'
           end.first
+          raise Errors::NoDomainVolume if root_disk.nil?
           boxname = env['package.output']
           raise "#{boxname}: Already exists" if File.exist?(boxname)
           @tmp_dir = Dir.pwd + '/_tmp_package'
           @tmp_img = @tmp_dir + '/box.img'
-          Dir.mkdir(@tmp_dir)
-          if File.readable?(root_disk.path)
-            backing = `qemu-img info "#{root_disk.path}" | grep 'backing file:' | cut -d ':' -f2`.chomp
-          else
-            env[:ui].error("Require set read access to #{root_disk.path}. sudo chmod a+r #{root_disk.path}")
-            FileUtils.rm_rf(@tmp_dir)
-            raise 'Have no access'
+          FileUtils.mkdir_p(@tmp_dir)
+          env[:ui].info("Downloading #{root_disk.name} to #{@tmp_img}")
+          ret = download_image(@tmp_img, env[:machine].provider_config.storage_pool_name,
+                               root_disk.name, env) do |progress,image_size|
+            env[:ui].clear_line
+            env[:ui].report_progress(progress, image_size, false)
+          end
+          # Clear the line one last time since the progress meter doesn't
+          # disappear immediately.
+          env[:ui].clear_line
+          backing = `qemu-img info "#{@tmp_img}" | grep 'backing file:' | cut -d ':' -f2`.chomp
+          if backing
+            env[:ui].info('Image has backing image, copying image and rebasing ...')
+            `qemu-img rebase -p -b "" #{@tmp_img}`
           end
-          env[:ui].info('Image has backing image, copying image and rebasing ...')
-          FileUtils.cp(root_disk.path, @tmp_img)
-          `qemu-img rebase -p -b "" #{@tmp_img}`
           # remove hw association with interface
           # working for centos with lvs default disks
-          `virt-sysprep --no-logfile --operations defaults,-ssh-userdir -a #{@tmp_img}`
+          options = ENV.fetch('VAGRANT_LIBVIRT_VIRT_SYSPREP_OPTIONS', '')
+          operations = ENV.fetch('VAGRANT_LIBVIRT_VIRT_SYSPREP_OPERATIONS', 'defaults,-ssh-userdir')
+          `virt-sysprep --no-logfile --operations #{operations} -a #{@tmp_img} #{options}`
           # add any user provided file
           extra = ''
           @tmp_include = @tmp_dir + '/_include'
@@ -99,6 +107,44 @@ module VagrantPlugins
             }
           EOF
         end
+
+        protected
+
+        # Fog libvirt currently doesn't support downloading images from storage
+        # pool volumes. Use ruby-libvirt client instead.
+        def download_image(image_file, pool_name, volume_name, env)
+          begin
+            pool = env[:machine].provider.driver.connection.client.lookup_storage_pool_by_name(
+              pool_name
+            )
+            volume = pool.lookup_volume_by_name(volume_name)
+            image_size = volume.info.allocation # B
+
+            stream = env[:machine].provider.driver.connection.client.stream
+
+            # Use length of 0 to download remaining contents after offset
+            volume.download(stream, offset = 0, length = 0)
+
+            buf_size = 1024 * 250 # 250K, copied from upload_image in handle_box_image.rb
+            progress = 0
+            retval = stream.recv(buf_size)
+            open(image_file, 'wb') do |io|
+              while (retval.at(0) > 0)
+                recvd = io.write(retval.at(1))
+                progress += recvd
+                yield [progress, image_size]
+                retval = stream.recv(buf_size)
+              end
+            end
+          rescue => e
+            raise Errors::ImageDownloadError,
+                  volume_name: volume_name,
+                  pool_name: pool_name,
+                  error_message: e.message
+          end
+
+          progress == image_size
+        end
       end
     end
   end

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

@@ -1,12 +1,13 @@
 require 'nokogiri'
 require 'socket'
 require 'timeout'
+require 'vagrant-libvirt/util/nfs'
 
 module VagrantPlugins
   module ProviderLibvirt
     module Action
       class PrepareNFSSettings
-        include Vagrant::Action::Builtin::MixinSyncedFolders
+        include VagrantPlugins::ProviderLibvirt::Util::Nfs
 
         def initialize(app, _env)
           @app = app
@@ -28,13 +29,6 @@ module VagrantPlugins
           end
         end
 
-        # We're using NFS if we have any synced folder with NFS configured. If
-        # we are not using NFS we don't need to do the extra work to
-        # populate these fields in the environment.
-        def using_nfs?
-          !!synced_folders(@machine)[:nfs]
-        end
-
         # Returns the IP address of the host
         #
         # @param [Machine] machine
@@ -79,7 +73,7 @@ module VagrantPlugins
         # Check if we can open a connection to the host
         def ping(host, timeout = 3)
           ::Timeout.timeout(timeout) do
-            s = TCPSocket.new(host, 'echo')
+            s = TCPSocket.new(host, 'ssh')
             s.close
           end
           true

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

@@ -1,22 +1,32 @@
+require 'vagrant-libvirt/util/nfs'
 require 'yaml'
+
 module VagrantPlugins
   module ProviderLibvirt
     module Action
       class PruneNFSExports
+        include VagrantPlugins::ProviderLibvirt::Util::Nfs
+
         def initialize(app, _env)
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::prune_nfs_exports')
           @app = app
         end
 
         def call(env)
-          if env[:host]
-            uuid = env[:machine].id
-            # get all uuids
-            uuids = env[:machine].provider.driver.connection.servers.all.map(&:id)
-            # not exiisted in array will removed from nfs
-            uuids.delete(uuid)
-            env[:host].capability(
-              :nfs_prune, env[:machine].ui, uuids
-            )
+          @machine = env[:machine]
+
+          if using_nfs?
+            @logger.info('Using NFS, prunning NFS settings from host')
+            if env[:host]
+              uuid = env[:machine].id
+              # get all uuids
+              uuids = env[:machine].provider.driver.connection.servers.all.map(&:id)
+              # not exiisted in array will removed from nfs
+              uuids.delete(uuid)
+              env[:host].capability(
+                :nfs_prune, env[:machine].ui, uuids
+              )
+            end
           end
 
           @app.call(env)

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

@@ -10,8 +10,8 @@ module VagrantPlugins
         end
 
         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 manually(virsh, virt-manager or by any other tool)')
+          env[:ui].info('Vagrant-libvirt plugin removed box only from your LOCAL ~/.vagrant/boxes directory')
+          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

@@ -16,13 +16,19 @@ module VagrantPlugins
 
         def call(env)
           # Remove stale server volume
-          env[:ui].info(I18n.t('vagrant_libvirt.remove_stale_volume'))
-
           config = env[:machine].provider_config
           # Check for storage pool, where box image should be created
-          fog_pool = ProviderLibvirt::Util::Collection.find_matching(
-            env[:machine].provider.driver.connection.pools.all, config.storage_pool_name
-          )
+          fog_pool = env[:machine].provider.driver.connection.pools.all(
+            name: config.storage_pool_name
+          ).first
+
+          env[:result] = nil
+
+          if not fog_pool
+            @logger.debug("**** Pool #{config.storage_pool_name} not found")
+            return @app.call(env)
+          end
+
           @logger.debug("**** Pool #{fog_pool.name}")
 
           # This is name of newly created image for vm.
@@ -30,17 +36,17 @@ module VagrantPlugins
           @logger.debug("**** Volume name #{name}")
 
           # remove root storage
-          box_volume = ProviderLibvirt::Util::Collection.find_matching(
-            env[:machine].provider.driver.connection.volumes.all, name
-          )
-          if box_volume && box_volume.pool_name == fog_pool.name
+          box_volume = env[:machine].provider.driver.connection.volumes.all(
+            name: name
+          ).find { |x| x.pool_name == fog_pool.name }
+          if box_volume && box_volume.id
+            env[:ui].info(I18n.t('vagrant_libvirt.remove_stale_volume'))
             @logger.info("Deleting volume #{box_volume.key}")
             box_volume.destroy
             env[:result] = box_volume
           else
-            env[:result] = nil
+            @logger.debug("**** Volume #{name} not found in pool #{fog_pool.name}")
           end
-
           # Continue the middleware chain.
           @app.call(env)
         end

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

@@ -33,7 +33,7 @@ module VagrantPlugins
           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">
+            # 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
@@ -66,7 +66,7 @@ module VagrantPlugins
               logger_msg(node, index)
             end
 
-            # Finally redefine the domain XML through libvirt
+            # Finally redefine the domain XML through Libvirt
             # to apply the boot ordering
             env[:machine].provider
                          .driver

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

@@ -13,20 +13,17 @@ module VagrantPlugins
           env[:domain_name] = build_domain_name(env)
 
           begin
-            @logger.info("Looking for domain #{env[:domain_name]} through list " \
-                         "#{env[:machine].provider.driver.connection.servers.all}")
+            @logger.info("Looking for domain #{env[:domain_name]}")
             # Check if the domain name is not already taken
 
-            domain = ProviderLibvirt::Util::Collection.find_matching(
-              env[:machine].provider.driver.connection.servers.all, env[:domain_name]
+            domain = env[:machine].provider.driver.connection.servers.all(
+              name: env[:domain_name]
             )
-          rescue Fog::Errors::Error => e
+          rescue Libvirt::RetrieveError => e
             @logger.info(e.to_s)
             domain = nil
           end
 
-          @logger.info("Looking for domain #{env[:domain_name]}")
-
           unless domain.nil?
             raise ProviderLibvirt::Errors::DomainNameExists,
                   domain_name: env[:domain_name]
@@ -41,7 +38,7 @@ module VagrantPlugins
         # parsable and sortable by epoch time
         # @example
         #   development-centos-6-chef-11_1404488971_3b7a569e2fd7c554b852
-        # @return [String] libvirt domain name
+        # @return [String] Libvirt domain name
         def build_domain_name(env)
           config = env[:machine].provider_config
           domain_name =
@@ -51,7 +48,7 @@ module VagrantPlugins
               # don't have any prefix, not even "_"
               ''
             else
-              config.default_prefix.to_s.dup.concat('_')
+              config.default_prefix.to_s.dup
             end
           domain_name << env[:machine].name.to_s
           domain_name.gsub!(/[^-a-z0-9_\.]/i, '')

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

@@ -23,7 +23,7 @@ module VagrantPlugins
 
             libvirt_domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(env[:machine].id)
 
-            # libvirt API doesn't support modifying memory on NUMA enabled CPUs
+            # Libvirt API doesn't support modifying memory on NUMA enabled CPUs
             # http://libvirt.org/git/?p=libvirt.git;a=commit;h=d174394105cf00ed266bf729ddf461c21637c736
             if config.numa_nodes == nil
               if config.memory.to_i * 1024 != libvirt_domain.max_memory
@@ -68,7 +68,7 @@ module VagrantPlugins
               end
 
               # vCpu count
-              if config.cpus.to_i != libvirt_domain.vcpus.length
+              if config.cpus.to_i != libvirt_domain.num_vcpus(0)
                 descr_changed = true
                 REXML::XPath.first(xml_descr, '/domain/vcpu').text = config.cpus
               end

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

@@ -28,25 +28,42 @@ module VagrantPlugins
           end
 
           # Wait for domain to obtain an ip address. Ip address is searched
-          # from arp table, either localy or remotely via ssh, if libvirt
+          # from arp table, either locally or remotely via ssh, if Libvirt
           # connection was done via ssh.
           env[:ip_address] = nil
-          env[:metrics]['instance_ip_time'] = Util::Timer.time do
-            @logger.debug("Searching for IP for MAC address: #{domain.mac}")
-            env[:ui].info(I18n.t('vagrant_libvirt.waiting_for_ip'))
-            retryable(on: Fog::Errors::TimeoutError, tries: 300) do
-              # If we're interrupted don't worry about waiting
-              return terminate(env) if env[:interrupted]
+          @logger.debug("Searching for IP for MAC address: #{domain.mac}")
+          env[:ui].info(I18n.t('vagrant_libvirt.waiting_for_ip'))
+
+          if env[:machine].provider_config.qemu_use_session
+            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
+                domain.wait_for(2) do
+                  env[:ip_address] = env[:machine].provider.driver.get_ipaddress_system(domain.mac)
+                  !env[:ip_address].nil?
+                end
+              end
+            end
+          else
+            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
-              domain.wait_for(2) do
-                addresses.each_pair do |_type, ip|
-                  env[:ip_address] = ip[0] unless ip[0].nil?
+                # Wait for domain to obtain an ip address
+                domain.wait_for(2) do
+                  addresses.each_pair do |_type, ip|
+                    env[:ip_address] = ip[0] unless ip[0].nil?
+                  end
+                  !env[:ip_address].nil?
                 end
-                !env[:ip_address].nil?
               end
             end
           end
+
           @logger.info("Got IP address #{env[:ip_address]}")
           @logger.info("Time for getting IP: #{env[:metrics]['instance_ip_time']}")
 
@@ -67,8 +84,8 @@ module VagrantPlugins
               end
             end
           end
-          # if interrupted above, just terminate immediately
-          return terminate(env) if env[:interrupted]
+          # just return if interrupted and let the warden call recover
+          return if env[:interrupted]
           @logger.info("Time for SSH ready: #{env[:metrics]['instance_ssh_time']}")
 
           # Booted and ready for use.
@@ -78,8 +95,6 @@ module VagrantPlugins
         end
 
         def recover(env)
-          return if env['vagrant.error'].is_a?(Vagrant::Errors::VagrantError)
-
           # Undo the import
           terminate(env)
         end