vagrant-libvirt 0.0.36 → 0.0.37

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

@@ -4,38 +4,38 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class HandleBoxImage
-
         @@lock = Mutex.new
 
-        def initialize(app, env)
+        def initialize(app, _env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::handle_box_image')
           @app = app
         end
 
         def call(env)
-
           # Verify box metadata for mandatory values.
           #
           # Virtual size has to be set for allocating space in storage pool.
           box_virtual_size = env[:machine].box.metadata['virtual_size']
-          if box_virtual_size == nil
-            raise Errors::NoBoxVirtualSizeSet
-          end
+          raise Errors::NoBoxVirtualSizeSet if box_virtual_size.nil?
 
           # Support qcow2 format only for now, but other formats with backing
           # store capability should be usable.
           box_format = env[:machine].box.metadata['format']
-          if box_format == nil
+          if box_format.nil?
             raise Errors::NoBoxFormatSet
           elsif box_format != 'qcow2'
             raise Errors::WrongBoxFormatSet
           end
 
           # Get config options
-          config   = env[:machine].provider_config
+          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_#{env[:machine].box.version.to_s rescue ''}.img"
+          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"
 
           # Override box_virtual_size
           if config.machine_virtual_size
@@ -60,15 +60,16 @@ module VagrantPlugins
           @@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])
+              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.
             env[:ui].info(I18n.t('vagrant_libvirt.uploading_volume'))
 
             # Create new volume in storage pool
-            unless File.exists?(box_image_file)
-              raise Vagrant::Errors::BoxNotFound.new(name: env[:machine].box.name)
+            unless File.exist?(box_image_file)
+              raise Vagrant::Errors::BoxNotFound, name: env[:machine].box.name
             end
             box_image_size = File.size(box_image_file) # B
             message = "Creating volume #{env[:box_volume_name]}"
@@ -77,20 +78,21 @@ module VagrantPlugins
             begin
               fog_volume = env[:machine].provider.driver.connection.volumes.create(
                 name:         env[:box_volume_name],
-                allocation:   "#{box_image_size/1024/1024}M",
+                allocation:   "#{box_image_size / 1024 / 1024}M",
                 capacity:     "#{box_virtual_size}G",
                 format_type:  box_format,
-                pool_name:    config.storage_pool_name)
+                pool_name:    config.storage_pool_name
+              )
             rescue Fog::Errors::Error => e
               raise Errors::FogCreateVolumeError,
-                :error_message => e.message
+                    error_message: e.message
             end
 
             # Upload box image to storage pool
             ret = upload_image(box_image_file, config.storage_pool_name,
-              env[:box_volume_name], env) do |progress|
-                env[:ui].clear_line
-                env[:ui].report_progress(progress, box_image_size, false)
+                               env[:box_volume_name], env) do |progress|
+              env[:ui].clear_line
+              env[:ui].report_progress(progress, box_image_size, false)
             end
 
             # Clear the line one last time since the progress meter doesn't
@@ -120,10 +122,11 @@ module VagrantPlugins
 
           begin
             pool = env[:machine].provider.driver.connection.client.lookup_storage_pool_by_name(
-              pool_name)
+              pool_name
+            )
             volume = pool.lookup_volume_by_name(volume_name)
             stream = env[:machine].provider.driver.connection.client.stream
-            volume.upload(stream, offset=0, length=image_size)
+            volume.upload(stream, offset = 0, length = image_size)
 
             # Exception ProviderLibvirt::RetrieveError can be raised if buffer is
             # longer than length accepted by API send function.
@@ -131,10 +134,10 @@ module VagrantPlugins
             # TODO: How to find out if buffer is too large and what is the
             # length that send function will accept?
 
-            buf_size = 1024*250 # 250K
+            buf_size = 1024 * 250 # 250K
             progress = 0
             open(image_file, 'rb') do |io|
-              while (buff = io.read(buf_size)) do
+              while (buff = io.read(buf_size))
                 sent = stream.send buff
                 progress += sent
                 yield progress
@@ -142,14 +145,12 @@ module VagrantPlugins
             end
           rescue => e
             raise Errors::ImageUploadError,
-              :error_message => e.message
+                  error_message: e.message
           end
 
-          return progress == image_size
+          progress == image_size
         end
-
       end
     end
   end
 end
-

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

@@ -8,8 +8,8 @@ module VagrantPlugins
 
         @@lock = Mutex.new
 
-        def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::handle_storage_pool")
+        def initialize(app, _env)
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::handle_storage_pool')
           @app = app
         end
 
@@ -23,7 +23,8 @@ module VagrantPlugins
           @@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)
+              env[:machine].provider.driver.connection.pools.all, config.storage_pool_name
+            )
 
             @logger.info("No storage pool '#{config.storage_pool_name}' is available.")
 
@@ -37,21 +38,20 @@ module VagrantPlugins
             # ruby-libvirt client directly.
             begin
               libvirt_pool = env[:machine].provider.driver.connection.client.define_storage_pool_xml(
-                to_xml('default_storage_pool'))
+                to_xml('default_storage_pool')
+              )
               libvirt_pool.build
               libvirt_pool.create
             rescue => e
               raise Errors::CreatingStoragePoolError,
-                :error_message => e.message
+                    error_message: e.message
             end
-            raise Errors::NoStoragePool if !libvirt_pool
+            raise Errors::NoStoragePool unless libvirt_pool
           end
 
           @app.call(env)
         end
-
       end
     end
   end
 end
-

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

@@ -4,7 +4,7 @@ module VagrantPlugins
       # This can be used with "Call" built-in to check if the machine
       # is created and branch in the middleware.
       class IsCreated
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 

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

@@ -4,13 +4,13 @@ module VagrantPlugins
       # This can be used with "Call" built-in to check if the machine
       # is running and branch in the middleware.
       class IsRunning
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
         def call(env)
           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?
           env[:result] = domain.state.to_s == 'running'
 
           @app.call(env)

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

@@ -4,16 +4,16 @@ module VagrantPlugins
       # This can be used with "Call" built-in to check if the machine
       # is suspended and branch in the middleware.
       class IsSuspended
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
         def call(env)
           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?
 
           config = env[:machine].provider_config
-          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)
           if config.suspend_mode == 'managedsave'
             if libvirt_domain.has_managed_save?
               env[:result] = libvirt_domain.has_managed_save?
@@ -33,7 +33,7 @@ module VagrantPlugins
               env[:result] = domain.state.to_s == 'paused'
             end
           end
-          
+
           @app.call(env)
         end
       end

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

@@ -2,12 +2,12 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class MessageAlreadyCreated
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
         def call(env)
-          env[:ui].info(I18n.t("vagrant_libvirt.already_created"))
+          env[:ui].info(I18n.t('vagrant_libvirt.already_created'))
           @app.call(env)
         end
       end

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

@@ -2,12 +2,12 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class MessageNotCreated
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
         def call(env)
-          env[:ui].info(I18n.t("vagrant_libvirt.not_created"))
+          env[:ui].info(I18n.t('vagrant_libvirt.not_created'))
           @app.call(env)
         end
       end

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

@@ -2,12 +2,12 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class MessageNotRunning
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
         def call(env)
-          env[:ui].info(I18n.t("vagrant_libvirt.not_running"))
+          env[:ui].info(I18n.t('vagrant_libvirt.not_running'))
           @app.call(env)
         end
       end

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

@@ -2,12 +2,12 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class MessageNotSuspended
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
         def call(env)
-          env[:ui].info(I18n.t("vagrant_libvirt.not_suspended"))
+          env[:ui].info(I18n.t('vagrant_libvirt.not_suspended'))
           @app.call(env)
         end
       end

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

@@ -14,14 +14,15 @@ module VagrantPlugins
 
         def call(env)
           env[:ui].info(I18n.t('vagrant_libvirt.package_domain'))
-          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
+          )
           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
           boxname = env['package.output']
-          raise "#{boxname}: Already exists" if File.exists?(boxname)
+          raise "#{boxname}: Already exists" if File.exist?(boxname)
           @tmp_dir = Dir.pwd + '/_tmp_package'
           @tmp_img = @tmp_dir + '/box.img'
           Dir.mkdir(@tmp_dir)
@@ -37,11 +38,11 @@ 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 --operations defaults,-ssh-userdir -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))
-          File.write(@tmp_dir + '/Vagrantfile',vagrantfile_content)
+          File.write(@tmp_dir + '/Vagrantfile', vagrantfile_content)
           assebmle_box(boxname)
           FileUtils.mv(@tmp_dir + '/' + boxname, '../' + boxname)
           FileUtils.rm_rf(@tmp_dir)

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

@@ -8,9 +8,9 @@ module VagrantPlugins
       class PrepareNFSSettings
         include Vagrant::Action::Builtin::MixinSyncedFolders
 
-        def initialize(app,env)
+        def initialize(app, _env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant::action::vm::nfs")
+          @logger = Log4r::Logger.new('vagrant::action::vm::nfs')
         end
 
         def call(env)
@@ -18,7 +18,7 @@ module VagrantPlugins
           @app.call(env)
 
           if using_nfs?
-            @logger.info("Using NFS, preparing NFS settings by reading host IP and machine IP")
+            @logger.info('Using NFS, preparing NFS settings by reading host IP and machine IP')
             env[:nfs_machine_ip] = read_machine_ip(env[:machine])
             env[:nfs_host_ip]    = read_host_ip(env[:nfs_machine_ip])
 
@@ -41,7 +41,7 @@ module VagrantPlugins
         # @return [String]
         def read_host_ip(ip)
           UDPSocket.open do |s|
-            if(ip.kind_of?(Array))
+            if ip.is_a?(Array)
               s.connect(ip.last, 1)
             else
               s.connect(ip, 1)
@@ -49,6 +49,7 @@ module VagrantPlugins
             s.addr.last
           end
         end
+
         # Returns the IP address of the guest
         #
         # @param [Machine] machine
@@ -59,8 +60,8 @@ module VagrantPlugins
           return ssh_host if ping(ssh_host)
 
           # check other ips
-          command = "ip addr show | grep -i 'inet ' | grep -v '127.0.0.1' | tr -s ' ' | cut -d' ' -f3 | cut -d'/' -f 1"
-          result  = ""
+          command = "ip=$(which ip); ${ip:-/sbin/ip} addr show | grep -i 'inet ' | grep -v '127.0.0.1' | tr -s ' ' | cut -d' ' -f3 | cut -d'/' -f 1"
+          result  = ''
           machine.communicate.execute(command) do |type, data|
             result << data if type == :stdout
           end

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

@@ -2,9 +2,9 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class PrepareNFSValidIds
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant::action::vm::nfs")
+          @logger = Log4r::Logger.new('vagrant::action::vm::nfs')
         end
 
         def call(env)

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

@@ -3,8 +3,7 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class PruneNFSExports
-
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
@@ -16,7 +15,8 @@ module VagrantPlugins
             # not exiisted in array will removed from nfs
             uuids.delete(uuid)
             env[:host].capability(
-              :nfs_prune, env[:machine].ui, uuids)
+              :nfs_prune, env[:machine].ui, uuids
+            )
           end
 
           @app.call(env)

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

@@ -1,12 +1,12 @@
-require "log4r"
+require 'log4r'
 
 module VagrantPlugins
   module ProviderLibvirt
     module Action
       class ReadMacAddresses
-        def initialize(app, env)
+        def initialize(app, _env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::read_mac_addresses")
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::read_mac_addresses')
         end
 
         def call(env)
@@ -19,21 +19,19 @@ module VagrantPlugins
           domain = libvirt.client.lookup_domain_by_uuid(machine.id)
 
           if domain.nil?
-            @logger.info("Machine could not be found, assuming it got destroyed")
+            @logger.info('Machine could not be found, assuming it got destroyed')
             machine.id = nil
             return nil
           end
 
           xml = Nokogiri::XML(domain.xml_desc)
-          mac = xml.xpath("/domain/devices/interface/mac/@address")
+          mac = xml.xpath('/domain/devices/interface/mac/@address')
 
-          if mac.length == 0
-            return {}
-          end
+          return {} if mac.empty?
 
-          Hash[mac.each_with_index.map do |x,i|
+          Hash[mac.each_with_index.map do |x, i|
             @logger.debug("interface[#{i}] = #{x.value}")
-            [i,x.value]
+            [i, x.value]
           end]
         end
       end

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

@@ -4,14 +4,14 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class RemoveLibvirtImage
-        def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::remove_libvirt_image")
+        def initialize(app, _env)
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::remove_libvirt_image')
           @app = app
         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 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)')
           @app.call(env)
         end
       end

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

@@ -1,15 +1,14 @@
 require 'log4r'
-#require 'log4r/yamlconfigurator'
+# require 'log4r/yamlconfigurator'
 
 module VagrantPlugins
   module ProviderLibvirt
     module Action
       class RemoveStaleVolume
         def initialize(app, _env)
-
-#          log4r_config= YAML.load_file(File.join(File.dirname(__FILE__),"log4r.yaml"))
-#          log_cfg = Log4r::YamlConfigurator
-#          log_cfg.decode_yaml( log4r_config['log4r_config'] )
+          #          log4r_config= YAML.load_file(File.join(File.dirname(__FILE__),"log4r.yaml"))
+          #          log_cfg = Log4r::YamlConfigurator
+          #          log_cfg.decode_yaml( log4r_config['log4r_config'] )
 
           @logger = Log4r::Logger.new('vagrant_libvirt::action::remove_stale_volume')
           @app = app
@@ -22,7 +21,8 @@ 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[:machine].provider.driver.connection.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,8 @@ module VagrantPlugins
 
           # remove root storage
           box_volume = ProviderLibvirt::Util::Collection.find_matching(
-            env[:machine].provider.driver.connection.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

@@ -5,18 +5,18 @@ module VagrantPlugins
     module Action
       # Resume suspended domain.
       class ResumeDomain
-        def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::resume_domain")
+        def initialize(app, _env)
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::resume_domain')
           @app = app
         end
 
         def call(env)
-          env[:ui].info(I18n.t("vagrant_libvirt.resuming_domain"))
+          env[:ui].info(I18n.t('vagrant_libvirt.resuming_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?
 
-          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)
           config = env[:machine].provider_config
           if config.suspend_mode == 'managedsave'
             domain.start