vagrant-libvirt 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7de8bcfdcab60b3237c7d64fd047fa9b43bbf8
-  data.tar.gz: f98b1b521b2d6665be337341791ae260244d29eb
+  metadata.gz: 693a19302ccb1cda6b30a7be5b5d9b8c5e74b5e3
+  data.tar.gz: 951b697e48245021c9cec5d8e392a44d7d0881ec
 SHA512:
-  metadata.gz: 6d33e5ae966f1758ec327b73a9d3527cfa0b6c3ab461630beb4e13bc391c5f291ab04b48884bc0d568e2376ee3fda1361bce6efab0d3d5513b987f08f7b75513
-  data.tar.gz: 83408a1dcb5c55fd745e204b7d23f78cf1ec9d6e6eb5beb8a27f31cbff4154a916bd9068b7e80dade9318f97b504a77671171486ce954e65b9af73474487e151
+  metadata.gz: 8d82a8e8257f289130dfc2fc84388adbaff56803012d5a8fdfd6b12395bb100102aa452c75fb98ce1579af2ba0b961d794fe6149e02ed67e8870384ff8c5b402
+  data.tar.gz: 21f86a6f84414e3aeb92e801d5114bec30c5c0cac4a391c28142c73468c0825ae620ba527424a1fffac4970f8a75e7abe6119954c60180aef165dfc4baad8e89

data/README.md

@@ -1,10 +1,10 @@
 # Vagrant Libvirt Provider
 
-This is a [Vagrant](http://www.vagrantup.com) 1.3+ plugin that adds an
+This is a [Vagrant](http://www.vagrantup.com) 1.4.3+ plugin that adds an
 [Libvirt](http://libvirt.org) provider to Vagrant, allowing Vagrant to
 control and provision machines via Libvirt toolkit.
 
-**Note:** Actual version (0.0.13) is still a development one. Feedback is
+**Note:** Actual version (0.0.15) is still a development one. Feedback is
 welcome and can help a lot :-)
 
 ## Features (Version 0.0.13)
@@ -29,7 +29,7 @@ welcome and can help a lot :-)
 
 ## Installation
 
-Install using standard [Vagrant 1.3+](http://downloads.vagrantup.com) plugin installation methods. After
+Install using standard [Vagrant 1.4.3+](http://downloads.vagrantup.com) plugin installation methods. After
 installing, `vagrant up` and specify the `libvirt` provider. An example is shown below.
 
 ```
@@ -162,7 +162,7 @@ Vagrant goes through steps below when creating new project:
 ## Networks
 
 Networking features in the form of `config.vm.network` support private networks
-concept. Port Forwarding is currently not supported.
+concept.
 
 Public Network interfaces are currently implemented using the macvtap driver. The macvtap
 driver is only available with the Linux Kernel version >= 2.6.24. See the following libvirt
@@ -271,6 +271,12 @@ Configurable ssh parameters in Vagrantfile after provider version 0.0.5 are:
 * `config.ssh.forward_agent` - Default is false.
 * `config.ssh.forward_x11` - Default is false.
 
+## Forwarded Ports
+
+vagrant-libvirt supports Forwarded Ports via ssh port forwarding.  For each
+`forwarded_port` directive you specify in your Vagrantfile, vagrant-libvirt
+will maintain an active ssh process for the lifetime of the VM.
+
 ## Synced Folders
 
 There is minimal support for synced folders. Upon `vagrant up`, the Libvirt

data/lib/vagrant-libvirt/action.rb

@@ -1,10 +1,12 @@
 require 'vagrant/action/builder'
+require 'log4r'
 
 module VagrantPlugins
   module ProviderLibvirt
     module Action
       # Include the built-in modules so we can use them as top-level things.
       include Vagrant::Action::Builtin
+      @logger = Log4r::Logger.new('vagrant_libvirt::action') 
 
       # This action is called to bring the box up from nothing.
       def self.action_up
@@ -25,18 +27,22 @@ module VagrantPlugins
               b2.use CreateNetworks
               b2.use CreateNetworkInterfaces
 
+              b2.use StartDomain
+              b2.use WaitTillUp
+
               if Vagrant::VERSION < "1.4.0"
                 b2.use NFS
               else
+                b2.use PrepareNFSValidIds
                 b2.use SyncedFolderCleanup
                 b2.use SyncedFolders
               end
 
+              b2.use ForwardPorts
+
               b2.use PrepareNFSSettings
               b2.use ShareFolders
               b2.use SetHostname
-              b2.use StartDomain
-              b2.use WaitTillUp
               b2.use SyncFolders
             else
               b2.use action_start
@@ -68,22 +74,26 @@ module VagrantPlugins
               # Ensure networks are created and active
               b3.use CreateNetworks
 
+              # Start it..
+              b3.use StartDomain
+
+              # Machine should gain IP address when comming up,
+              # so wait for dhcp lease and store IP into machines data_dir.
+              b3.use WaitTillUp
+
               # Handle shared folders
               if Vagrant::VERSION < "1.4.0"
                 b3.use NFS
               else
+                b3.use PrepareNFSValidIds
                 b3.use SyncedFolderCleanup
                 b3.use SyncedFolders
               end
+
+              b3.use ForwardPorts
               b3.use PrepareNFSSettings
               b3.use ShareFolders
 
-              # Start it..
-              b3.use StartDomain
-
-              # Machine should gain IP address when comming up,
-              # so wait for dhcp lease and store IP into machines data_dir.
-              b3.use WaitTillUp
             end
           end
         end
@@ -95,6 +105,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectLibvirt
+          b.use ClearForwardedPorts
           b.use Call, IsCreated do |env, b2|
             if !env[:result]
               b2.use MessageNotCreated
@@ -144,6 +155,7 @@ module VagrantPlugins
             end
 
             b2.use ConnectLibvirt
+            b2.use ClearForwardedPorts
             b2.use PruneNFSExports
             b2.use DestroyDomain
             b2.use DestroyNetworks
@@ -297,6 +309,8 @@ module VagrantPlugins
       autoload :CreateNetworks, action_root.join('create_networks')
       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 :HandleBoxImage, action_root.join('handle_box_image')
       autoload :HandleStoragePool, action_root.join('handle_storage_pool')
@@ -308,6 +322,7 @@ module VagrantPlugins
       autoload :MessageNotRunning, action_root.join('message_not_running')
       autoload :MessageNotSuspended, action_root.join('message_not_suspended')
       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 :ReadSSHInfo, action_root.join('read_ssh_info')
       autoload :ReadState, action_root.join('read_state')

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

@@ -10,7 +10,7 @@ module VagrantPlugins
       # Networks for connecting those interfaces should be already prepared.
       class CreateNetworkInterfaces
         include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
-        include VagrantPlugins::ProviderLibvirt::Util::LibvirtUtil
+        include VagrantPlugins::ProviderLibvirt::Util::NetworkUtil
         include Vagrant::Util::NetworkIP
         include Vagrant::Util::ScopedHashOverride
 
@@ -36,14 +36,10 @@ module VagrantPlugins
           # Vagrant gives you adapter 0 by default
 
           # Assign interfaces to slots.
-          env[:machine].config.vm.networks.each do |type, options|
-            @logger.debug "In config found network type #{type} options #{options}"
+          configured_networks(env, @logger).each do |options|
 
-            # Get options for this interface. Options can be specified in
-            # Vagrantfile in short format (:ip => ...), or provider format
-            # (:libvirt__network_name => ...).
-            options = scoped_hash_override(options, :libvirt)
-            options = { :netmask => '255.255.255.0', :iface_type => type }.merge(options)
+            # dont need to create interface for this type
+            next if options[:iface_type] == :forwarded_port
 
             # TODO fill first ifaces with adapter option specified.
             if options[:adapter]
@@ -103,9 +99,9 @@ module VagrantPlugins
           networks_to_configure = []
 
           adapters.each_with_index do |options, slot_number|
-            # Skip configuring first interface. It's used for provisioning and
-            # it has to be available during provisioning - ifdown command is
-            # not acceptable here.
+            # Skip configuring the management network, which is on the first interface.
+            # It's used for provisioning and it has to be available during provisioning,
+            # ifdown command is not acceptable here.
             next if slot_number == 0
             @logger.debug "Configuring interface slot_number #{slot_number} options #{options}"
 
@@ -161,13 +157,7 @@ module VagrantPlugins
             end
           end
 
-          # the management network always gets attached to slot 0
-          # because the first network is of type forwarded_port.
-          # this is confusing.
-          # TODO only iterate over networks of type private_network
-          # and prepend the management network to that list
-          @logger.debug "Did not find network so using default of #{@management_network_name}"
-          @management_network_name
+          raise NetworkNotAvailableError, network_name: options[:ip]
         end
       end
     end

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

@@ -12,7 +12,7 @@ module VagrantPlugins
         include Vagrant::Util::NetworkIP
         include Vagrant::Util::ScopedHashOverride
         include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
-        include VagrantPlugins::ProviderLibvirt::Util::LibvirtUtil
+        include VagrantPlugins::ProviderLibvirt::Util::NetworkUtil
 
         @@lock = Mutex.new
 
@@ -27,63 +27,15 @@ module VagrantPlugins
         end
 
         def call(env)
-
-          management_network_name = env[:machine].provider_config.management_network_name
-          management_network_address = env[:machine].provider_config.management_network_address
-          @logger.info "Using #{management_network_name} at #{management_network_address} as the management network"
-
-          begin
-            management_network_ip = IPAddr.new(management_network_address)
-          rescue ArgumentError
-            raise Errors::ManagementNetworkError,
-              error_message: "#{management_network_address} is not a valid IP address"
-          end
-
-          # capture address into $1 and mask into $2
-          management_network_ip.inspect =~ /IPv4:(.*)\/(.*)>/
-
-          if $2 == '255.255.255.255'
-            raise Errors::ManagementNetworkError,
-              error_message: "#{management_network_address} does not include both an address and subnet mask"
-          end
-
-          management_network_options = {
-            network_name: management_network_name,
-            ip: $1,
-            netmask: $2,
-            dhcp_enabled: true,
-            forward_mode: 'nat',
-          }
-
-          # add management network to list of networks to check
-          networks = [ management_network_options ]
-
-          env[:machine].config.vm.networks.each do |type, original_options|
-            # There are two other types public network and port forwarding,
-            # but there are problems with creating them via libvirt API,
-            # so this provider doesn't implement them.
-            next if type != :private_network
-            # Options can be specified in Vagrantfile in short format (:ip => ...),
-            # or provider format # (:libvirt__network_name => ...).
-            # https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/util/scoped_hash_override.rb
-            options = scoped_hash_override(original_options, :libvirt)
-            # use default values if not already set
-            options = {
-              netmask:      '255.255.255.0',
-              dhcp_enabled: true,
-              forward_mode: 'nat',
-            }.merge(options)
-            # add to list of networks to check
-            networks.push(options)
-          end
-
           # only one vm at a time should try to set up networks
           # otherwise they'll have inconsitent views of current state
           # and conduct redundant operations that cause errors
           @@lock.synchronize do
             # Iterate over networks If some network is not
             # available, create it if possible. Otherwise raise an error.
-            networks.each do |options|
+            configured_networks(env, @logger).each do |options|
+              # Only need to create private networks
+              next if options[:iface_type] != :private_network
               @logger.debug "Searching for network with options #{options}"
 
               # should fix other methods so this doesn't have to be instance var

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

@@ -0,0 +1,164 @@
+module VagrantPlugins
+  module ProviderLibvirt
+    module Action
+      # Adds support for vagrant's `forward_ports` configuration directive.
+      class ForwardPorts
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::forward_ports')
+        end
+
+        def call(env)
+          @env = env
+
+          # Get the ports we're forwarding
+          env[:forwarded_ports] = compile_forwarded_ports(env[:machine].config)
+
+          # Warn if we're port forwarding to any privileged ports
+          env[:forwarded_ports].each do |fp|
+            if fp[:host] <= 1024
+              env[:ui].warn I18n.t(
+                'vagrant.actions.vm.forward_ports.privileged_ports'
+              )
+              break
+            end
+          end
+
+          # Continue, we need the VM to be booted in order to grab its IP
+          @app.call env
+
+          if @env[:forwarded_ports].any?
+            env[:ui].info I18n.t('vagrant.actions.vm.forward_ports.forwarding')
+            forward_ports
+          end
+        end
+
+        def forward_ports
+          @env[:forwarded_ports].each do |fp|
+            message_attributes = {
+              adapter: 'eth0',
+              guest_port: fp[:guest],
+              host_port: fp[:host]
+            }
+
+            @env[:ui].info(I18n.t(
+                'vagrant.actions.vm.forward_ports.forwarding_entry',
+                message_attributes
+            ))
+
+            ssh_pid = redirect_port(
+              @env[:machine].name,
+              fp[:host_ip] || '0.0.0.0',
+              fp[:host],
+              fp[:guest_ip] || @env[:machine].provider.ssh_info[:host],
+              fp[:guest]
+            )
+            store_ssh_pid(fp[:host], ssh_pid)
+          end
+        end
+
+        private
+
+        def compile_forwarded_ports(config)
+          mappings = {}
+
+          config.vm.networks.each do |type, options|
+            next if options[:disabled]
+
+            if type == :forwarded_port && options[:id] != 'ssh'
+              if options.fetch(:host_ip, '').to_s.strip.empty?
+                options.delete(:host_ip)
+              end
+              mappings[options[:host]] = options
+            end
+          end
+
+          mappings.values
+        end
+
+        def redirect_port(machine, host_ip, host_port, guest_ip, guest_port)
+          params = %W(
+            #{machine}
+            -L #{host_ip}:#{host_port}:#{guest_ip}:#{guest_port}
+            -N
+          ).join(' ')
+          # TODO get options without shelling out
+          options = `vagrant ssh-config #{machine} | awk '{printf " -o "$1"="$2}'`
+          ssh_cmd = "ssh #{options} #{params}"
+
+          @logger.debug "Forwarding port with `#{ssh_cmd}`"
+          spawn(ssh_cmd,  [:out, :err] => '/dev/null')
+        end
+
+        def store_ssh_pid(host_port, ssh_pid)
+          data_dir = @env[:machine].data_dir.join('pids')
+          data_dir.mkdir unless data_dir.directory?
+
+          data_dir.join("ssh_#{host_port}.pid").open('w') do |pid_file|
+            pid_file.write(ssh_pid)
+          end
+        end
+      end
+    end
+  end
+end
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Action
+      # Cleans up ssh-forwarded ports on VM halt/destroy.
+      class ClearForwardedPorts
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new(
+            'vagrant_libvirt::action::clear_forward_ports'
+          )
+        end
+
+        def call(env)
+          @env = env
+
+          if ssh_pids.any?
+            env[:ui].info I18n.t(
+              'vagrant.actions.vm.clear_forward_ports.deleting'
+            )
+            ssh_pids.each do |pid|
+              next unless ssh_pid?(pid)
+              @logger.debug "Killing pid #{pid}"
+              system "kill #{pid}"
+            end
+
+            @logger.info 'Removing ssh pid files'
+            remove_ssh_pids
+          else
+            @logger.info 'No ssh pids found'
+          end
+
+          @app.call env
+        end
+
+        protected
+
+        def ssh_pids
+          glob = @env[:machine].data_dir.join('pids').to_s + '/ssh_*.pid'
+          @ssh_pids = Dir[glob].map do |file|
+            File.read(file).strip.chomp
+          end
+        end
+
+        def ssh_pid?(pid)
+          @logger.debug 'Checking if #{pid} is an ssh process '\
+                        'with `ps -o cmd= #{pid}`'
+          `ps -o cmd= #{pid}`.strip.chomp =~ /ssh/
+        end
+
+        def remove_ssh_pids
+          glob = @env[:machine].data_dir.join('pids').to_s + '/ssh_*.pid'
+          Dir[glob].each do |file|
+            File.delete file
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,31 +3,35 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class PrepareNFSSettings
+        include Vagrant::Action::Builtin::MixinSyncedFolders
+        
         def initialize(app,env)
           @app = app
           @logger = Log4r::Logger.new("vagrant::action::vm::nfs")
         end
 
         def call(env)
+          @machine = env[:machine]
           @app.call(env)
 
-          using_nfs = false
-          env[:machine].config.vm.synced_folders.each do |id, opts|
-            if opts[:nfs]
-              using_nfs = true
-              break
-            end
-          end
-
-          if using_nfs
+          if using_nfs?
             @logger.info("Using NFS, preparing NFS settings by reading host IP and machine IP")
             env[:nfs_host_ip]    = read_host_ip(env[:machine],env)
             env[:nfs_machine_ip] = env[:machine].ssh_info[:host]
 
-            raise Vagrant::Errors::NFSNoHostonlyNetwork if !env[:nfs_machine_ip]
+            @logger.info("host IP: #{env[:nfs_host_ip]} machine IP: #{env[:nfs_machine_ip]}")
+
+            raise Vagrant::Errors::NFSNoHostonlyNetwork if !env[:nfs_machine_ip] || !env[:nfs_host_ip]
           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 first host only network adapter
         #
         # @param [Machine] machine

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

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module ProviderLibvirt
+    module Action
+      class PrepareNFSValidIds
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant::action::vm::nfs")
+        end
+
+        def call(env)
+          env[:nfs_valid_ids] = env[:libvirt_compute].servers.all.map(&:id)
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -26,10 +26,7 @@ module VagrantPlugins
           {}.tap do |result|
             @env[:machine].config.vm.synced_folders.each do |id, data|
               # Ignore NFS shared folders
-              next if !data[:nfs]
-
-              # convert to NFS share
-              #data[:nfs] = true
+              next if !data[:type] == :nfs
 
               # This to prevent overwriting the actual shared folders data
               result[id] = data.dup

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

@@ -18,7 +18,7 @@ module VagrantPlugins
           ssh_info = env[:machine].ssh_info
 
           env[:machine].config.vm.synced_folders.each do |id, data|
-            next if data[:nfs]
+            next if data[:type] == :nfs
             proxycommand = "-o ProxyCommand='#{ssh_info[:proxy_command]}'" if ssh_info[:proxy_command]
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]

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

@@ -1,4 +1,4 @@
-require "vagrant-libvirt/util/timer"
+require 'vagrant-libvirt/util/timer'
 
 module VagrantPlugins
   module ProviderLibvirt
@@ -6,17 +6,14 @@ module VagrantPlugins
       # This is the same as the builtin provision except it times the
       # provisioner runs.
       class TimedProvision < Vagrant::Action::Builtin::Provision
-        def run_provisioner(env, name, p)
-          env[:ui].info(I18n.t("vagrant.actions.vm.provision.beginning",
-                               :provisioner => name))
-
+        def run_provisioner(env)
           timer = Util::Timer.time do
             super
           end
 
           env[:metrics] ||= {}
-          env[:metrics]["provisioner_times"] ||= []
-          env[:metrics]["provisioner_times"] << [p.class.to_s, timer]
+          env[:metrics]['provisioner_times'] ||= []
+          env[:metrics]['provisioner_times'] << [env[:provisioner].class.to_s, timer]
         end
       end
     end

data/lib/vagrant-libvirt/util.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       autoload :ErbTemplate, 'vagrant-libvirt/util/erb_template'
       autoload :Collection,  'vagrant-libvirt/util/collection'
       autoload :Timer,  'vagrant-libvirt/util/timer'
-      autoload :LibvirtUtil,  'vagrant-libvirt/util/libvirt_util'
+      autoload :NetworkUtil,  'vagrant-libvirt/util/network_util'
     end
   end
 end

data/lib/vagrant-libvirt/util/network_util.rb

@@ -0,0 +1,117 @@
+require 'nokogiri'
+require 'vagrant/util/network_ip'
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Util
+      module NetworkUtil
+        include Vagrant::Util::NetworkIP
+
+        def configured_networks(env, logger)
+          management_network_name = env[:machine].provider_config.management_network_name
+          management_network_address = env[:machine].provider_config.management_network_address
+          logger.info "Using #{management_network_name} at #{management_network_address} as the management network"
+
+          begin
+            management_network_ip = IPAddr.new(management_network_address)
+          rescue ArgumentError
+            raise Errors::ManagementNetworkError,
+              error_message: "#{management_network_address} is not a valid IP address"
+          end
+
+          # capture address into $1 and mask into $2
+          management_network_ip.inspect =~ /IPv4:(.*)\/(.*)>/
+
+          if $2 == '255.255.255.255'
+            raise Errors::ManagementNetworkError,
+              error_message: "#{management_network_address} does not include both an address and subnet mask"
+          end
+
+          management_network_options = {
+            iface_type: :private_network,
+            network_name: management_network_name,
+            ip: $1,
+            netmask: $2,
+            dhcp_enabled: true,
+            forward_mode: 'nat',
+          }
+
+          # add management network to list of networks to check
+          networks = [ management_network_options ]
+
+          env[:machine].config.vm.networks.each do |type, original_options|
+            logger.debug "In config found network type #{type} options #{original_options}"
+            # Options can be specified in Vagrantfile in short format (:ip => ...),
+            # or provider format # (:libvirt__network_name => ...).
+            # https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/util/scoped_hash_override.rb
+            options = scoped_hash_override(original_options, :libvirt)
+            # store type in options
+            # use default values if not already set
+            options = {
+              iface_type:  type,
+              netmask:      '255.255.255.0',
+              dhcp_enabled: true,
+              forward_mode: 'nat',
+            }.merge(options)
+            # add to list of networks to check
+            networks.push(options)
+          end
+
+          return networks
+        end
+
+        # Return a list of all (active and inactive) libvirt networks as a list
+        # of hashes with their name, network address and status (active or not)
+        def libvirt_networks(libvirt_client)
+          libvirt_networks = []
+
+          active = libvirt_client.list_networks
+          inactive = libvirt_client.list_defined_networks
+
+          # Iterate over all (active and inactive) networks.
+          active.concat(inactive).each do |network_name|
+            libvirt_network = libvirt_client.lookup_network_by_name(
+              network_name)
+
+            # Parse ip address and netmask from the network xml description.
+            xml = Nokogiri::XML(libvirt_network.xml_desc)
+            ip = xml.xpath('/network/ip/@address').first
+            ip = ip.value if ip
+            netmask = xml.xpath('/network/ip/@netmask').first
+            netmask = netmask.value if netmask
+
+            if xml.at_xpath('//network/ip/dhcp')
+              dhcp_enabled = true
+            else
+              dhcp_enabled = false
+            end
+
+            # Calculate network address of network from ip address and
+            # netmask.
+            if ip && netmask
+              network_address = network_address(ip, netmask)
+            else
+              network_address = nil
+            end
+
+            libvirt_networks << {
+              name:             network_name,
+              ip_address:       ip,
+              netmask:          netmask,
+              network_address:  network_address,
+              dhcp_enabled:     dhcp_enabled,
+              bridge_name:      libvirt_network.bridge_name,
+              created:          true,
+              active:           libvirt_network.active?,
+              autostart:        libvirt_network.autostart?,
+              libvirt_network:  libvirt_network
+            }
+          end
+
+          libvirt_networks
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.14'
+    VERSION = '0.0.15'
   end
 end

data/vagrant-libvirt.gemspec

@@ -2,12 +2,12 @@
 require File.expand_path('../lib/vagrant-libvirt/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ['Lukas Stanek','Dima Vasilets']
-  gem.email         = ['ls@elostech.cz','pronix.service@gmail.com']
+  gem.authors       = ['Lukas Stanek','Dima Vasilets','Brian Pitts']
+  gem.email         = ['ls@elostech.cz','pronix.service@gmail.com','brian@polibyte.com']
   gem.license       = 'MIT'
   gem.description   = %q{Vagrant provider for libvirt.}
   gem.summary       = %q{Vagrant provider for libvirt.}
-  gem.homepage      = "https://github.com/pradels/vagrant-libvirt"
+  gem.homepage      = 'https://github.com/pradels/vagrant-libvirt'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -16,9 +16,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = VagrantPlugins::ProviderLibvirt::VERSION
 
-  gem.add_runtime_dependency 'fog', '1.15.0'
+  gem.add_runtime_dependency 'fog', '~> 1.15'
   gem.add_runtime_dependency 'ruby-libvirt', '~> 0.4.0'
-  gem.add_runtime_dependency 'nokogiri', '1.5.10'
+  gem.add_runtime_dependency 'nokogiri', '~> 1.5.9'
 
   gem.add_development_dependency 'rake'
 end

metadata

@@ -1,30 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Lukas Stanek
 - Dima Vasilets
+- Brian Pitts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: ruby-libvirt
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +44,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: 1.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: 1.5.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -71,6 +72,7 @@ description: Vagrant provider for libvirt.
 email:
 - ls@elostech.cz
 - pronix.service@gmail.com
+- brian@polibyte.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -93,6 +95,7 @@ files:
 - lib/vagrant-libvirt/action/create_networks.rb
 - lib/vagrant-libvirt/action/destroy_domain.rb
 - lib/vagrant-libvirt/action/destroy_networks.rb
+- lib/vagrant-libvirt/action/forward_ports.rb
 - lib/vagrant-libvirt/action/halt_domain.rb
 - lib/vagrant-libvirt/action/handle_box_image.rb
 - lib/vagrant-libvirt/action/handle_storage_pool.rb
@@ -104,6 +107,7 @@ files:
 - lib/vagrant-libvirt/action/message_not_running.rb
 - lib/vagrant-libvirt/action/message_not_suspended.rb
 - lib/vagrant-libvirt/action/prepare_nfs_settings.rb
+- lib/vagrant-libvirt/action/prepare_nfs_valid_ids.rb
 - lib/vagrant-libvirt/action/prune_nfs_exports.rb
 - lib/vagrant-libvirt/action/read_ssh_info.rb
 - lib/vagrant-libvirt/action/read_state.rb
@@ -128,7 +132,7 @@ files:
 - lib/vagrant-libvirt/util.rb
 - lib/vagrant-libvirt/util/collection.rb
 - lib/vagrant-libvirt/util/erb_template.rb
-- lib/vagrant-libvirt/util/libvirt_util.rb
+- lib/vagrant-libvirt/util/network_util.rb
 - lib/vagrant-libvirt/util/timer.rb
 - lib/vagrant-libvirt/version.rb
 - locales/en.yml

data/lib/vagrant-libvirt/util/libvirt_util.rb

@@ -1,64 +0,0 @@
-require 'nokogiri'
-require 'vagrant/util/network_ip'
-
-module VagrantPlugins
-  module ProviderLibvirt
-    module Util
-      module LibvirtUtil
-        include Vagrant::Util::NetworkIP
-
-        # Return a list of all (active and inactive) libvirt networks as a list
-        # of hashes with their name, network address and status (active or not)
-        def libvirt_networks(libvirt_client)
-          libvirt_networks = []
-
-          active = libvirt_client.list_networks
-          inactive = libvirt_client.list_defined_networks
-
-          # Iterate over all (active and inactive) networks.
-          active.concat(inactive).each do |network_name|
-            libvirt_network = libvirt_client.lookup_network_by_name(
-              network_name)
-
-            # Parse ip address and netmask from the network xml description.
-            xml = Nokogiri::XML(libvirt_network.xml_desc)
-            ip = xml.xpath('/network/ip/@address').first
-            ip = ip.value if ip
-            netmask = xml.xpath('/network/ip/@netmask').first
-            netmask = netmask.value if netmask
-
-            if xml.at_xpath('//network/ip/dhcp')
-              dhcp_enabled = true
-            else
-              dhcp_enabled = false
-            end
-
-            # Calculate network address of network from ip address and
-            # netmask.
-            if ip && netmask
-              network_address = network_address(ip, netmask)
-            else
-              network_address = nil
-            end
-
-            libvirt_networks << {
-              name:             network_name,
-              ip_address:       ip,
-              netmask:          netmask,
-              network_address:  network_address,
-              dhcp_enabled:     dhcp_enabled,
-              bridge_name:      libvirt_network.bridge_name,
-              created:          true,
-              active:           libvirt_network.active?,
-              autostart:        libvirt_network.autostart?,
-              libvirt_network:  libvirt_network
-            }
-          end
-
-          libvirt_networks
-        end
-
-      end
-    end
-  end
-end