vagrant-ovirt4 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a27827fdc957c72739e7370205f87421bdc11bb2
-  data.tar.gz: 696f0b8fa78127ca5ff3822b3f5ed1308118c9d8
+  metadata.gz: 98f8665c91ae33cacd1b23a01fde88fd161d70ca
+  data.tar.gz: e75f2ccf4c185fd9f81d0051faa0e531a24028cb
 SHA512:
-  metadata.gz: cec6cf0493c478586ae46a5d4206908763e5ad1689b511afce420216f25e5eaf712f2d94b471bd7bdc5c35806f77da6a296fe4ae4ea9ac71675bd99241c07bb4
-  data.tar.gz: 7a03e6879022c4f263c46e42ae2accc102726830d7b5349159e7f30d32ada547c03188ea06757c347efac169cd144f7242f7aabb0b6d66a177fc7a32f416ac86
+  metadata.gz: e627217298b55312ca32b2f37bf0eba8e1aec5690c4cb70a057000c755cf15cc3d3004fa86af1cba7f196fa6c5c79e3ed2d6b2b073ebaf6654a1fda4da89371a
+  data.tar.gz: 9c3713a833df38fc8eeb47aee1bdd8d122755a5daa3ec0e1529f523cddd52b209ac3a47c7b2779bc26d197b393221c837f5daf50dabc213b427adf8f7fd99666

data/.gitignore

@@ -7,3 +7,4 @@
 *.gem
 /manifests
 hiera.yaml
+.kitchen

data/.kitchen.yml

@@ -0,0 +1,43 @@
+driver:
+  name: vagrant
+  vagrantfile_erb: templates/Vagrantfile.erb
+  provider: ovirt4
+
+verifier:
+  name: inspec
+  format: doc
+
+platforms:
+  - name: centos7
+    driver_plugin: vagrant
+    driver_config:
+      customize:
+        memory_size: 1024 MB
+        url: <%= ENV['OVIRT_URL'] %>
+        insecure: true
+        username: <%= ENV['OVIRT_USERNAME'] %>
+        password: <%= ENV['OVIRT_PASSWORD'] %>
+        cluster: Default
+        debug: true
+      box: ovirt4
+      box_url: https://github.com/myoung34/vagrant-ovirt4/blob/master/example_box/dummy.box?raw=true
+
+suites:
+  - name: singleton-static_network
+    driver_config:
+      vm_hostname: static
+      customize:
+        template: vagrant-centos7
+      network:
+        - ["private_network", {ovirt__ip: <%= "192.168.2.254" %>, ovirt__network_name: 'ovirtmgmt', ovirt__gateway: 192.168.2.1, ovirt__netmask: 255.255.255.0, ovirt__dns_servers: 192.168.2.1}]
+  - name: dynamic_network
+    driver_config:
+      vm_hostname: dynamic
+      network:
+        - ["private_network", {ovirt__network_name: 'ovirtmgmt'}]
+      customize:
+        template: vagrant-centos7
+        cloud_init: |
+          runcmd:
+            - ifdown eth0
+            - service network restart

data/Dockerfile

@@ -0,0 +1,11 @@
+FROM ruby:2.2.6
+ARG jenkins_uid=997
+ARG jenkins_gid=994
+ENV JENKINS_UID=$jenkins_uid
+ENV JENKINS_GID=$jenkins_gid
+RUN apt-get update && apt-get install -y sudo
+RUN groupadd -g $JENKINS_GID  jenkins
+RUN useradd jenkins -u $JENKINS_UID -g $JENKINS_GID --shell /bin/bash --create-home
+RUN echo '%jenkins ALL=NOPASSWD: ALL' >> /etc/sudoers
+RUN chown -R :jenkins /usr/local/bundle /usr/local/bin
+USER jenkins

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 group :development do
-  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git'
+  gem 'vagrant', :git => 'git://github.com/myoung34/vagrant.git'
   gem 'pry'
   gem 'byebug'
   gem 'pry-byebug'
@@ -11,6 +11,10 @@ group :testing do
   gem 'rspec-its'
   gem 'rspec'
   gem 'rake'
+  gem 'kitchen-vagrant'
+  gem 'kitchen-inspec'
+  gem 'test-kitchen'
+  gem 'net-scp', "~>1.2"
 end
 
 group :plugins do

data/Gemfile.lock

@@ -1,15 +1,15 @@
 GIT
-  remote: git://github.com/mitchellh/vagrant.git
-  revision: b223380c86680a0a22caa7c288055411faa4a072
+  remote: git://github.com/myoung34/vagrant.git
+  revision: 4572267c33f4ba569f68ad4bff026e9a7ef63b56
   specs:
-    vagrant (1.9.2.dev)
+    vagrant (1.9.3.dev)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
       i18n (>= 0.6.0, <= 0.8.0)
       listen (~> 3.1.5)
       log4r (~> 1.1.9, < 1.1.11)
-      net-scp (~> 1.1.0)
+      net-scp (~> 1.2.0)
       net-sftp (~> 2.1)
       net-ssh (~> 3.0.1)
       nokogiri (= 1.6.7.1)
@@ -24,22 +24,30 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-ovirt4 (1.1.0)
+    vagrant-ovirt4 (1.2.0)
       filesize (~> 0)
-      ovirt-engine-sdk (~> 4.0, >= 4.0.6)
+      ovirt-engine-sdk (~> 4.0.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    artifactory (2.7.0)
+    blankslate (2.1.2.4)
     builder (3.2.3)
     byebug (9.0.6)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.1)
     diff-lcs (1.3)
-    domain_name (0.5.20161129)
+    docker-api (1.33.2)
+      excon (>= 0.38.0)
+      json
+    domain_name (0.5.20170223)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
+    excon (0.55.0)
+    faraday (0.11.0)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.17)
     filesize (0.1.1)
     gssapi (1.2.0)
@@ -47,11 +55,35 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashicorp-checkpoint (0.1.4)
+    hashie (3.5.5)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (0.8.0)
+    inspec (1.15.0)
+      faraday (>= 0.9.0)
+      hashie (~> 3.4)
+      json (>= 1.8, < 3.0)
+      method_source (~> 0.8)
+      mixlib-log
+      parallel (~> 1.9)
+      pry (~> 0)
+      rainbow (~> 2)
+      rspec (~> 3)
+      rspec-its (~> 1.2)
+      rspec_junit_formatter (~> 0.2.3)
+      rubyzip (~> 1.1)
+      sslshake (~> 1)
+      thor (~> 0.19)
+      toml (~> 0.1)
+      train (>= 0.22.0, < 1.0)
     json (2.0.3)
+    kitchen-inspec (0.17.0)
+      hashie (~> 3.4)
+      inspec (>= 0.34.0, < 2.0.0)
+      test-kitchen (~> 1.6)
+    kitchen-vagrant (1.0.2)
+      test-kitchen (~> 1.4)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -66,18 +98,32 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.0.0)
+    mixlib-install (2.1.12)
+      artifactory
+      mixlib-shellout
+      mixlib-versioning
+      thor
+    mixlib-log (1.7.1)
+    mixlib-shellout (2.2.7)
+    mixlib-versioning (1.1.0)
     multi_json (1.12.1)
-    net-scp (1.1.2)
+    multipart-post (2.0.0)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (3.0.2)
+    net-ssh-gateway (1.3.0)
+      net-ssh (>= 2.6.5)
     netrc (0.11.0)
     nokogiri (1.6.7.1)
       mini_portile2 (~> 2.0.0.rc2)
     nori (2.6.0)
-    ovirt-engine-sdk (4.1.2)
+    ovirt-engine-sdk (4.0.12)
       json
+    parallel (1.10.0)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -85,13 +131,14 @@ GEM
     pry-byebug (3.4.0)
       byebug (~> 9.0)
       pry (~> 0.10)
+    rainbow (2.2.1)
     rake (0.9.6)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.4)
       ffi (>= 0.5.0)
-    rest-client (2.0.0)
+    rest-client (2.0.1)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -111,10 +158,34 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
     ruby_dep (1.3.1)
     rubyntlm (0.6.1)
     rubyzip (1.2.1)
+    safe_yaml (1.0.4)
     slop (3.6.0)
+    sslshake (1.0.13)
+    test-kitchen (1.15.0)
+      mixlib-install (>= 1.2, < 3.0)
+      mixlib-shellout (>= 1.2, < 3.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-gateway (~> 1.2)
+      safe_yaml (~> 1.0)
+      thor (~> 0.18)
+    thor (0.19.4)
+    toml (0.1.2)
+      parslet (~> 1.5.0)
+    train (0.22.1)
+      docker-api (~> 1.26)
+      json (>= 1.8, < 3.0)
+      mixlib-shellout (~> 2.0)
+      net-scp (~> 1.2)
+      net-ssh (>= 2.9, < 5.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
@@ -142,11 +213,15 @@ PLATFORMS
 
 DEPENDENCIES
   byebug
+  kitchen-inspec
+  kitchen-vagrant
+  net-scp (~> 1.2)
   pry
   pry-byebug
   rake
   rspec
   rspec-its
+  test-kitchen
   vagrant!
   vagrant-ovirt4!
 

data/Jenkinsfile

@@ -0,0 +1,70 @@
+#!/usr/bin/env groovy
+node {
+  stage('Checkout') {
+    checkout scm
+  }
+
+  // Run as many tests as possible in parallel.
+  String[] vagrantVersions = ["1.9.1", "1.9.2"]
+  stage('Test') {
+
+    def buildJobs = [:]
+
+    buildJobs["rspec"] = {
+      docker.build("jenkins/ruby:2.2.6").inside('-v /opt/gemcache:/opt/gemcache') {
+        sh """#!/bin/bash -ex
+          bundle install --path /opt/gemcache
+          bundle exec rspec
+        """
+      }
+    }
+
+    for (int i = 0; i < vagrantVersions.length; i++) {
+      def index = i //if we tried to use i below, it would equal 4 in each job execution.
+      def vagrantVersion = vagrantVersions[index]
+
+      buildJobs["vagrant-${vagrantVersion}"] = {
+
+        docker.image("myoung34/vagrant:${vagrantVersion}").inside('-v /opt/gemcache:/opt/gemcache') {
+          sh """#!/bin/bash -ex
+            temp_dir="/tmp/\$(cat /proc/sys/kernel/random/uuid)"
+            cp -r \$(pwd) \$temp_dir
+            cd \$temp_dir
+            gem build *.gemspec
+            /usr/bin/vagrant plugin install *.gem
+            bundle install --path /opt/gemcache --without development plugins
+            export VAGRANT_VERSION=\$(echo ${vagrantVersion} | sed 's/\\.//g')
+            bundle exec kitchen test ^[^singleton-]
+          """
+        }
+
+      }
+    }
+
+    parallel( buildJobs )
+  }
+
+  for (int i = 0; i < vagrantVersions.length; i++) {
+    def index = i //if we tried to use i below, it would equal 4 in each job execution.
+    def vagrantVersion = vagrantVersions[index]
+
+
+    stage("singleton vagrant-${vagrantVersion}") {
+      docker.image("myoung34/vagrant:${vagrantVersion}").inside('-v /opt/gemcache:/opt/gemcache') {
+        sh """#!/bin/bash -ex
+          gem build *.gemspec
+          /usr/bin/vagrant plugin install *.gem
+          bundle install --path /opt/gemcache --without development plugins
+          bundle exec kitchen destroy all
+          rm -rf .kitchen
+          export VAGRANT_VERSION=\$(echo ${vagrantVersion} | sed 's/\\.//g')
+          bundle exec kitchen test ^singleton-
+        """
+      }
+    }
+  }
+    
+  stage("Cleanup") {
+    deleteDir()
+  }
+}

data/README.md

@@ -121,6 +121,25 @@ end
   1. `placement_host` => The host to start the VM on. Optional.
 
 
+## Testing
+
+Currently pull-requests are tested via [test-kitchen using kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant).
+See [Jenkinsfile](Jenkinsfile) for more information. 
+If you'd like to run them yourself, however, they make not work in all setups. For example they assume `192.168.2.0/24`, host pinning will probably not have a host that's in all set ups, and the template names might not match.
+
+To run Unit tests: `bundle install; bundle exec rspec`
+
+To run acceptance tests:
+
+```bash
+export OVIRT_URL='https://yoururl/ovirt-engine/api''
+export OVIRT_USERNAME='yourname@internal'
+export OVIRT_PASSWORD='yourpassword!'
+gem build *.gemspec
+vagrant plugin install *.gem
+bundle exec kitchen test all
+```
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'rspec/core/rake_task'
+require 'kitchen/rake_tasks'
 
 # Immediately sync all stdout so that tools like buildbot can
 # immediately load in the output.
@@ -18,5 +19,15 @@ Bundler::GemHelper.install_tasks
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = "--order defined"
 end
-# Default task is to run the unit tests
-task :default => :spec
+
+# Default task is to run all tests
+namespace :test do
+  task :all do
+    RSpec::Core::RakeTask.new(:spec)
+    Rake::Task["spec"].execute
+    Kitchen::RakeTasks.new
+    Rake::Task['kitchen:all'].invoke
+  end
+end
+
+task :default => 'test:all'

data/lib/vagrant-ovirt4/action/create_vm.rb

@@ -66,10 +66,12 @@ module VagrantPlugins
           begin
             server = env[:vms_service].add(attr) 
           rescue OvirtSDK4::Error => e
+            fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+            retry if e.message =~ /Related operation is currently in progress/
+
             if config.debug
               raise e
             else
-              fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
               raise Errors::CreateVMError,
                 :error_message => fault_message
             end
@@ -81,17 +83,18 @@ module VagrantPlugins
           # Wait till all volumes are ready.
           env[:ui].info(I18n.t("vagrant_ovirt4.wait_for_ready_vm"))
           for i in 0..300
-            ready = true
+            disk_ready = true
             vm_service = env[:vms_service].vm_service(env[:machine].id)
             disk_attachments_service = vm_service.disk_attachments_service
             disk_attachments = disk_attachments_service.list
             disk_attachments.each do |disk_attachment|
               disk = env[:connection].follow_link(disk_attachment.disk)
               if disk.status != 'ok'
-                ready = false
+                disk_ready = false
                 break
               end
             end
+            ready = (disk_ready and env[:vms_service].vm_service(server.id).get.status.to_sym == :down)
             break if ready
             sleep 2
           end

data/lib/vagrant-ovirt4/action/destroy_vm.rb

@@ -14,7 +14,20 @@ module VagrantPlugins
           env[:ui].info(I18n.t("vagrant_ovirt4.destroy_vm"))
 
           vm_service = env[:vms_service].vm_service(env[:machine].id)
-          vm_service.remove
+          begin
+            vm_service.remove
+          rescue OvirtSDK4::Error => e
+            fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+            retry if e.message =~ /Please try again/
+
+            if config.debug
+              raise e
+            else
+              raise Errors::RemoveVMError,
+                :error_message => fault_message
+            end
+          end
+
           env[:machine].id = nil
 
           @app.call(env)

data/lib/vagrant-ovirt4/action/start_vm.rb

@@ -85,12 +85,16 @@ module VagrantPlugins
               vm: vm_configuration
             )
           rescue OvirtSDK4::Error => e
-            if config.debug
-              raise e
-            else
-              fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
-              raise Errors::StartVMError,
-                :error_message => fault_message
+            fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+            retry if e.message =~ /Please try again/
+
+            if e.message !~ /VM is running/
+              if config.debug
+                raise e
+              else
+                raise Errors::StartVMError,
+                  :error_message => fault_message
+              end
             end
 
           end

data/lib/vagrant-ovirt4/action/wait_till_down.rb

@@ -21,10 +21,21 @@ module VagrantPlugins
           env[:ui].info(I18n.t("vagrant_ovirt4.wait_till_down"))
           for i in 1..300
             ready = true
-            if vm_service.get == nil
-              raise NoVMError, :vm_name => ''
+            begin
+              if vm_service.get == nil
+                raise NoVMError, :error_message => '', :vm_id => env[:machine].id
+              end
+            rescue OvirtSDK4::Error => e
+              fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+              if config.debug
+                raise e
+              else
+                raise Errors::NoVMError, :error_message => fault_message, :vm_id => env[:machine].id
+              end
             end
 
+
+
             if vm_service.get.status.to_sym != :down
               ready = false
             end

data/lib/vagrant-ovirt4/action/wait_till_up.rb

@@ -33,7 +33,7 @@ module VagrantPlugins
               # Get VM.
               server = env[:vms_service].vm_service(env[:machine].id)
               if server == nil
-                raise NoVMError, :vm_name => ''
+                raise Errors::NoVMError, :vm_name => ''
               end
 
               nics_service = server.nics_service
@@ -49,7 +49,7 @@ module VagrantPlugins
           end
           terminate(env) if env[:interrupted]
           if env[:ip_address].nil?
-            raise NoIPError
+            raise Errors::NoIPError
           else
             @logger.info("Got IP address #{env[:ip_address]}")
             @logger.info("Time for getting IP: #{env[:metrics]["instance_ip_time"]}")

data/lib/vagrant-ovirt4/errors.rb

@@ -46,6 +46,10 @@ module VagrantPlugins
       class RemoveSnapshotError < VagrantOVirtError
         error_key(:remove_snapshot_error)
       end
+
+      class RemoveVMError < VagrantOVirtError
+        error_key(:remove_vm_error)
+      end
     end
   end
 end

data/lib/vagrant-ovirt4/plugin.rb

@@ -8,9 +8,9 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-# Note: snapshots only available in 1.8+
-if Vagrant::VERSION < '1.8.0'
-  raise "The Vagrant oVirt v4 plugin is only compatible with Vagrant 1.8+"
+# Note: snapshots only available in 1.9.1+
+if Vagrant::VERSION < '1.9.1'
+  raise "The Vagrant oVirt v4 plugin is only compatible with Vagrant 1.9.1+"
 end
 
 module VagrantPlugins

data/lib/vagrant-ovirt4/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end
 

data/locales/en.yml

@@ -54,8 +54,10 @@ en:
       short_down: |-
         down
     errors:
+      remove_vm_error: |-
+        Error removing VM '%{vm_name}'. oVirt error message was '%{error_message}'
       no_vm_error: |-
-        No VM %{vm_name} found.
+        No VM found with id '%{vm_id}'. oVirt error message was '%{error_message}'.
       create_vm_error: |-
         Creation failed. oVirt error message was '%{error_message}'
       start_vm_error: |-

data/templates/Vagrantfile.erb

@@ -0,0 +1,199 @@
+<% config[:vagrantfiles].each do |vagrantfile| %>
+require "<%= vagrantfile %>"
+require 'securerandom'
+<% end %>
+
+Vagrant.configure("2") do |c|
+  c.berkshelf.enabled = false if Vagrant.has_plugin?("vagrant-berkshelf")
+  <% if config[:cachier] %>
+  if Vagrant.has_plugin?("vagrant-cachier")
+    c.cache.scope = <%= [':box', ':machine'].include?(config[:cachier]) ? config[:cachier] : ':box' %>
+  end
+  <% end %>
+
+  c.vm.box = "<%= config[:box] %>"
+
+<% if config[:box_url] %>
+  c.vm.box_url = "<%= config[:box_url] %>"
+<% end %>
+
+<% if config[:box_version] %>
+  c.vm.box_version = "<%= config[:box_version] %>"
+<% end %>
+
+<% if !config[:box_check_update].nil? %>
+  c.vm.box_check_update = <%= config[:box_check_update] %>
+<% end %>
+
+<% if !config[:box_download_ca_cert].nil? %>
+  c.vm.box_download_ca_cert = "<%= config[:box_download_ca_cert] %>"
+<% end %>
+
+<% if !config[:box_download_insecure].nil? %>
+  c.vm.box_download_insecure = "<%= config[:box_download_insecure] %>"
+<% end %>
+
+<% if config[:vm_hostname] %>
+  c.vm.hostname = "kitchen-<%= config[:vm_hostname] %>-<%= ENV['VAGRANT_VERSION'] %>-<%= SecureRandom.uuid %>"
+<% end %>
+
+<% if config[:communicator] %>
+  c.vm.communicator = "<%= config[:communicator] %>"
+<% end %>
+
+<% if config[:guest] %>
+  c.vm.guest = "<%= config[:guest] %>"
+<% end %>
+
+<% if config[:communicator] %>
+  <% if config[:username] %>
+    c.<%= config[:communicator] %>.username = "<%= config[:username] %>"
+  <% end %>
+  <% if config[:password] %>
+    c.<%= config[:communicator] %>.password = "<%= config[:password] %>"
+  <% end %>
+<% else %>
+  <% if config[:username] %>
+    c.ssh.username = "<%= config[:username] %>"
+  <% end %>
+  <% if config[:password] %>
+    c.ssh.password = "<%= config[:password] %>"
+  <% end %>
+<% end %>
+
+<% if config[:ssh_key] %>
+  c.ssh.private_key_path = "<%= config[:ssh_key] %>"
+<% end %>
+<% config[:ssh].each do |key, value| %>
+  c.ssh.<%= key %> = <%= [true, false].include?(value) ? value : value.inspect %>
+<% end %>
+<% if config[:winrm] %>
+  <% config[:winrm].each do |key, value| %>
+    c.winrm.<%= key %> = <%= value %>
+  <% end %>
+<% end %>
+
+<% if config[:boot_timeout] %>
+  c.vm.boot_timeout = <%= config[:boot_timeout] %>
+<% end %>
+
+<% Array(config[:network]).each do |opts| %>
+  c.vm.network(:<%= opts[0] %>, <%= opts[1..-1].join(", ") %>)
+<% end %>
+
+  c.vm.synced_folder ".", "/vagrant", disabled: true
+<% config[:synced_folders].each do |source, destination, options| %>
+  c.vm.synced_folder <%= source.inspect %>, <%= destination.inspect %>, <%= options %>
+<% end %>
+
+  c.vm.provider :<%= config[:provider] %> do |p|
+<% case config[:provider]
+   when "virtualbox", /^vmware_/
+     if config[:gui] == true || config[:gui] == false %>
+    p.gui = <%= config[:gui] %>
+<%   end
+   end
+
+   case config[:provider]
+   when "virtualbox", /^vmware_/, "parallels"
+     if config[:linked_clone] == true || config[:linked_clone] == false %>
+    p.linked_clone = <%= config[:linked_clone] %>
+<%   end
+   end %>
+
+<% config[:customize].each do |key, value| %>
+  <% case config[:provider]
+     when "libvirt" %>
+    <% if key == :storage %>
+      <% if value.is_a? String %>
+    p.storage <%= value %>
+      <% elsif value.is_a? Array %>
+        <% value.each do |v| %>
+    p.storage <%= v %>
+        <% end %>
+      <% end %>
+    <% else %>
+      <% if value.is_a? String %>
+    p.<%= key %> = "<%= value%>"
+      <% else %>
+    p.<%= key %> = <%= value%>
+      <% end %>
+    <% end %>
+  <% when "lxc" %>
+    <% if key == :container_name %>
+    p.container_name = <%= value == ":machine" ? value : "\"#{value}\"" %>
+    <% elsif key == :backingstore %>
+    p.backingstore = "<%= value %>"
+    <% elsif key == :backingstore_options %>
+      <% config[:customize][:backingstore_options].each do |opt, opt_val| %>
+    p.backingstore_option "--<%= opt %>", "<%= opt_val %>"
+      <% end %>
+    <% elsif key == :include %>
+      <% Array(value).each do |include| %>
+    p.customize "<%= key %>", "<%= include %>"
+      <% end %>
+    <% else %>
+    p.customize "<%= key %>", "<%= value %>"
+    <% end %>
+  <% when "managed" %>
+    <% if key == :server %>
+    p.server = "<%= value %>"
+    <% end %>
+  <% when "parallels" %>
+    <% if key == :memory || key == :cpus %>
+    p.<%= key %> = <%= value %>
+    <% else %>
+    p.customize ["set", :id, "--<%= key.to_s.gsub('_', '-') %>", "<%= value %>"]
+    <% end %>
+  <% when "softlayer" %>
+    <% if key == :disk_capacity %>
+    p.<%= key %> = <%= value %>
+    <% else %>
+    p.<%= key %> = "<%= value %>"
+    <% end %>
+  <% when "virtualbox" %>
+    <% if key == :createhd %>
+    p.customize ["createhd", "--filename", "<%= value[:filename] %>", "--size", <%= value[:size] %>]
+    <% elsif key == :storageattach %>
+      <% options = [] %>
+      <% value.each do |storageattach_option_key, storageattach_option_value|
+           options << "\"--#{storageattach_option_key}\""
+           if storageattach_option_value.instance_of? Fixnum
+             options << storageattach_option_value
+           else
+             options << "\"#{storageattach_option_value}\""
+           end
+         end %>
+    p.customize ["storageattach", :id, <%= options.join(', ') %>]
+    <% elsif key == :cpuidset %>
+      <% ids = [] %>
+      <% value.each do | id |
+           ids << "\"#{id}\""
+         end %>
+    p.customize ["modifyvm", :id, "--cpuidset", <%= ids.join(', ') %>]
+    <% else %>
+    p.customize ["modifyvm", :id, "--<%= key %>", "<%= value %>"]
+    <% end %>
+  <% when /^vmware_/ %>
+    <% if key == :memory %>
+      <% unless config[:customize].include?(:memsize) %>
+    p.vmx["memsize"] = "<%= value %>"
+      <% end %>
+    <% elsif key == :cpus %>
+      <% unless config[:customize].include?(:numvcpus) %>
+    p.vmx["numvcpus"] = "<%= value %>"
+      <% end %>
+    <% else %>
+    p.vmx["<%= key %>"] = "<%= value %>"
+    <% end %>
+  <% when "openstack", "cloudstack", "hyperv", "ovirt3", "ovirt4", "rackspace", "aws" %>
+    <% if value.is_a? String %>
+    p.<%= key %> = "<%= value%>"
+    <% else  %>
+    p.<%= key %> = <%= value%>
+    <% end  %>
+  <% end %>
+<% end %>
+  end
+
+end

data/test/Vagrantfile

@@ -0,0 +1,19 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = 'ovirt4'
+  config.vm.hostname = "testing"
+  config.vm.box_url = 'https://github.com/myoung34/vagrant-ovirt4/blob/master/example_box/dummy.box?raw=true'
+
+  config.vm.network :private_network,
+    :ovirt__ip => '192.168.2.254', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '192.168.2.1', 
+    :ovirt__netmask => '255.255.255.0', :ovirt__dns_servers => '192.168.2.1'
+
+
+  config.vm.provider :ovirt4 do |ovirt|
+    ovirt.url = 'https://ovirt/ovirt-engine/api'
+    ovirt.username = "#{ENV['OVIRT_TEST_USER']}"
+    ovirt.password = "#{ENV['OVIRT_TEST_PASS']}"
+    ovirt.insecure = true
+    ovirt.cluster = 'Default'
+    ovirt.template = 'vagrant-centos7'
+  end
+end

data/test/integration/dynamic_network/network_spec.rb

@@ -0,0 +1,6 @@
+describe command('uname -a') do
+  its(:exit_status) { should eq 0 }
+  its(:stderr) { should be_empty }
+  its(:stdout) { should match(/^Linux kitchen-dynamic-[0-9]+-[a-f0-9\-]+/) }
+end
+

data/test/integration/singleton-static_network/network_spec.rb

@@ -0,0 +1,11 @@
+describe command('uname -a') do
+  its(:exit_status) { should eq 0 }
+  its(:stderr) { should be_empty }
+  its(:stdout) { should match(/^Linux kitchen-static-[0-9]+-[a-f0-9\-]+/) }
+end
+
+describe command("ip route get 1 | awk '{print $NF;exit}'") do
+  its(:exit_status) { should eq 0 }
+  its(:stderr) { should be_empty }
+  its(:stdout) { should match(/^192.168.2.254$/) }
+end

data/tools/prepare_redhat_for_box.sh

@@ -106,6 +106,8 @@ chkconfig iptables off
 chkconfig firewalld off
 chkconfig ip6tables off
 for i in cloud-init ovirt-guest-agent; do chkconfig $i on; done
+chkconfig NetworkManager off
+
 sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/sysconfig/selinux
 [ -f /etc/selinux/config ] && sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config
 
@@ -121,8 +123,11 @@ echo $'' > /etc/sysconfig/network-scripts/ifcfg-eth0
 CLOUD_CONFIG=/etc/cloud/cloud.cfg
 grep  -q ' - resolv-conf' $CLOUD_CONFIG || sed -i -e 's/ - timezone/&\n - resolv-conf/' $CLOUD_CONFIG
 
+# Chef
+[[ $ATOMIC != "true" ]] && curl -L --silent https://omnitruck.chef.io/install.sh | bash
+
+
 # Do some cleanup..
 rm -f /root/.bash_history
 rm -f /root/authorized_keys
 [[ $ATOMIC != "true" ]] && yum clean all
-

data/vagrant-ovirt4.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = VagrantPlugins::OVirtProvider::VERSION
 
-  gem.add_runtime_dependency 'ovirt-engine-sdk', '~> 4.0', '>= 4.0.6'
+  gem.add_runtime_dependency 'ovirt-engine-sdk', '~> 4.0.1'
   gem.add_runtime_dependency 'filesize', '~> 0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ovirt-engine-sdk
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -52,9 +46,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".kitchen.yml"
 - ".rspec"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
+- Jenkinsfile
 - LICENSE
 - README.md
 - Rakefile
@@ -91,7 +88,6 @@ files:
 - lib/vagrant-ovirt4/action/wait_til_suspended.rb
 - lib/vagrant-ovirt4/action/wait_till_down.rb
 - lib/vagrant-ovirt4/action/wait_till_up.rb
-- lib/vagrant-ovirt4/cap/nic_mac_addresses.rb
 - lib/vagrant-ovirt4/cap/snapshot_list.rb
 - lib/vagrant-ovirt4/cap/snapshot_save.rb
 - lib/vagrant-ovirt4/config.rb
@@ -115,7 +111,10 @@ files:
 - spec/vagrant-ovirt4/action/read_ssh_info_spec.rb
 - spec/vagrant-ovirt4/action/read_state_spec.rb
 - spec/vagrant-ovirt4/config_spec.rb
-- test.rb
+- templates/Vagrantfile.erb
+- test/Vagrantfile
+- test/integration/dynamic_network/network_spec.rb
+- test/integration/singleton-static_network/network_spec.rb
 - tools/prepare_redhat_for_box.sh
 - vagrant-ovirt4.gemspec
 homepage: https://github.com/myoung34/vagrant-ovirt4
@@ -156,3 +155,6 @@ test_files:
 - spec/vagrant-ovirt4/action/read_ssh_info_spec.rb
 - spec/vagrant-ovirt4/action/read_state_spec.rb
 - spec/vagrant-ovirt4/config_spec.rb
+- test/Vagrantfile
+- test/integration/dynamic_network/network_spec.rb
+- test/integration/singleton-static_network/network_spec.rb

data/lib/vagrant-ovirt4/cap/nic_mac_addresses.rb

@@ -1,15 +0,0 @@
-# vim: ai ts=2 sts=2 et sw=2 ft=ruby
-module VagrantPlugins
-  module OVirtProvider
-    module Cap
-      module NicMacAddresses
-        def self.nic_mac_addresses(machine)
-          ovirt = OVirtProvider.ovirt_connection
-          interfaces = ovirt.list_vm_interfaces(machine.id.to_s)
-          Hash[interfaces.map{ |i| [i[:name], i[:mac]] }]
-        end
-      end
-    end
-  end
-end
-

data/test.rb

@@ -1,3 +0,0 @@
-require 'ovirt-engine-sdk'
-
-p 'foo'