vagrant-libvirt 0.0.4 → 0.0.5

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.0.5 (May 10, 2013)
+
+* Private networks support.
+* Creating new private networks if ip is specified and network is not
+  available.
+* Removing previously created networks, if there are no active connections.
+* Guest interfaces configuration.
+* Setting guest hostname (via `config.vm.hostname`).
+
 # 0.0.4 (May 5, 2013)
 
 * Bug fix in number of parameters for provisioner.

data/README.md

@@ -4,16 +4,19 @@ This is a [Vagrant](http://www.vagrantup.com) 1.1+ 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.4) is still a development one. Feedback is
+**Note:** Actual version (0.0.5) is still a development one. Feedback is
 welcome and can help a lot :-)
 
-## Features (Version 0.0.4)
+## Features (Version 0.0.5)
 
+* Controll local or remote Libvirt hypervisors.
 * Vagrant `up`, `destroy`, `suspend`, `resume`, `halt`, `ssh` and `provision` commands.
 * Upload box image (qcow2 format) to Libvirt storage pool.
 * Create volume as COW diff image for domains.
+* Create private networks.
 * Create and boot Libvirt domains.
 * SSH into domains.
+* Setup hostname and network interfaces.
 * Provision domains with any built-in Vagrant provisioner.
 * Minimal synced folder support via `rsync`.
 
@@ -31,7 +34,7 @@ installing, `vagrant up` and specify the `libvirt` provider. An example is shown
 $ vagrant plugin install vagrant-libvirt
 ```
 
-### Possible problems with plugin installation
+### Possible problems with plugin installation on Linux
 
 In case of problems with building nokogiri and ruby-libvirt gem, install
 missing development libraries for libxslt, libxml2 and libvirt.
@@ -57,24 +60,25 @@ want. This is just an example of Libvirt CentOS 6.4 box available:
 $ vagrant box add centos64 http://kwok.cz/centos64.box
 ```
 
-And then make a Vagrantfile that looks like the following, filling in
-your information where necessary.
+And then make a Vagrantfile that looks like the following, filling in your
+information where necessary. In example below, VM named test_vm is created from
+centos64 box and setup with 10.20.30.40 IP address.
 
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.define :test_vm do |test_vm|
     test_vm.vm.box = "centos64"
+    test_vm.vm.network :private_network, :ip => '10.20.30.40'
   end
 
   config.vm.provider :libvirt do |libvirt|
     libvirt.driver = "qemu"
-    libvirt.host = "example.com"
+    libvirt.host = "localhost"
     libvirt.connect_via_ssh = true
     libvirt.username = "root"
     libvirt.storage_pool_name = "default"
   end
 end
-
 ```
 
 ### Libvirt Configuration Options
@@ -93,6 +97,7 @@ This provider exposes quite a few provider-specific configuration options:
 
 * `memory` - Amount of memory in MBytes. Defaults to 512 if not set.
 * `cpus` - Number of virtual cpus. Defaults to 1 if not set.
+* `nested` - [Enable nested virtualization](https://github.com/torvalds/linux/blob/master/Documentation/virtual/kvm/nested-vmx.txt). Default is false.
 
 Specific domain settings can be set for each domain separately in multi-VM
 environment. Example below shows a part of Vagrantfile, where specific options
@@ -108,7 +113,7 @@ Vagrant.configure("2") do |config|
     end
   end
 
-  ...
+  # ...
 ```
 
 ## Create Project - Vagrant up
@@ -130,7 +135,7 @@ Vagrant goes through steps below when creating new project:
 
 1.	Connect to Libvirt localy or remotely via SSH.
 2.	Check if box image is available in Libvirt storage pool. If not, upload it to
-	remote Libvirt storage pool as new volume. 
+	remote Libvirt storage pool as new volume.
 3.	Create COW diff image of base box image for new Libvirt domain.
 4.	Create and start new domain on Libvirt host.
 5.	Check for DHCP lease from dnsmasq server.
@@ -140,9 +145,47 @@ Vagrant goes through steps below when creating new project:
 
 ## Networks
 
-Networking features in the form of `config.vm.network` are not supported right
-now. Support for private network is planned to be added in next release of
-provider.
+Networking features in the form of `config.vm.network` support private networks
+concept. No public network or port forwarding are supported in current version
+of provider.
+
+An examples of network interface definitions:
+
+```ruby
+  config.vm.define :test_vm1 do |test_vm1|
+    test_vm1.vm.network :private_network, :ip => '10.20.30.40'
+  end
+```
+
+In example below, one network interface is configured for VM test_vm1. After
+you run `vagrant up`, VM will be accessible on IP address 10.20.30.40. So if
+you install a web server via provisioner, you will be able to access your
+testing server on http://10.20.30.40 URL. But beware that this address is
+private to libvirt host only. It's not visible outside of the hypervisor box.
+
+If network 10.20.30.0/24 doesn't exist, provider will create it. By default
+created networks are NATed to outside world, so your VM will be able to connect
+to the internet (if hypervisor can). And by default, DHCP is offering addresses
+on newly created networks.
+
+### Private Network Options
+
+There is a way to pass specific options for libvirt provider when using
+`config.vm.network` to configure new network interface. Each parameter name
+starts with 'libvirt__' string. Here is a list of those options:
+
+* `:libvirt__network_name` - Name of libvirt network to connect to. By default,
+  network 'default' is used.
+* `:libvirt__netmask` - Used only together with `:ip` option. Default is
+  '255.255.255.0'.
+* `:libvirt__nat_interface` - Name of interface, where should network be
+  NATed. Used only when creating new network. By default, all physical
+  interfaces are used.
+* `:libvirt__isolated` - If network should be isolated - without NAT to outside.
+  Used only when creating new network. Default is set to false.
+* `:libvirt__dhcp_enabled` - If DHCP will offer addresses, or not. Used only
+  when creating new network. Default is true.
+* `:libvirt__adapter` - Number specifiyng sequence number of interface.
 
 ## Obtaining Domain IP Address
 

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

@@ -19,6 +19,7 @@ module VagrantPlugins
           # Gather some info about domain
           @name = env[:domain_name]
           @cpus = config.cpus
+          @nested = config.nested
           @memory_size = config.memory*1024
 
           # TODO get type from driver config option

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

@@ -1,12 +1,18 @@
 require 'log4r'
+require 'vagrant/util/network_ip'
+require 'vagrant/util/scoped_hash_override'
 
 module VagrantPlugins
   module Libvirt
     module Action
 
       # Create network interfaces for domain, before domain is running.
+      # Networks for connecting those interfaces should be already prepared.
       class CreateNetworkInterfaces
         include VagrantPlugins::Libvirt::Util::ErbTemplate
+        include VagrantPlugins::Libvirt::Util::LibvirtUtil
+        include Vagrant::Util::NetworkIP
+        include Vagrant::Util::ScopedHashOverride
 
         def initialize(app, env)
           @logger = Log4r::Logger.new("vagrant_libvirt::action::create_network_interfaces")
@@ -23,41 +29,59 @@ module VagrantPlugins
               :error_message => e.message
           end
 
-          # Setup list of interfaces before creating them
+          # Setup list of interfaces before creating them.
           adapters = []
 
           # Assign main interface for provisioning to first slot.
           # Use network 'default' as network for ssh connecting and
-          # machine provisioning. This should be maybe configurable in
-          # Vagrantfile in future.
-          adapters[0] = 'default'
-
+          # machine provisioning.
+          #
+          # TODO Network name with DHCP for first interface should be
+          # configurable.
+          adapters[0] = {
+            :network_name => 'default'
+          }
+
+          # Assign interfaces to slots.
           env[:machine].config.vm.networks.each do |type, options|
-            # Other types than bridged are not supported for now.
-            next if type != :bridged
-
-            network_name = 'default'
-            network_name = options[:bridge] if options[:bridge]
-
+            # Only private network is supported now. Port forwarding and public
+            # network are not supported via libvirt API, so they are not
+            # implemented in this provider.
+            next if type != :private_network
+
+            # 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' }.merge(options)
+
+            # TODO fill first ifaces with adapter option specified.
             if options[:adapter]
               if adapters[options[:adapter]]
                 raise Errors::InterfaceSlotNotAvailable
               end
 
-              adapters[options[:adapter].to_i] = network_name
+              free_slot = options[:adapter].to_i
             else
-              empty_slot = find_empty(adapters, start=1)
-              raise Errors::InterfaceSlotNotAvailable if empty_slot == nil
+              free_slot = find_empty(adapters, start=1)
+              raise Errors::InterfaceSlotNotAvailable if free_slot == nil
+            end
 
-              adapters[empty_slot] = network_name
-            end           
+            # We have slot for interface, fill it with interface configuration.
+            adapters[free_slot] = options
+            adapters[free_slot][:network_name] = interface_network(
+              env[:libvirt_compute].client, adapters[free_slot])
           end
 
-          # Create each interface as new domain device
-          adapters.each_with_index do |network_name, slot_number|
+          # Create each interface as new domain device.
+          adapters.each_with_index do |iface_configuration, slot_number|
             @iface_number = slot_number
-            @network_name = network_name
-            @logger.info("Creating network interface eth#{@iface_number}")
+            @network_name = iface_configuration[:network_name]
+
+            message = "Creating network interface eth#{@iface_number}"
+            message << " connected to network #{@network_name}."
+            @logger.info(message)
+
             begin
               domain.attach_device(to_xml('interface'))
             rescue => e
@@ -66,7 +90,40 @@ module VagrantPlugins
             end
           end
 
+          # Continue the middleware chain. 
           @app.call(env)
+
+          # Configure interfaces that user requested. Machine should be up and
+          # running now.
+          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.
+            next if slot_number == 0
+
+            network = {
+              :interface => slot_number,
+              #:mac => ...,
+            }
+
+            if options[:ip]
+              network = {
+                :type    => :static,
+                :ip      => options[:ip],
+                :netmask => options[:netmask],
+              }.merge(network)
+            else
+              network[:type] = :dhcp
+            end
+
+            networks_to_configure << network
+          end
+
+          env[:ui].info I18n.t("vagrant.actions.vm.network.configuring")
+          env[:machine].guest.capability(
+            :configure_networks, networks_to_configure)
         end
 
         private
@@ -77,9 +134,25 @@ module VagrantPlugins
           end
           return nil
         end
-      end
 
+        # Return network name according to interface options.
+        def interface_network(libvirt_client, options)
+          return options[:network_name] if options[:network_name]
+
+          # Get list of all (active and inactive) libvirt networks.
+          available_networks = libvirt_networks(libvirt_client)
+
+          if options[:ip]
+            address = network_address(options[:ip], options[:netmask])
+            available_networks.each do |network|
+              return network[:name] if address == network[:network_address]
+            end
+          end
+
+          # TODO Network default can be missing or named different.
+          return 'default'
+        end
+      end
     end
   end
 end
-

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

@@ -0,0 +1,277 @@
+require 'log4r'
+require 'vagrant/util/network_ip'
+require 'vagrant/util/scoped_hash_override'
+require 'ipaddr'
+
+module VagrantPlugins
+  module Libvirt
+    module Action
+      # Prepare all networks needed for domain connections.
+      class CreateNetworks
+        include Vagrant::Util::NetworkIP
+        include Vagrant::Util::ScopedHashOverride
+        include VagrantPlugins::Libvirt::Util::ErbTemplate
+        include VagrantPlugins::Libvirt::Util::LibvirtUtil
+
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant_libvirt::action::create_networks")
+          @app = app
+
+          @available_networks = []
+          @options = {}
+          @libvirt_client = env[:libvirt_compute].client
+        end
+
+        def call(env)
+
+          # Iterate over networks requested from config. If some network is not
+          # available, create it if possible. Otherwise raise an error.
+          env[:machine].config.vm.networks.each do |type, options|
+
+            # Get a list of all (active and inactive) libvirt networks. This
+            # list is used throughout this class and should be easier to
+            # process than libvirt API calls.
+            @available_networks = libvirt_networks(env[:libvirt_compute].client)
+
+            # Now, we support private networks only. 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
+
+            # Get options for this interface network. 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',
+            }.merge(@options)
+
+            # Prepare a hash describing network for this specific interface.
+            @interface_network = {
+              :name            => nil,
+              :ip_address      => nil,
+              :netmask         => @options[:netmask],
+              :network_address => nil,
+              :bridge_name     => nil,
+              :created         => false,
+              :active          => false,
+              :autostart       => false,
+              :libvirt_network => nil,
+            }
+
+            if @options[:ip]
+              handle_ip_option(env)
+            elsif @options[:network_name]
+              handle_network_name_option
+            else
+              # TODO Should be smarter than just using fixed 'default' string.
+              @interface_network = lookup_network_by_name('default')
+              if not @interface_network
+                raise Errors::NetworkNotAvailableError,
+                  :network_name => 'default'
+              end 
+            end
+
+            autostart_network if not @interface_network[:autostart]
+            activate_network if not @interface_network[:active]
+          end
+
+          @app.call(env)
+        end
+
+        private
+
+        # Return hash of network for specified name, or nil if not found.
+        def lookup_network_by_name(network_name)
+          @available_networks.each do |network|
+            return network if network[:name] == network_name
+          end
+          nil
+        end
+
+        # Return hash of network for specified bridge, or nil if not found.
+        def lookup_bridge_by_name(bridge_name)
+          @available_networks.each do |network|
+            return network if network[:bridge_name] == bridge_name
+          end
+          nil
+        end
+
+        # Handle only situations, when ip is specified. Variables @options and
+        # @available_networks should be filled before calling this function.
+        def handle_ip_option(env)
+          return if not @options[:ip]
+
+          net_address = network_address(@options[:ip], @options[:netmask])
+          @interface_network[:network_address] = net_address
+
+          # Set IP address of network (actually bridge). It will be used as
+          # gateway address for machines connected to this network.
+          net = IPAddr.new(net_address)
+          @interface_network[:ip_address] = net.to_range.begin.succ
+
+          # Is there an available network matching to configured ip
+          # address?
+          @available_networks.each do |available_network|
+            if available_network[:network_address] == \
+            @interface_network[:network_address]
+              @interface_network = available_network
+              break
+            end
+          end
+
+          if @options[:network_name]
+            if @interface_network[:created]
+              # Just check for mismatch error here - if name and ip from
+              # config match together.
+              if @options[:network_name] != @interface_network[:name]
+                raise Errors::NetworkNameAndAddressMismatch,
+                  :ip_address   => @options[:ip],
+                  :network_name => @options[:network_name]
+              end
+            else
+              # Network is not created, but name is set. We need to check,
+              # whether network name from config doesn't already exist.
+              if lookup_network_by_name @options[:network_name]
+                raise Errors::NetworkNameAndAddressMismatch,
+                  :ip_address   => @options[:ip],
+                  :network_name => @options[:network_name]
+              end
+
+              # Network with 'name' doesn't exist. Set it as name for new
+              # network.
+              @interface_network[:name] = @options[:network_name]
+            end 
+          end
+
+          # Do we need to create new network?
+          if not @interface_network[:created]
+
+            # TODO stop after some loops. Don't create infinite loops.
+
+            # Is name for new network set? If not, generate a unique one.
+            count = 0
+            while @interface_network[:name] == nil do
+
+              # Generate a network name.
+              network_name = env[:root_path].basename.to_s.dup
+              network_name << count.to_s
+              count += 1
+
+              # Check if network name is unique.
+              next if lookup_network_by_name(network_name)
+
+              @interface_network[:name] = network_name
+            end
+
+            # Generate a unique name for network bridge.
+            count = 0
+            while @interface_network[:bridge_name] == nil do
+              bridge_name = 'virbr'
+              bridge_name << count.to_s
+              count += 1
+
+              next if lookup_bridge_by_name(bridge_name)
+
+              @interface_network[:bridge_name] = bridge_name
+            end
+
+            # Create a private network.
+            create_private_network(env)
+          end
+        end
+
+        # Handle network_name option, if ip was not specified. Variables
+        # @options and @available_networks should be filled before calling this
+        # function.
+        def handle_network_name_option
+          return if @options[:ip] or not @options[:network_name]
+
+          @interface_network = lookup_network_by_name(@options[:network_name])
+          if not @interface_network
+            raise Errors::NetworkNotAvailableError,
+              :network_name => @options[:network_name]
+          end
+        end
+
+        def create_private_network(env)
+          @network_name = @interface_network[:name]
+          @network_bridge_name = @interface_network[:bridge_name]
+          @network_address = @interface_network[:ip_address]
+          @network_netmask = @interface_network[:netmask]
+
+          if @options[:isolated]
+            @network_forward_mode = false
+          else
+            @network_forward_mode = 'nat'
+
+            if @options[:nat_interface]
+              @network_nat_interface = @options[:nat_interface]
+            end
+          end
+
+          if @options[:dhcp_enabled]
+            # Find out DHCP addresses pool range.
+            network_address = "#{@interface_network[:network_address]}/"
+            network_address << "#{@interface_network[:netmask]}"
+            net = IPAddr.new(network_address)
+
+            # First is address of network, second is gateway. Start the range two
+            # addresses after network address.
+            # TODO Detect if this IP is not set on the interface.
+            start_address = net.to_range.begin.succ.succ
+
+            # Stop address must not be broadcast.
+            stop_address = net.to_range.end & IPAddr.new('255.255.255.254')
+
+            @network_dhcp_enabled = true
+            @network_range_start = start_address
+            @network_range_stop = stop_address
+          else
+            @network_dhcp_enabled = false
+          end
+
+          begin
+            @interface_network[:libvirt_network] = \
+              @libvirt_client.define_network_xml(to_xml('private_network'))
+          rescue => e
+            raise Errors::CreateNetworkError,
+              :error_message => e.message
+          end
+
+          created_networks_file = env[:machine].data_dir + 'created_networks'
+
+          message = "Saving information about created network "
+          message << "#{@interface_network[:name]}, "
+          message << "UUID=#{@interface_network[:libvirt_network].uuid} "
+          message << "to file #{created_networks_file}."
+          @logger.info(message)
+
+          File.open(created_networks_file, 'a') do |file|
+            file.puts @interface_network[:libvirt_network].uuid
+          end
+        end
+
+        def autostart_network
+          begin
+            @interface_network[:libvirt_network].autostart = true
+          rescue => e
+            raise Errors::AutostartNetworkError,
+              :error_message => e.message
+          end
+        end
+
+        def activate_network
+          begin
+            @interface_network[:libvirt_network].create
+          rescue => e
+            raise Errors::ActivateNetworkError,
+              :error_message => e.message
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,80 @@
+require 'log4r'
+require 'nokogiri'
+
+module VagrantPlugins
+  module Libvirt
+    module Action
+      # Destroy all networks created for this specific domain. Skip
+      # removing if network has still active connections.
+      class DestroyNetworks
+
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant_libvirt::action::destroy_networks")
+          @app = app
+        end
+
+        def call(env)
+          # If there were some networks created for this machine, in machines
+          # data directory, created_networks file holds UUIDs of each network.
+          created_networks_file = env[:machine].data_dir + 'created_networks'
+
+          # If created_networks file doesn't exist, there are no networks we
+          # need to remove.
+          return @app.call(env) if not File.exist?(created_networks_file)
+
+          # Iterate over each created network UUID and try to remove it.
+          created_networks = []
+          file = File.open(created_networks_file, 'r')
+          file.readlines.each do |network_uuid|
+            begin
+              libvirt_network = env[:libvirt_compute].client.lookup_network_by_uuid(
+                network_uuid)
+            rescue
+              next
+            end
+
+            # Maybe network doesn't exist anymore.
+            next if not libvirt_network
+
+            # Skip removing if network has still active connections.
+            xml = Nokogiri::XML(libvirt_network.xml_desc)
+            connections = xml.xpath('/network/@connections').first
+            if connections != nil
+              created_networks << network_uuid
+              next
+            end
+
+            # Shutdown network first.
+            begin
+              libvirt_network.destroy
+            rescue => e
+            end
+
+            # Undefine network.
+            begin
+              libvirt_network.undefine
+            rescue => e
+              raise Error::DestroyNetworkError,
+                :network_name  => libvirt_network.name,
+                :error_message => e.message
+            end
+          end
+          file.close
+
+          # Update status of created networks after removing some/all of them.
+          if created_networks.length > 0
+            File.open(created_networks_file, 'w') do |file|
+              created_networks.each do |network_uuid|
+                file.puts network_uuid
+              end
+            end
+          else
+            File.delete(created_networks_file)
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-libvirt/action.rb

@@ -20,9 +20,11 @@ module VagrantPlugins
               b2.use HandleBoxImage
               b2.use CreateDomainVolume
               b2.use CreateDomain
-              b2.use CreateNetworkInterfaces
 
               b2.use TimedProvision
+              b2.use CreateNetworks
+              b2.use CreateNetworkInterfaces
+              b2.use SetHostname
               b2.use StartDomain
               b2.use WaitTillUp
               b2.use SyncFolders
@@ -79,10 +81,8 @@ module VagrantPlugins
             b2.use Call, IsRunning do |env2, b3|
               next if !env2[:result]
 
-              # VM is running, halt it.. Cleanup running instance data. Now
-              # only IP address is stored.
+              # VM is running, halt it.
               b3.use HaltDomain
-              b3.use CleanupDataDir
             end
           end
         end
@@ -101,9 +101,7 @@ module VagrantPlugins
 
             b2.use ConnectLibvirt
             b2.use DestroyDomain
-
-            # Cleanup running instance data. Now only IP address is stored.
-            b2.use CleanupDataDir
+            b2.use DestroyNetworks
           end
         end
       end
@@ -262,13 +260,14 @@ module VagrantPlugins
       autoload :SetNameOfDomain, action_root.join("set_name_of_domain")
       autoload :CreateDomainVolume, action_root.join("create_domain_volume")
       autoload :CreateDomain, action_root.join("create_domain")
+      autoload :CreateNetworks, action_root.join("create_networks")
       autoload :CreateNetworkInterfaces, action_root.join("create_network_interfaces")
       autoload :DestroyDomain, action_root.join("destroy_domain")
+      autoload :DestroyNetworks, action_root.join("destroy_networks")
       autoload :StartDomain, action_root.join("start_domain")
       autoload :HaltDomain, action_root.join("halt_domain")
       autoload :SuspendDomain, action_root.join("suspend_domain")
       autoload :ResumeDomain, action_root.join("resume_domain")
-      autoload :CleanupDataDir, action_root.join("cleanup_data_dir")
       autoload :ReadState, action_root.join("read_state")
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
       autoload :TimedProvision, action_root.join("timed_provision")

data/lib/vagrant-libvirt/config.rb

@@ -25,6 +25,7 @@ module VagrantPlugins
       # Domain specific settings used while creating new domain.
       attr_accessor :memory
       attr_accessor :cpus
+      attr_accessor :nested
 
       def initialize
         @driver            = UNSET_VALUE
@@ -37,6 +38,7 @@ module VagrantPlugins
         # Domain specific settings.
         @memory            = UNSET_VALUE
         @cpus              = UNSET_VALUE
+        @nested            = UNSET_VALUE
       end
 
       def finalize!
@@ -50,6 +52,7 @@ module VagrantPlugins
         # Domain specific settings.
         @memory = 512 if @memory == UNSET_VALUE
         @cpus = 1 if @cpus == UNSET_VALUE
+        @nested = false if @nested == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-libvirt/errors.rb

@@ -74,6 +74,30 @@ module VagrantPlugins
         error_key(:interface_slot_not_available)
       end
 
+      class NetworkNameAndAddressMismatch < VagrantLibvirtError
+        error_key(:network_name_and_address_mismatch)
+      end
+
+      class CreateNetworkError < VagrantLibvirtError
+        error_key(:create_network_error)
+      end
+
+      class DestroyNetworkError < VagrantLibvirtError
+        error_key(:destroy_network_error)
+      end
+
+      class NetworkNotAvailableError < VagrantLibvirtError
+        error_key(:network_not_available_error)
+      end
+
+      class AutostartNetworkError < VagrantLibvirtError
+        error_key(:autostart_network_error)
+      end
+
+      class ActivateNetworkError < VagrantLibvirtError
+        error_key(:activate_network_error)
+      end
+
       class RsyncError < VagrantLibvirtError
         error_key(:rsync_error)
       end

data/lib/vagrant-libvirt/templates/domain.xml.erb

@@ -2,6 +2,14 @@
   <name><%= @name %></name>
   <memory><%= @memory_size %></memory>
   <vcpu><%= @cpus %></vcpu>
+
+  <% if @nested %>
+    <cpu match='exact'>
+      <model>core2duo</model>
+      <feature policy='require' name='vmx'/>
+    </cpu>
+  <% end %>
+
   <os>
     <type arch='x86_64'>hvm</type>
     <boot dev='hd'/>

data/lib/vagrant-libvirt/templates/private_network.xml.erb

@@ -0,0 +1,21 @@
+<network ipv6='yes'>
+  <name><%= @network_name %></name>
+  <bridge name="<%= @network_bridge_name %>" />
+
+  <% if @network_forward_mode != false %>
+    <% if @network_nat_interface %>
+  <forward mode="<%= @network_forward_mode %>" dev="<%= @network_nat_interface %>" />
+    <% else %>
+  <forward mode="<%= @network_forward_mode %>" />
+    <% end %>
+  <% end %>
+
+  <ip address="<%= @network_address %>" netmask="<%= @network_netmask %>">
+  <% if @network_dhcp_enabled  %>
+    <dhcp>
+      <range start="<%= @network_range_start %>" end="<%= @network_range_stop %>" />
+    </dhcp>
+  <% end %>
+  </ip>
+
+</network>

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

@@ -0,0 +1,57 @@
+require 'nokogiri'
+require 'vagrant/util/network_ip'
+
+module VagrantPlugins
+  module Libvirt
+    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
+
+            # Calculate network address of network from ip address and
+            # netmask.
+            if ip and 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,
+              :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/util.rb

@@ -4,6 +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'
     end
   end
 end

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Libvirt
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/locales/en.yml

@@ -101,6 +101,20 @@ en:
         Error while attaching new device to domain. %{error_message}
       no_ip_address_error: |-
         No IP address found.
+      network_name_and_address_mismatch: |-
+        Address %{ip_address} does not match with network name %{network_name}.
+        Please fix your configuration and run vagrant again.
+      create_network_error: |-
+        Error occured while creating new network: %{error_message}.
+      network_not_available_error: |-
+        Network %{network_name} is not available. Specify available network
+        name, or an ip address if you want to create a new network.
+      activate_network_error: |-
+        Error while activating network: %{error_message}.
+      autostart_network_error: |-
+        Error while setting up autostart on network: %{error_message}.
+      destroy_network_error: |-
+        Error while removing network %{network_name}. %{error_message}.
 
     states:
       short_paused: |-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -77,12 +77,13 @@ files:
 - example_box/metadata.json
 - lib/vagrant-libvirt.rb
 - lib/vagrant-libvirt/action.rb
-- lib/vagrant-libvirt/action/cleanup_data_dir.rb
 - lib/vagrant-libvirt/action/connect_libvirt.rb
 - lib/vagrant-libvirt/action/create_domain.rb
 - lib/vagrant-libvirt/action/create_domain_volume.rb
 - lib/vagrant-libvirt/action/create_network_interfaces.rb
+- 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/halt_domain.rb
 - lib/vagrant-libvirt/action/handle_box_image.rb
 - lib/vagrant-libvirt/action/handle_storage_pool.rb
@@ -109,10 +110,12 @@ files:
 - lib/vagrant-libvirt/templates/default_storage_pool.xml.erb
 - lib/vagrant-libvirt/templates/domain.xml.erb
 - lib/vagrant-libvirt/templates/interface.xml.erb
+- lib/vagrant-libvirt/templates/private_network.xml.erb
 - lib/vagrant-libvirt/templates/volume_snapshot.xml.erb
 - 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/timer.rb
 - lib/vagrant-libvirt/version.rb
 - locales/en.yml

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

@@ -1,22 +0,0 @@
-require 'log4r'
-
-module VagrantPlugins
-  module Libvirt
-    module Action
-      class CleanupDataDir
-        def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::cleanup_data_dir")
-          @app = app
-        end
-
-        def call(env)
-          # Remove file holding IP address
-          ip_file_path = env[:machine].data_dir + 'ip'
-          File.delete(ip_file_path) if File.exists?(ip_file_path)
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end