vagrant-libvirt 0.0.41 → 0.0.42

data/spec/unit/templates/domain_defaults.xml

@@ -0,0 +1,46 @@
+<domain type='' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name></name>
+  <uuid></uuid>
+  <memory></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'/>
+  <devices>
+
+
+    <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>

data/spec/unit/templates/domain_spec.rb

@@ -0,0 +1,84 @@
+require 'support/sharedcontext'
+
+require 'vagrant-libvirt/config'
+require 'vagrant-libvirt/util/erb_template'
+
+describe 'templates/domain' do
+  include_context 'unit'
+
+  class DomainTemplateHelper < VagrantPlugins::ProviderLibvirt::Config
+    include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
+
+    def finalize!
+      super
+      @qargs = @qemu_args
+    end
+  end
+
+  let(:domain) { DomainTemplateHelper.new }
+  let(:xml_expected) { File.read(File.join(File.dirname(__FILE__), test_file)) }
+
+  context 'when only defaults used' do
+    let(:test_file) { 'domain_defaults.xml' }
+    it 'renders template' do
+      domain.finalize!
+      expect(domain.to_xml('domain')).to eq xml_expected
+    end
+  end
+
+  context 'when all settings enabled' do
+    before do
+      domain.instance_variable_set('@domain_type', 'kvm')
+      domain.cpu_mode = 'custom'
+      domain.cpu_feature(name: 'AAA', policy: 'required')
+      domain.cputopology(sockets: '1', cores: '3', threads: '2')
+      domain.machine_type = 'pc-compatible'
+      domain.machine_arch = 'x86_64'
+      domain.loader = '/efi/loader'
+      domain.boot('network')
+      domain.boot('cdrom')
+      domain.boot('hd')
+      domain.emulator_path = '/usr/bin/kvm-spice'
+      domain.instance_variable_set('@domain_volume_path', '/var/lib/libvirt/images/test.qcow2')
+      domain.instance_variable_set('@domain_volume_cache', 'unsafe')
+      domain.disk_bus = 'ide'
+      domain.disk_device = 'vda'
+      domain.storage(:file, path: 'test-disk1.qcow2')
+      domain.storage(:file, path: 'test-disk2.qcow2')
+      domain.disks.each do |disk|
+        disk[:absolute_path] = '/var/lib/libvirt/images/' + disk[:path]
+      end
+      domain.storage(:file, device: :cdrom)
+      domain.storage(:file, device: :cdrom)
+      domain.channel(type: 'unix',
+                     target_name: 'org.qemu.guest_agent.0',
+                     target_type: 'virtio')
+      domain.channel(type: 'spicevmc',
+                     target_name: 'com.redhat.spice.0',
+                     target_type: 'virtio')
+      domain.channel(type: 'unix',
+                     target_type: 'guestfwd',
+                     target_address: '192.0.2.42',
+                     target_port: '4242',
+                     source_path: '/tmp/foo')
+      domain.random(model: 'random')
+      domain.pci(bus: '0x06', slot: '0x12', function: '0x5')
+      domain.pci(bus: '0x03', slot: '0x00', function: '0x0')
+      domain.usb(bus: '1', device: '2', vendor: '0x1234', product: '0xabcd')
+      domain.redirdev(type: 'tcp', host: 'localhost', port: '4000')
+      domain.redirfilter(class: '0x0b', vendor: '0x08e6',
+                         product: '0x3437', version: '2.00', allow: 'yes')
+      domain.watchdog(model: 'i6300esb', action: 'reset')
+      domain.smartcard(mode: 'passthrough')
+      domain.tpm_path = '/dev/tpm0'
+
+      domain.qemuargs(value: '-device')
+      domain.qemuargs(value: 'dummy-device')
+    end
+    let(:test_file) { 'domain_all_settings.xml' }
+    it 'renders template' do
+      domain.finalize!
+      expect(domain.to_xml('domain')).to eq xml_expected
+    end
+  end
+end

data/tools/create_box.sh

@@ -0,0 +1,130 @@
+#!/usr/bin/env bash
+#set -xu
+
+error() {
+    local msg="${1}"
+    echo "==> ERROR: ${msg}"
+    exit 1
+}
+
+usage() {
+    echo "Usage: ${0} IMAGE [BOX] [Vagrantfile.add]"
+    echo
+    echo "Package a qcow2 image into a vagrant-libvirt reusable box"
+}
+
+# Print the image's backing file
+backing(){
+    local img=${1}
+    qemu-img info "$img" | grep 'backing file:' | cut -d ':' -f2
+}
+
+# Rebase the image
+rebase(){
+    local img=${1}
+    qemu-img rebase -p -b "" "$img"
+    [[ "$?" -ne 0 ]] && error "Error during rebase"
+}
+
+# Is absolute path
+isabspath(){
+    local path=${1}
+    [[ "$path" =~ ^/.* ]]
+}
+
+if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+    usage
+    exit 1
+fi
+
+IMG=$(readlink -e "$1")
+[[ "$?" -ne 0 ]] && error "'$1': No such image"
+
+IMG_DIR=$(dirname "$IMG")
+IMG_BASENAME=$(basename "$IMG")
+
+BOX=${2:-}
+# If no box name is supplied infer one from image name
+if [[ -z "$BOX" ]]; then
+    BOX_NAME=${IMG_BASENAME%.*}
+    BOX=$BOX_NAME.box
+else
+    BOX_NAME=$(basename "${BOX%.*}")
+fi
+
+[[ -f "$BOX" ]] && error "'$BOX': Already exists"
+
+CWD=$(pwd)
+TMP_DIR="$CWD/_tmp_package"
+TMP_IMG="$TMP_DIR/box.img"
+
+mkdir -p "$TMP_DIR"
+
+[[ ! -r "$IMG" ]] && error "'$IMG': Permission denied"
+
+if [ -n "$3" ] && [ -r "$3" ]; then
+  VAGRANTFILE_ADD="$(cat $3)"
+fi
+
+# We move / copy (when the image has master) the image to the tempdir
+# ensure that it's moved back / removed again
+if [[ -n $(backing "$IMG") ]]; then
+    echo "==> Image has backing image, copying image and rebasing ..."
+    trap "rm -rf $TMP_DIR" EXIT
+    cp "$IMG" "$TMP_IMG"
+    rebase "$TMP_IMG"
+else
+    if fuser -s "$IMG"; then
+        error "Image '$IMG_BASENAME' is used by another process"
+    fi
+
+    # move the image to get a speed-up and use less space on disk
+    trap 'mv "$TMP_IMG" "$IMG"; rm -rf "$TMP_DIR"' EXIT
+    mv "$IMG" "$TMP_IMG"
+fi
+
+cd "$TMP_DIR"
+
+#Using the awk int function here to truncate the virtual image size to an
+#integer since the fog-libvirt library does not seem to properly handle
+#floating point.
+IMG_SIZE=$(qemu-img info --output=json "$TMP_IMG" | awk '/virtual-size/{s=int($2)/(1024^3); print (s == int(s)) ? s : int(s)+1 }')
+
+echo "{$IMG_SIZE}"
+
+cat > metadata.json <<EOF
+{
+    "provider": "libvirt",
+    "format": "qcow2",
+    "virtual_size": ${IMG_SIZE}
+}
+EOF
+
+cat > Vagrantfile <<EOF
+Vagrant.configure("2") do |config|
+
+  config.vm.provider :libvirt do |libvirt|
+
+    libvirt.driver = "kvm"
+    libvirt.host = ""
+    libvirt.connect_via_ssh = false
+    libvirt.storage_pool_name = "default"
+
+  end
+
+${VAGRANTFILE_ADD:-}
+end
+EOF
+
+echo "==> Creating box, tarring and gzipping"
+
+tar cvzf "$BOX" -S --totals ./metadata.json ./Vagrantfile ./box.img
+
+# if box is in tmpdir move it to CWD before removing tmpdir
+if ! isabspath "$BOX"; then
+    mv "$BOX" "$CWD"
+fi
+
+echo "==> ${BOX} created"
+echo "==> You can now add the box:"
+echo "==>   'vagrant box add ${BOX} --name ${BOX_NAME}'"

data/tools/prepare_redhat_for_box.sh

@@ -0,0 +1,119 @@
+#!/bin/bash +x
+
+# This script should help to prepare RedHat and RedHat like OS (CentOS,
+# Scientific Linux, ...) for Vagrant box usage.
+
+# To create new box image, just install minimal base system in VM on top of not
+# fully allocated qcow2 image. Then upload this script to the VM and run it.
+# After script has finished, nothing else than halting machine should be done.
+
+# For more info about creating custom box refer to
+# https://github.com/vagrant-libvirt/vagrant-libvirt/tree/master/example_box
+
+# We need to set a hostname.
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <hostname>"
+    echo "Hostname should be in format vagrant-[os-name], e.g. vagrant-redhat63."
+    exit 1
+fi
+
+
+# On which version of RedHet are we running?
+RHEL_MAJOR_VERSION=$(sed 's/.*release \([0-9]\)\..*/\1/' /etc/redhat-release)
+if [ $? -ne 0 ]; then
+    echo "Is this a RedHat distro?"
+    exit 1
+fi
+echo "* Found RedHat ${RHEL_MAJOR_VERSION} version."
+
+
+# Setup hostname vagrant-something.
+FQDN="$1.vagrantup.com"
+if grep '^HOSTNAME=' /etc/sysconfig/network > /dev/null; then
+    sed -i 's/HOSTNAME=\(.*\)/HOSTNAME='${FQDN}'/' /etc/sysconfig/network
+else
+    echo "HOSTNAME=${FQDN}" >> /etc/sysconfig/network
+fi
+
+
+# Enable EPEL repository.
+yum -y install wget
+cd ~root
+if [ $RHEL_MAJOR_VERSION -eq 5 ]; then
+    wget http://ftp.astral.ro/mirrors/fedora/pub/epel/5/i386/epel-release-5-4.noarch.rpm
+    EPEL_PKG="epel-release-5-4.noarch.rpm"
+else
+    wget http://ftp.astral.ro/mirrors/fedora/pub/epel/6/i386/epel-release-6-8.noarch.rpm
+    EPEL_PKG="epel-release-6-8.noarch.rpm"
+fi
+rpm -i ~root/${EPEL_PKG}
+rm -f ~root/${EPEL_PKG}
+
+
+# Install some required software.
+yum -y install openssh-server openssh-clients sudo \
+ruby ruby-devel make gcc rubygems rsync
+chkconfig sshd on
+
+
+# Users, groups, passwords and sudoers.
+echo 'vagrant' | passwd --stdin root
+grep 'vagrant' /etc/passwd > /dev/null
+if [ $? -ne 0 ]; then
+    echo '* Creating user vagrant.'
+    useradd vagrant
+    echo 'vagrant' | passwd --stdin vagrant
+fi
+grep '^admin:' /etc/group > /dev/null || groupadd admin
+usermod -G admin vagrant
+
+echo 'Defaults    env_keep += "SSH_AUTH_SOCK"' >> /etc/sudoers
+echo '%admin ALL=NOPASSWD: ALL' >> /etc/sudoers
+sed -i 's/Defaults\s*requiretty/Defaults !requiretty/' /etc/sudoers
+
+
+# SSH setup
+# Add Vagrant ssh key for root and vagrant accouts.
+sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
+
+[ -d ~root/.ssh ] || mkdir ~root/.ssh
+chmod 700 ~root/.ssh
+cat > ~root/.ssh/authorized_keys << EOF
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
+EOF
+chmod 600 ~root/.ssh/authorized_keys
+
+[ -d ~vagrant/.ssh ] || mkdir ~vagrant/.ssh
+chmod 700 ~vagrant/.ssh
+cat > ~vagrant/.ssh/authorized_keys << EOF
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
+EOF
+chmod 600 ~vagrant/.ssh/authorized_keys
+
+
+# Disable firewall and switch SELinux to permissive mode.
+chkconfig iptables off
+chkconfig ip6tables off
+
+
+# Networking setup..
+# Don't fix ethX names to hw address.
+rm -f /etc/udev/rules.d/*persistent-net.rules
+rm -f /etc/udev/rules.d/*-net.rules
+rm -fr /var/lib/dhclient/*
+
+# Interface eth0 should get IP address via dhcp.
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
+DEVICE="eth0"
+BOOTPROTO="dhcp"
+ONBOOT="yes"
+NM_CONTROLLED="no"
+EOF
+
+
+# Do some cleanup..
+rm -f ~root/.bash_history
+rm -r "$(gem env gemdir)"/doc/*
+yum clean all
+
+halt

data/vagrant-libvirt.gemspec

@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+# stub: vagrant-libvirt 0.0.41 ruby lib
+require File.expand_path('../lib/vagrant-libvirt/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name = "vagrant-libvirt".freeze
+  s.version = VagrantPlugins::ProviderLibvirt::VERSION
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Lukas Stanek".freeze, "Dima Vasilets".freeze, "Brian Pitts".freeze]
+  s.files         = `git ls-files`.split($\)
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+
+  s.date = "2018-02-02"
+  s.description = "libvirt provider for Vagrant.".freeze
+  s.email = ["ls@elostech.cz".freeze, "pronix.service@gmail.com".freeze, "brian@polibyte.com".freeze]
+  s.homepage = "https://github.com/vagrant-libvirt/vagrant-libvirt".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.14".freeze
+  s.summary = "libvirt provider for Vagrant.".freeze
+
+  s.installed_by_version = "2.6.14" if s.respond_to? :installed_by_version
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec-core>.freeze, ["~> 3.5.0"])
+      s.add_development_dependency(%q<rspec-expectations>.freeze, ["~> 3.5.0"])
+      s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+      s.add_runtime_dependency(%q<fog-libvirt>.freeze, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<nokogiri>.freeze, [">= 1.6.0"])
+      s.add_runtime_dependency(%q<fog-core>.freeze, ["~> 1.43.0"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+    else
+      s.add_dependency(%q<rspec-core>.freeze, ["~> 3.5.0"])
+      s.add_dependency(%q<rspec-expectations>.freeze, ["~> 3.5.0"])
+      s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+      s.add_dependency(%q<fog-libvirt>.freeze, [">= 0.3.0"])
+      s.add_dependency(%q<nokogiri>.freeze, [">= 1.6.0"])
+      s.add_dependency(%q<fog-core>.freeze, ["~> 1.43.0"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec-core>.freeze, ["~> 3.5.0"])
+    s.add_dependency(%q<rspec-expectations>.freeze, ["~> 3.5.0"])
+    s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+    s.add_dependency(%q<fog-libvirt>.freeze, [">= 0.3.0"])
+    s.add_dependency(%q<nokogiri>.freeze, [">= 1.6.0"])
+    s.add_dependency(%q<fog-core>.freeze, ["~> 1.43.0"])
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - Lukas Stanek
@@ -118,7 +118,86 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files: []
-files: []
+files:
+- ".coveralls.yml"
+- ".github/issue_template.md"
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- example_box/README.md
+- example_box/Vagrantfile
+- example_box/metadata.json
+- lib/vagrant-libvirt.rb
+- lib/vagrant-libvirt/action.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/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
+- lib/vagrant-libvirt/action/is_created.rb
+- lib/vagrant-libvirt/action/is_running.rb
+- lib/vagrant-libvirt/action/is_suspended.rb
+- lib/vagrant-libvirt/action/message_already_created.rb
+- lib/vagrant-libvirt/action/message_not_created.rb
+- lib/vagrant-libvirt/action/message_not_running.rb
+- lib/vagrant-libvirt/action/message_not_suspended.rb
+- lib/vagrant-libvirt/action/message_will_not_destroy.rb
+- lib/vagrant-libvirt/action/package_domain.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_mac_addresses.rb
+- lib/vagrant-libvirt/action/remove_libvirt_image.rb
+- lib/vagrant-libvirt/action/remove_stale_volume.rb
+- lib/vagrant-libvirt/action/resume_domain.rb
+- lib/vagrant-libvirt/action/set_boot_order.rb
+- lib/vagrant-libvirt/action/set_name_of_domain.rb
+- lib/vagrant-libvirt/action/share_folders.rb
+- lib/vagrant-libvirt/action/start_domain.rb
+- lib/vagrant-libvirt/action/suspend_domain.rb
+- lib/vagrant-libvirt/action/wait_till_up.rb
+- lib/vagrant-libvirt/cap/mount_p9.rb
+- lib/vagrant-libvirt/cap/nic_mac_addresses.rb
+- lib/vagrant-libvirt/cap/synced_folder.rb
+- lib/vagrant-libvirt/config.rb
+- lib/vagrant-libvirt/driver.rb
+- lib/vagrant-libvirt/errors.rb
+- lib/vagrant-libvirt/plugin.rb
+- lib/vagrant-libvirt/provider.rb
+- lib/vagrant-libvirt/templates/default_storage_pool.xml.erb
+- lib/vagrant-libvirt/templates/domain.xml.erb
+- lib/vagrant-libvirt/templates/private_network.xml.erb
+- lib/vagrant-libvirt/templates/public_interface.xml.erb
+- lib/vagrant-libvirt/util.rb
+- lib/vagrant-libvirt/util/collection.rb
+- lib/vagrant-libvirt/util/erb_template.rb
+- lib/vagrant-libvirt/util/error_codes.rb
+- lib/vagrant-libvirt/util/network_util.rb
+- lib/vagrant-libvirt/util/timer.rb
+- lib/vagrant-libvirt/version.rb
+- locales/en.yml
+- spec/spec_helper.rb
+- spec/support/environment_helper.rb
+- spec/support/libvirt_context.rb
+- spec/support/sharedcontext.rb
+- spec/unit/action/destroy_domain_spec.rb
+- spec/unit/action/set_name_of_domain_spec.rb
+- spec/unit/action/wait_till_up_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/templates/domain_all_settings.xml
+- spec/unit/templates/domain_defaults.xml
+- spec/unit/templates/domain_spec.rb
+- tools/create_box.sh
+- tools/prepare_redhat_for_box.sh
+- vagrant-libvirt.gemspec
 homepage: https://github.com/vagrant-libvirt/vagrant-libvirt
 licenses:
 - MIT
@@ -143,4 +222,15 @@ rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: libvirt provider for Vagrant.
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/support/environment_helper.rb
+- spec/support/libvirt_context.rb
+- spec/support/sharedcontext.rb
+- spec/unit/action/destroy_domain_spec.rb
+- spec/unit/action/set_name_of_domain_spec.rb
+- spec/unit/action/wait_till_up_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/templates/domain_all_settings.xml
+- spec/unit/templates/domain_defaults.xml
+- spec/unit/templates/domain_spec.rb