vagrant-libvirt 0.4.0 → 0.5.3

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

@@ -0,0 +1,71 @@
+class ByteNumber < Numeric
+    def initialize(int)
+        @int = int
+    end
+
+    def to_s
+        @int.to_s
+    end
+
+    def to_i
+        @int
+    end
+
+    def to_f
+        @int.to_f
+    end
+
+    def to_B
+        to_i
+    end
+
+    def to_KB
+        _compute_unit_to_n_kilo(1)
+    end
+
+    def to_MB
+        _compute_unit_to_n_kilo(2)
+    end
+
+    def to_GB
+        _compute_unit_to_n_kilo(3)
+    end
+
+    def coerce(other)
+        to_i.coerce(other)
+    end
+
+    def <=>(other)
+        to_i <=> other
+    end
+
+    def +(other)
+        to_i + other
+    end
+
+    def -(other)
+        to_i - other
+    end
+
+    def *(other)
+        to_i * other
+    end
+
+    def /(other)
+        to_i / other
+    end
+
+    def pow(n)
+        self.class.new(to_i ** n)
+    end
+
+    def self.from_GB(value)
+        self.new(value*(1024**3))
+    end
+
+    private
+    def _compute_unit_to_n_kilo(n=0)
+        (to_f/(1024 ** n)).ceil
+    end
+end
+  

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

@@ -1,6 +1,15 @@
+require 'ipaddr'
 require 'nokogiri'
 require 'vagrant/util/network_ip'
 
+class IPAddr
+  def get_mask
+    if @addr
+      _to_string(@mask_addr)
+    end
+  end
+end
+
 module VagrantPlugins
   module ProviderLibvirt
     module Util
@@ -19,6 +28,7 @@ module VagrantPlugins
           management_network_pci_bus = env[:machine].provider_config.management_network_pci_bus
           management_network_pci_slot = env[:machine].provider_config.management_network_pci_slot
           management_network_domain = env[:machine].provider_config.management_network_domain
+          management_network_mtu = env[:machine].provider_config.management_network_mtu
           logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode"
 
           begin
@@ -70,6 +80,10 @@ module VagrantPlugins
             management_network_options[:domain_name] = management_network_domain
           end
 
+          unless management_network_mtu.nil?
+            management_network_options[:mtu] = management_network_mtu
+          end
+
           unless management_network_pci_bus.nil? and management_network_pci_slot.nil?
             management_network_options[:bus] = management_network_pci_bus
             management_network_options[:slot] = management_network_pci_slot
@@ -97,14 +111,18 @@ module VagrantPlugins
             # store type in options
             # use default values if not already set
             options = {
-              iface_type:  type,
-              netmask:      '255.255.255.0',
+              iface_type:   type,
+              netmask:      options[:network_address] ?
+                            IPAddr.new(options[:network_address]).get_mask :
+                            '255.255.255.0',
               dhcp_enabled: true,
               forward_mode: 'nat'
             }.merge(options)
 
             if options[:type].to_s == 'dhcp' && options[:ip].nil?
-              options[:network_name] = 'vagrant-private-dhcp'
+              options[:network_name] = options[:network_name] ?
+                                       options[:network_name] :
+                                       'vagrant-private-dhcp'
             end
 
             # add to list of networks to check

data/lib/vagrant-libvirt/version

@@ -1 +1 @@
-0.4.0
+0.5.3

data/locales/en.yml

@@ -72,6 +72,14 @@ en:
       no_storage_pool: |-
         No usable storage pool found! Please check if storage pool is
         created and available.
+      box_format_duplicate_volume: |-
+        Encountered a duplicate volume name '%{volume}' generated for disk '%{new_disk}', due to already allocated for disk '%{orig_disk}'.
+      box_format_missing_attribute: |-
+        Invalid box metadata, missing expected attribute: '%{attribute}'
+      bad_box_image: |-
+        Received error when query the box image details from '%{image}'.
+        Stdout: %{out}
+        Stderr: %{err}
       no_box_volume: |-
         Volume for box image is missing in storage pools. Try to run vagrant
         again, or check if storage volume is accessible.
@@ -92,10 +100,14 @@ en:
         Error: %{stderr}
       no_box_virtual_size: |-
         No image virtual size specified for box.
+      no_disk_virtual_size: |-
+        No image virtual size specified for disk with index %{disk_index}.
       no_box_format: |-
         No image format specified for box.
       wrong_box_format: |-
         Wrong image format specified for box.
+      wrong_disk_format: |-
+        Wrong image format specified for disk with index %{disk_index}.
       fog_libvirt_connection_error: |-
         Error while connecting to Libvirt: %{error_message}
       fog_create_volume_error: |-

data/spec/spec_helper.rb

@@ -31,5 +31,13 @@ require 'vagrant-libvirt'
 require 'support/environment_helper'
 require 'vagrant-spec/unit'
 
-RSpec.configure do |spec|
+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }
+
+RSpec.configure do |config|
+  # ensure that setting of LIBVIRT_DEFAULT_URI in the environment is not picked
+  # up directly by tests, instead they must set as needed. Some build envs will
+  # may have it set to 'qemu:///session'.
+  config.before(:suite) do
+    ENV.delete('LIBVIRT_DEFAULT_URI')
+  end
 end

data/spec/support/binding_proc.rb

@@ -0,0 +1,24 @@
+##
+# A simple extension of the Proc class that supports setting a custom binding
+# and evaluates everything in the Proc using the new binding.
+
+class ProcWithBinding < Proc
+  ##
+  # Set the binding for this instance
+
+  def apply_binding(bind, *args)
+    @binding = bind
+    instance_exec(*args, &self)
+  end
+
+  def method_missing(method, *args)
+    begin
+      method_from_binding = eval("method(#{method.inspect})", @binding)
+      return method_from_binding.call(*args)
+    rescue NameError
+      # fall through on purpose
+    end
+
+    super
+  end
+end

data/spec/support/matchers/have_file_content.rb

@@ -0,0 +1,63 @@
+require "rspec/expectations/version"
+#
+# Taken from https://github.com/cucumber/aruba/blob/main/lib/aruba/matchers/file/have_file_content.rb
+# with minor modifications
+#
+# @!method have_file_content(content)
+#   This matchers checks if <file> has content. `content` can be a string,
+#   regexp or an RSpec matcher.
+#
+#   @param [String, Regexp, Matcher] content
+#     Specifies the content of the file
+#
+#   @return [Boolean] The result
+#
+#     false:
+#     * if file does not exist
+#     * if file content is not equal string
+#     * if file content does not include regexp
+#     * if file content does not match the content specification
+#
+#     true:
+#     * if file content includes regexp
+#     * if file content is equal string
+#     * if file content matches the content specification
+#
+#   @example Use matcher with string
+#
+#     RSpec.describe do
+#       it { expect(file1).to have_file_content('a') }
+#     end
+#
+#   @example Use matcher with regexp
+#
+#     RSpec.describe do
+#       it { expect(file1).to have_file_content(/a/) }
+#     end
+#
+#   @example Use matcher with an RSpec matcher
+#
+#     RSpec.describe do
+#       it { expect(file1).to have_file_content(a_string_starting_with 'a') }
+#       it { expect(files1).to include a_file_having_content(a_string_starting_with 'a') }
+#     end
+RSpec::Matchers.define :have_file_content do |expected|
+  match do |actual|
+    next false unless File.exists?(actual)
+
+    @actual   = File.read(actual).chomp
+    @expected = if expected.is_a? String
+                  expected.chomp
+                else
+                  expected
+                end
+
+    values_match?(@expected, @actual)
+  end
+
+  diffable if expected.is_a? String
+
+  description { "have file content: #{description_of expected}" }
+end
+
+RSpec::Matchers.alias_matcher :a_file_having_content, :have_file_content

data/spec/unit/action/clean_machine_folder_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+require 'support/sharedcontext'
+
+require 'vagrant-libvirt/action/clean_machine_folder'
+
+describe VagrantPlugins::ProviderLibvirt::Action::CleanMachineFolder do
+  subject { described_class.new(app, env) }
+
+  include_context 'unit'
+
+  describe '#call' do
+    before do
+      FileUtils.touch(File.join(machine.data_dir, "box.meta"))
+    end
+
+    context 'with default options' do
+      it 'should verbosely remove the folder' do
+        expect(ui).to receive(:info).with('Deleting the machine folder')
+
+        expect(subject.call(env)).to be_nil
+
+        expect(File.exists?(machine.data_dir)).to eq(true)
+        expect(Dir.entries(machine.data_dir)).to match_array([".", ".."])
+      end
+    end
+
+    context 'when the data dir doesn\'t exist' do
+      before do
+        Dir.mktmpdir do |d|
+          # returns a temporary directory that has been already deleted when running
+          expect(machine).to receive(:data_dir).and_return(d.to_s).exactly(3).times
+        end
+      end
+
+      it 'should remove the folder' do
+        expect(ui).to receive(:info).with('Deleting the machine folder')
+
+        expect(subject.call(env)).to be_nil
+
+        expect(File.exists?(machine.data_dir)).to eq(true)
+        expect(Dir.entries(machine.data_dir)).to match_array([".", ".."])
+      end
+    end
+
+    context 'with quiet option enabled' do
+      subject { described_class.new(app, env, {:quiet => true}) }
+
+      it 'should quietly remove the folder' do
+        expect(ui).to_not receive(:info).with('Deleting the machine folder')
+
+        expect(subject.call(env)).to be_nil
+
+        expect(File.exists?(machine.data_dir)).to eq(true)
+        expect(Dir.entries(machine.data_dir)).to match_array([".", ".."])
+      end
+    end
+  end
+end

data/spec/unit/action/create_domain_spec.rb

@@ -15,7 +15,8 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
   let(:servers) { double('servers') }
   let(:volumes) { double('volumes') }
 
-  let(:storage_pool_xml) { File.read(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), test_file)) }
+  let(:domain_xml) { File.read(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), domain_xml_file)) }
+  let(:storage_pool_xml) { File.read(File.join(File.dirname(__FILE__), File.basename(__FILE__, '.rb'), storage_pool_xml_file)) }
   let(:libvirt_storage_pool) { double('storage_pool') }
 
   describe '#call' do
@@ -31,6 +32,12 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
 
       env[:domain_name] = "vagrant-test_default"
 
+      env[:box_volumes] = []
+      env[:box_volumes].push({
+        :path=>"/test/box.img",
+        :name=>"test_vagrant_box_image_1.1.1_0.img", 
+        :virtual_size=>5
+      })
       # should be ignored for system session and used for user session
       allow(Process).to receive(:uid).and_return(9999)
       allow(Process).to receive(:gid).and_return(9999)
@@ -38,12 +45,13 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
 
     context 'connection => qemu:///system' do
       context 'default pool' do
-        let(:test_file) { 'default_system_storage_pool.xml' }
+        let(:domain_xml_file) { 'default_domain.xml' }
+        let(:storage_pool_xml_file) { 'default_system_storage_pool.xml' }
 
         it 'should execute correctly' do
           expect(libvirt_client).to receive(:lookup_storage_pool_by_name).and_return(libvirt_storage_pool)
           expect(libvirt_storage_pool).to receive(:xml_desc).and_return(storage_pool_xml)
-          expect(servers).to receive(:create).and_return(machine)
+          expect(servers).to receive(:create).with(xml: domain_xml).and_return(machine)
           expect(volumes).to_not receive(:create) # additional disks only
 
           expect(subject.call(env)).to be_nil
@@ -72,6 +80,8 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
           end
 
           context 'volume create succeeded' do
+            let(:domain_xml_file) { 'additional_disks_domain.xml' }
+
             it 'should complete' do
               expect(libvirt_client).to receive(:lookup_storage_pool_by_name).and_return(libvirt_storage_pool)
               expect(libvirt_storage_pool).to receive(:xml_desc).and_return(storage_pool_xml)
@@ -83,7 +93,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
                   :pool_name   => "default",
                 )
               )
-              expect(servers).to receive(:create).and_return(machine)
+              expect(servers).to receive(:create).with(xml: domain_xml).and_return(machine)
 
               expect(subject.call(env)).to be_nil
             end
@@ -113,7 +123,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
       end
 
       context 'default pool' do
-        let(:test_file) { 'default_user_storage_pool.xml' }
+        let(:storage_pool_xml_file) { 'default_user_storage_pool.xml' }
 
         it 'should execute correctly' do
           expect(libvirt_client).to receive(:lookup_storage_pool_by_name).and_return(libvirt_storage_pool)

data/spec/unit/action/create_domain_spec/additional_disks_domain.xml

@@ -0,0 +1,54 @@
+<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name>vagrant-test_default</name>
+  <title></title>
+  <description>Source: /rootpath/Vagrantfile</description>
+  <uuid></uuid>
+  <memory>524288</memory>
+  <vcpu>1</vcpu>
+
+
+  <cpu mode='host-model'>
+      <model fallback='allow'></model>
+  </cpu>
+
+
+  <os>
+        <type>hvm</type>
+    <kernel></kernel>
+    <initrd></initrd>
+    <cmdline></cmdline>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='utc'>
+  </clock>
+  <devices>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2' cache='default'/>
+      <source file='/var/lib/libvirt/images/vagrant-test_default-vdb.qcow2'/>
+      <target dev='vdb' bus='virtio'/>
+    </disk>
+
+
+    <serial type='pty'>
+      <target port='0'/>
+    </serial>
+    <console type='pty'>
+      <target port='0'/>
+    </console>
+
+
+    <input type='mouse' bus='ps2'/>
+
+      <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'  />
+      <video>
+        <model type='cirrus' vram='9216' heads='1'/>
+      </video>
+
+
+  </devices>
+
+</domain>