vagrant-libvirt 0.10.6 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67234309e889d2254d68de7a257d1bf051bb507afcfc0ff03c28906dcceae43d
-  data.tar.gz: 1b0f05ff1fd494b46b99715ba500a20237e2262e2de0066ddfb07c46fac5d192
+  metadata.gz: a8480e85c239c56fec0b2800bb26c7453c566c12c38d45d07e38f50744b2e719
+  data.tar.gz: 0b8970b25c17ac001a9b2d348598512b13afdef476f1078d66720df721f5631d
 SHA512:
-  metadata.gz: eb86380ba32e7c6d93856e3d6f168a3ea93d7bb4c532063764239f2875ea9371ca6c113f3a54671c90ba51a8b38166c271794932c1ce104981f40ab45be93de2
-  data.tar.gz: 035da37488d87c895b8f92b3bd0f616db26447edcbc7ee88fd7d4aa8b33c9f077893aef63ce6fd01e5f961349d938218aa749f0717be69becc4a2363656ac3ef
+  metadata.gz: de18f3d908462a69a121271ddcc919c2bb7c883591d4ca11bf4739aa5030b37ef86446ac3c92c9d0e84fefe903328df0dfe135f62bf0c29f818e57c1d1796b32
+  data.tar.gz: 376684defc3fd7a3b6d0f87aedb68d4ee1c040c909bf225be84dc8fc5abb85b16f3145f1a9307f5e6446a2f927e604616fd7e714abdc6af73babd4c05bfa696b

data/README.md

@@ -4,7 +4,7 @@
 
 [![Join the chat at https://gitter.im/vagrant-libvirt/vagrant-libvirt](https://badges.gitter.im/vagrant-libvirt/vagrant-libvirt.svg)](https://gitter.im/vagrant-libvirt/vagrant-libvirt?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://github.com/vagrant-libvirt/vagrant-libvirt/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/vagrant-libvirt/vagrant-libvirt/actions/workflows/unit-tests.yml)
-[![Coverage Status](https://coveralls.io/repos/github/vagrant-libvirt/vagrant-libvirt/badge.svg?branch=master)](https://coveralls.io/github/vagrant-libvirt/vagrant-libvirt?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/vagrant-libvirt/vagrant-libvirt/badge.svg?branch=main)](https://coveralls.io/github/vagrant-libvirt/vagrant-libvirt?branch=main)
 [![Gem Version](https://badge.fury.io/rb/vagrant-libvirt.svg)](https://badge.fury.io/rb/vagrant-libvirt)
 
 This is a [Vagrant](http://www.vagrantup.com) plugin that adds a

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

@@ -2,7 +2,9 @@
 
 require 'log4r'
 
+require 'vagrant-libvirt/util/erb_template'
 require 'vagrant-libvirt/util/resolvers'
+require 'vagrant-libvirt/util/storage_util'
 
 module VagrantPlugins
   module ProviderLibvirt

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

@@ -2,11 +2,10 @@
 
 require 'log4r'
 
-begin
-  require 'rexml'
-rescue LoadError
-  require 'rexml/rexml'
-end
+require 'rexml/document'
+require 'rexml/xpath'
+
+require 'vagrant-libvirt/util/domain_flags'
 
 module VagrantPlugins
   module ProviderLibvirt

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

@@ -7,19 +7,20 @@ module VagrantPlugins
       class ForwardPorts
         @@lock = Mutex.new
 
-        def initialize(app, _env)
+        def initialize(app, env)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_libvirt::action::forward_ports')
+          @ui     = env[:ui]
         end
 
         def call(env)
           # Get the ports we're forwarding
-          env[:forwarded_ports] = compile_forwarded_ports(env, env[:machine].config)
+          env[:forwarded_ports] = compile_forwarded_ports(env[:machine])
 
           # Warn if we're port forwarding to any privileged ports
           env[:forwarded_ports].each do |fp|
             next unless fp[:host] <= 1024
-            env[:ui].warn I18n.t(
+            @ui.warn I18n.t(
               'vagrant.actions.vm.forward_ports.privileged_ports'
             )
             break
@@ -29,7 +30,7 @@ module VagrantPlugins
           @app.call env
 
           if env[:forwarded_ports].any?
-            env[:ui].info I18n.t('vagrant.actions.vm.forward_ports.forwarding')
+            @ui.info I18n.t('vagrant.actions.vm.forward_ports.forwarding')
             forward_ports(env)
           end
         end
@@ -42,13 +43,12 @@ module VagrantPlugins
               host_port: fp[:host]
             }
 
-            env[:ui].info(I18n.t(
+            @ui.info(I18n.t(
                              'vagrant.actions.vm.forward_ports.forwarding_entry',
                              **message_attributes
             ))
 
             ssh_pid = redirect_port(
-              env,
               env[:machine],
               fp[:host_ip] || '*',
               fp[:host],
@@ -62,18 +62,18 @@ module VagrantPlugins
 
         private
 
-        def compile_forwarded_ports(env, config)
+        def compile_forwarded_ports(machine)
           mappings = {}
 
-          config.vm.networks.each do |type, options|
+          machine.config.vm.networks.each do |type, options|
             next if options[:disabled]
 
             if options[:protocol] == 'udp'
-              env[:ui].warn I18n.t('vagrant_libvirt.warnings.forwarding_udp')
+              @ui.warn I18n.t('vagrant_libvirt.warnings.forwarding_udp')
               next
             end
 
-            next if type != :forwarded_port || ( options[:id] == 'ssh' && !env[:machine].provider_config.forward_ssh_port )
+            next if type != :forwarded_port || ( options[:id] == 'ssh' && !machine.provider_config.forward_ssh_port )
             if options.fetch(:host_ip, '').to_s.strip.empty?
               options.delete(:host_ip)
             end
@@ -83,7 +83,7 @@ module VagrantPlugins
           mappings.values
         end
 
-        def redirect_port(env, machine, host_ip, host_port, guest_ip, guest_port,
+        def redirect_port(machine, host_ip, host_port, guest_ip, guest_port,
                           gateway_ports)
           ssh_info = machine.ssh_info
           params = %W(
@@ -118,7 +118,7 @@ module VagrantPlugins
           if host_port <= 1024
             @@lock.synchronize do
               # TODO: add i18n
-              env[:ui].info 'Requesting sudo for host port(s) <= 1024'
+              @ui.info 'Requesting sudo for host port(s) <= 1024'
               r = system('sudo -v')
               if r
                 ssh_cmd.unshift('sudo') # add sudo prefix
@@ -128,7 +128,7 @@ module VagrantPlugins
 
           @logger.debug "Forwarding port with `#{ssh_cmd.join(' ')}`"
           log_file = ssh_forward_log_file(
-            env[:machine], host_ip, host_port, guest_ip, guest_port,
+            machine, host_ip, host_port, guest_ip, guest_port,
           )
           @logger.info "Logging to #{log_file}"
           spawn(*ssh_cmd, [:out, :err] => [log_file, 'w'], :pgroup => true)
@@ -164,17 +164,18 @@ module VagrantPlugins
       class ClearForwardedPorts
         @@lock = Mutex.new
 
-        def initialize(app, _env)
+        def initialize(app, env)
           @app = app
           @logger = Log4r::Logger.new(
             'vagrant_libvirt::action::clear_forward_ports'
           )
+          @ui = env[:ui]
         end
 
         def call(env)
           pids = ssh_pids(env[:machine])
           if pids.any?
-            env[:ui].info I18n.t(
+            @ui.info I18n.t(
               'vagrant.actions.vm.clear_forward_ports.deleting'
             )
             pids.each do |tag|

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

@@ -5,6 +5,8 @@ require 'open3'
 require 'json'
 
 require 'vagrant-libvirt/util/byte_number'
+require 'vagrant-libvirt/util/storage_util'
+require 'vagrant-libvirt/util/ui'
 
 module VagrantPlugins
   module ProviderLibvirt

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

@@ -3,6 +3,7 @@
 require 'fileutils'
 require 'log4r'
 
+require 'vagrant-libvirt/util/ui'
 require 'vagrant-libvirt/util/unindent'
 
 module VagrantPlugins

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

@@ -2,11 +2,8 @@
 
 require 'log4r'
 
-begin
-  require 'rexml'
-rescue LoadError
-  require 'rexml/rexml'
-end
+require 'rexml/document'
+require 'rexml/xpath'
 
 require 'vagrant-libvirt/util/resolvers'
 

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

@@ -16,6 +16,12 @@ module VagrantPlugins
         end
 
         def call(env)
+          # Only execute specific boot ordering if this is defined
+          # in the Vagrant file
+          unless @boot_order.count >= 1
+            return @app.call(env)
+          end
+
           # Get domain first
           begin
             domain = env[:machine].provider
@@ -30,53 +36,49 @@ module VagrantPlugins
                   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(&:remove)
+          # 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(&:remove)
 
-            # 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']")
-            # implemented only for 1 network
-            nets = @boot_order.flat_map do |x|
-              x.class == Hash ? x : nil
-            end.compact
-            raise 'Defined only for 1 network for boot' if nets.size > 1
-            network = search_network(nets, xml)
+          # 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']")
+          # implemented only for 1 network
+          nets = @boot_order.flat_map do |x|
+            x.class == Hash ? x : nil
+          end.compact
+          raise 'Defined only for 1 network for boot' if nets.size > 1
+          network = search_network(nets, xml)
 
-            # Generate an array per device group and a flattened
-            # array from all of those
-            devices = { 'hd' => hd,
-                        'cdrom' => cdrom,
-                        'network' => 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 = final_boot_order(@boot_order, devices)
-            # 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)
-              logger_msg(node, index)
-            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)
+          final_boot_order = final_boot_order(@boot_order, devices)
+          # 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|
+            next if node.nil?
+            boot = "<boot order='#{index + 1}'/>"
+            node.add_child(boot)
+            logger_msg(node, index)
           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)
+
           @app.call(env)
         end