vagrant-libvirt 0.0.45 → 0.4.0

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

@@ -0,0 +1,23 @@
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Util
+      module Ui
+        # Since v2.2.8 Vagrant support --no-tty option, which silences
+        # progress bars and other interactive elements for cleaner logs
+        # in scripts, but requires a slight change in UI object handling.
+        # This helper allows the vagrant-libvirt plugin to stay compatible
+        # with the older Vagrant versions.
+        # See: https://github.com/hashicorp/vagrant/pull/11465/
+        def rewriting(ui)
+          if ui.respond_to?(:rewriting)
+            ui.rewriting {|rw| yield rw}
+          else
+            yield ui
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/vagrant-libvirt/version

@@ -0,0 +1 @@
+0.4.0

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,76 @@
+require 'open3'
+require 'tmpdir'
+
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.45'.freeze
+    VERSION_FILE = File.dirname(__FILE__) + "/version"
+
+    GIT_ARCHIVE_VERSION = "$Format:%H %D$"
+
+    HOMEPAGE = 'https://github.com/vagrant-libvirt/vagrant-libvirt'
+
+    def self.get_version
+      if File.exist?(VERSION_FILE)
+        # built gem
+        version = File.read(VERSION_FILE)
+      elsif self.inside_git_repository
+        # local repo
+        git_version = `git describe --tags`
+        version = self.version_from_describe(git_version)
+      elsif !GIT_ARCHIVE_VERSION.start_with?('$Format')
+        # archive - format string replaced during export
+        hash, refs = GIT_ARCHIVE_VERSION.split(' ', 2)
+
+        tag = refs.split(',').select { |ref| ref.strip.start_with?("tag:") }.first
+        if tag != nil
+          # tagged
+          version = tag.strip.split(' ').last
+        else
+          version = ""
+          # arbitrary branch/commit
+          Dir.mktmpdir do |dir|
+            stdout_and_stderr, status = Open3.capture2e("git -C #{dir} clone --bare #{HOMEPAGE}")
+            raise "failed to clone original to resolve version: #{stdout_and_stderr}" unless status.success?
+
+            stdout_and_stderr, status = Open3.capture2e("git --git-dir=#{dir}/vagrant-libvirt.git describe --tags #{hash}")
+            raise "failed to determine version for #{hash}: #{stdout_and_stderr}" unless status.success?
+
+            version = version_from_describe(stdout_and_stderr)
+          end
+
+          # in this case write the version file to avoid cloning a second time
+          File.write(VERSION_FILE, version)
+        end
+      else
+        # no idea
+        version = "9999"
+      end
+
+      return version.freeze
+    end
+
+    def self.write_version
+      File.write(VERSION_FILE, self.get_version)
+    end
+
+    private
+
+    def self.inside_git_repository
+      _, status = Open3.capture2e("git rev-parse --git-dir")
+
+      status.success?
+    end
+
+    def self.version_from_describe(describe)
+      version_parts = describe.split('-').first(2) # drop the git sha if it exists
+      if version_parts.length > 1
+        # increment the patch number so that this is marked as a pre-release of the
+        # next possible release
+        main_version_parts = Gem::Version.new(version_parts[0]).segments
+        main_version_parts[-1] = main_version_parts.last + 1
+        version_parts = main_version_parts + ["pre", version_parts[1]]
+      end
+      version = version_parts.join(".")
+    end
   end
 end

data/locales/en.yml

@@ -16,7 +16,7 @@ en:
       Created volume larger than box defaults, will require manual resizing of
       filesystems to utilize.
     uploading_volume: |-
-      Uploading base box image as volume into libvirt storage...
+      Uploading base box image as volume into Libvirt storage...
     creating_domain_volume: |-
       Creating image (snapshot of base box volume).
     removing_domain_volume: |-
@@ -60,7 +60,7 @@ en:
         Forwarding UDP ports is not supported. Ignoring.
 
     errors:
-      package_not_supported: No support for package with libvirt. Create box manually.
+      package_not_supported: No support for package with Libvirt. Create box manually.
       fog_error: |-
         There was an error talking to Libvirt. The error message is shown
         below:
@@ -97,7 +97,7 @@ en:
       wrong_box_format: |-
         Wrong image format specified for box.
       fog_libvirt_connection_error: |-
-        Error while connecting to libvirt: %{error_message}
+        Error while connecting to Libvirt: %{error_message}
       fog_create_volume_error: |-
         Error while creating a storage pool volume: %{error_message}
       fog_create_domain_volume_error: |-
@@ -108,11 +108,11 @@ en:
         Name `%{domain_name}` of domain about to create is already taken. Please try to run
         `vagrant up` command again.
       creating_storage_pool_error: |-
-        There was error while creating libvirt storage pool: %{error_message}
-      creating_volume_error: |-
-        There was error while creating libvirt volume: %{error_message}
+        There was error while creating Libvirt storage pool: %{error_message}
       image_upload_error: |-
         Error while uploading image to storage pool: %{error_message}
+      image_download_error: |-
+        Error while downloading volume '%{volume_name}' from storage pool '%{pool_name}': %{error_message}
       no_domain_error: |-
         No domain found. %{error_message}
       attach_device_error: |-

data/spec/spec_helper.rb

@@ -1,5 +1,31 @@
-require 'coveralls'
-Coveralls.wear!
+require 'simplecov'
+require 'simplecov-lcov'
+
+# patch simplecov configuration
+if ! SimpleCov::Configuration.method_defined? :branch_coverage?
+  module SimpleCov
+    module Configuration
+      def branch_coverage?
+        return false
+      end
+    end
+  end
+end
+
+SimpleCov::Formatter::LcovFormatter.config do |config|
+  config.report_with_single_file = true
+  config.single_report_path = 'coverage/lcov.info'
+end
+
+SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(
+  [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::LcovFormatter,
+  ]
+)
+SimpleCov.start do
+  add_filter 'spec/'
+end
 
 require 'vagrant-libvirt'
 require 'support/environment_helper'

data/spec/support/libvirt_context.rb

@@ -7,6 +7,7 @@ shared_context 'libvirt' do
   let(:id)              { 'dummy-vagrant_dummy'     }
   let(:connection)      { double('connection') }
   let(:domain)          { double('domain') }
+  let(:logger)          { double('logger') }
 
   def connection_result(options = {})
     result = options.fetch(:result, nil)
@@ -25,6 +26,7 @@ shared_context 'libvirt' do
     # return some information for domain when needed
     allow(domain).to receive(:mac).and_return('9C:D5:53:F1:5A:E7')
 
-    machine.stub(id: id)
+    allow(machine).to receive(:id).and_return(id)
+    allow(Log4r::Logger).to receive(:new).and_return(logger)
   end
 end

data/spec/support/sharedcontext.rb

@@ -3,10 +3,14 @@ require 'spec_helper'
 shared_context 'unit' do
   include_context 'vagrant-unit'
 
+  let(:vagrantfile_providerconfig) { '' }
   let(:vagrantfile) do
     <<-EOF
     Vagrant.configure('2') do |config|
       config.vm.define :test
+      config.vm.provider :libvirt do |libvirt|
+        #{vagrantfile_providerconfig}
+      end
     end
     EOF
   end
@@ -17,7 +21,7 @@ shared_context 'unit' do
   end
   let(:env)              { { env: iso_env, machine: machine, ui: ui, root_path: '/rootpath' } }
   let(:conf)             { Vagrant::Config::V2::DummyConfig.new }
-  let(:ui)               { Vagrant::UI::Basic.new }
+  let(:ui)               { Vagrant::UI::Silent.new }
   let(:iso_env)          { test_env.create_vagrant_env ui_class: Vagrant::UI::Basic }
   let(:machine)          { iso_env.machine(:test, :libvirt) }
   # Mock the communicator to prevent SSH commands for being executed.
@@ -28,7 +32,7 @@ shared_context 'unit' do
   let(:plugin)           { register_plugin }
 
   before (:each) do
-    machine.stub(guest: guest)
-    machine.stub(communicator: communicator)
+    allow(machine).to receive(:guest).and_return(guest)
+    allow(machine).to receive(:communicator).and_return(communicator)
   end
 end

data/spec/unit/action/create_domain_spec.rb

@@ -0,0 +1,160 @@
+require 'spec_helper'
+require 'support/sharedcontext'
+require 'support/libvirt_context'
+
+require 'vagrant-libvirt/errors'
+require 'vagrant-libvirt/action/create_domain'
+
+describe VagrantPlugins::ProviderLibvirt::Action::CreateDomain do
+  subject { described_class.new(app, env) }
+
+  include_context 'unit'
+  include_context 'libvirt'
+
+  let(:libvirt_client) { double('libvirt_client') }
+  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(:libvirt_storage_pool) { double('storage_pool') }
+
+  describe '#call' do
+    before do
+      allow_any_instance_of(VagrantPlugins::ProviderLibvirt::Driver)
+        .to receive(:connection).and_return(connection)
+      allow(connection).to receive(:client).and_return(libvirt_client)
+
+      allow(connection).to receive(:servers).and_return(servers)
+      allow(connection).to receive(:volumes).and_return(volumes)
+
+      allow(logger).to receive(:info)
+
+      env[:domain_name] = "vagrant-test_default"
+
+      # 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)
+    end
+
+    context 'connection => qemu:///system' do
+      context 'default pool' do
+        let(:test_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(volumes).to_not receive(:create) # additional disks only
+
+          expect(subject.call(env)).to be_nil
+        end
+
+        context 'additional disks' do
+          let(:vagrantfile) do
+            <<-EOF
+            Vagrant.configure('2') do |config|
+              config.vm.define :test
+              config.vm.provider :libvirt do |libvirt|
+                libvirt.storage :file, :size => '20G'
+              end
+            end
+            EOF
+          end
+
+          context 'volume create failed' do
+            it 'should raise an exception' 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(volumes).to receive(:create).and_raise(Libvirt::Error)
+
+              expect{ subject.call(env) }.to raise_error(VagrantPlugins::ProviderLibvirt::Errors::FogCreateDomainVolumeError)
+            end
+          end
+
+          context 'volume create succeeded' do
+            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)
+              expect(volumes).to receive(:create).with(
+                hash_including(
+                  :path        => "/var/lib/libvirt/images/vagrant-test_default-vdb.qcow2",
+                  :owner       => 0,
+                  :group       => 0,
+                  :pool_name   => "default",
+                )
+              )
+              expect(servers).to receive(:create).and_return(machine)
+
+              expect(subject.call(env)).to be_nil
+            end
+          end
+        end
+      end
+
+      context 'no default pool' do
+        it 'should raise an exception' do
+          expect(libvirt_client).to receive(:lookup_storage_pool_by_name).and_return(nil)
+
+          expect{ subject.call(env) }.to raise_error(VagrantPlugins::ProviderLibvirt::Errors::NoStoragePool)
+        end
+      end
+    end
+
+    context 'connection => qemu:///session' do
+      let(:vagrantfile) do
+        <<-EOF
+        Vagrant.configure('2') do |config|
+          config.vm.define :test
+          config.vm.provider :libvirt do |libvirt|
+            libvirt.qemu_use_session = true
+          end
+        end
+        EOF
+      end
+
+      context 'default pool' do
+        let(:test_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)
+          expect(libvirt_storage_pool).to receive(:xml_desc).and_return(storage_pool_xml)
+          expect(servers).to receive(:create).and_return(machine)
+
+          expect(subject.call(env)).to be_nil
+        end
+
+        context 'additional disks' do
+          let(:vagrantfile) do
+            <<-EOF
+            Vagrant.configure('2') do |config|
+              config.vm.define :test
+              config.vm.provider :libvirt do |libvirt|
+                libvirt.qemu_use_session = true
+                libvirt.storage :file, :size => '20G'
+              end
+            end
+            EOF
+          end
+
+          context 'volume create succeeded' do
+            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)
+              expect(volumes).to receive(:create).with(
+                hash_including(
+                  :path        => "/var/lib/libvirt/images/vagrant-test_default-vdb.qcow2",
+                  :owner       => 9999,
+                  :group       => 9999,
+                  :pool_name   => "default",
+                )
+              )
+              expect(servers).to receive(:create).and_return(machine)
+
+              expect(subject.call(env)).to be_nil
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+<pool type='dir'>
+  <name>default</name>
+  <uuid>434e1b75-4a72-45d7-8a98-ebd90c125d22</uuid>
+  <capacity unit='bytes'>10737418240</capacity>
+  <allocation unit='bytes'>10737418240</allocation>
+  <available unit='bytes'>10737418240</available>
+  <source>
+  </source>
+  <target>
+    <path>/var/lib/libvirt/images</path>
+    <permissions>
+      <mode>0755</mode>
+      <owner>0</owner>
+      <group>0</group>
+    </permissions>
+  </target>
+</pool>

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

@@ -0,0 +1,17 @@
+<pool type='dir'>
+  <name>default</name>
+  <uuid>434e1b75-4a72-45d7-8a98-ebd90c125d22</uuid>
+  <capacity unit='bytes'>10737418240</capacity>
+  <allocation unit='bytes'>10737418240</allocation>
+  <available unit='bytes'>10737418240</available>
+  <source>
+  </source>
+  <target>
+    <path>/var/lib/libvirt/images</path>
+    <permissions>
+      <mode>0755</mode>
+      <owner>0</owner>
+      <group>0</group>
+    </permissions>
+  </target>
+</pool>

data/spec/unit/action/destroy_domain_spec.rb

@@ -33,7 +33,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::DestroyDomain do
       before do
         allow(libvirt_domain).to receive(:list_snapshots).and_return([])
         allow(libvirt_domain).to receive(:has_managed_save?).and_return(nil)
-        root_disk.stub(name: 'test.img')
+        allow(root_disk).to receive(:name).and_return('test.img')
       end
 
       context 'when only has root disk' do
@@ -57,7 +57,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::DestroyDomain do
 
         let(:extra_disk) { double('libvirt_extra_disk') }
         before do
-          extra_disk.stub(name: 'test-vdb.qcow2')
+          allow(extra_disk).to receive(:name).and_return('test-vdb.qcow2')
         end
 
         it 'destroys disks individually' do