vagrant-ovirt4 1.2.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0791674c10129bc4c799c0edc0a69688c5afad9bf97d5330c8dbfd804fc303
-  data.tar.gz: ff664c4cf2241450255854076a784cade3b519143e27c96cfe202f1af8bbb456
+  metadata.gz: 48a3502fc6d918fe1418248df8be2ca6ba8d2e0f477eb79784c0dbfd6a12c2e2
+  data.tar.gz: f33988dd5f134f0f6336e62ab21e4a4de534a434eb721e754301e6319e9043be
 SHA512:
-  metadata.gz: 462531777be650d20de06a80c170d435733e62b42e60aa52600e9f52a72a36dd407be247682b68dccc8fad93b8b7d71c42c0f89f2734637be7e79c996f63fc9b
-  data.tar.gz: 7d5c64d01517722e218f6aed6110c47fcb60aa50fc6f00d2b66e5c1e55f5e84494bd961255524b9fe950b4dbd77e0356075069e0d78b0afe5ddedaf46da25571
+  metadata.gz: a84a0d2994268c8fa8df3715fbc5d3c5b40c1505cfdbb750e94539561498cc2d803ca532478bf24d9fc45d1a220bee0bcd1fd00b977f9bf221f841deed5860ec
+  data.tar.gz: 2533a97a3cfe3435cad9c3d9dc9199380874736f9221991e8b3072504a07dc7a590aceaf616450f4ddb7d0f52b169f57ef7855e3e3f7a75df1ea81e5ff638600

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: myoung34

data/.github/workflows/release.yml

@@ -0,0 +1,20 @@
+name: Release
+
+on:
+  push:
+    paths:
+      - lib/vagrant-ovirt4/version.rb
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: fregante/setup-git-user@v1
+      - name: Release Gem
+        uses: cadwallion/publish-rubygems-action@master
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RELEASE_COMMAND: rake release

data/.gitignore

@@ -6,5 +6,4 @@
 /.idea
 *.gem
 /manifests
-hiera.yaml
-.kitchen
+vendor

data/Gemfile

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

data/Gemfile.lock

@@ -1,229 +1,50 @@
-GIT
-  remote: git://github.com/myoung34/vagrant.git
-  revision: 4572267c33f4ba569f68ad4bff026e9a7ef63b56
-  specs:
-    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.2.0)
-      net-sftp (~> 2.1)
-      net-ssh (~> 3.0.1)
-      nokogiri (= 1.6.7.1)
-      rb-kqueue (~> 0.2.0)
-      rest-client (>= 1.6.0, < 3.0)
-      ruby_dep (<= 1.3.1)
-      wdm (~> 0.1.0)
-      winrm (~> 2.1)
-      winrm-elevated (~> 1.1)
-      winrm-fs (~> 1.0)
-
 PATH
   remote: .
   specs:
-    vagrant-ovirt4 (1.2.1)
+    vagrant-ovirt4 (2.0.0)
       filesize (~> 0)
+      nokogiri (>= 1.10.8)
       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)
-    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.71.0)
-    faraday (0.11.0)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
-    filesize (0.1.1)
-    gssapi (1.2.0)
-      ffi (>= 1.0.1)
-    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)
-      ruby_dep (~> 1.2)
-    little-plugger (1.1.4)
-    log4r (1.1.10)
-    logging (2.1.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    method_source (0.8.2)
-    mime-types (3.1)
-      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)
-    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)
+    byebug (11.1.3)
+    coderay (1.1.2)
+    filesize (0.2.0)
+    json (2.5.1)
+    method_source (1.0.0)
+    mini_portile2 (2.5.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     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)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    rainbow (2.2.1)
-    rake (13.0.1)
-    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.1)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
-      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.3.0)
-    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)
-    wdm (0.1.1)
-    winrm (2.1.2)
-      builder (>= 2.1.2)
-      erubis (~> 2.7)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.0)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    winrm-fs (1.0.1)
-      erubis (~> 2.7)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
-      winrm (~> 2.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    racc (1.5.2)
+    rake (13.0.3)
+    rake-release (1.2.1)
+      bundler (>= 1.11, < 3)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   byebug
-  kitchen-inspec
-  kitchen-vagrant
-  net-scp (~> 1.2)
   pry
   pry-byebug
   rake
-  rspec
-  rspec-its
-  test-kitchen
-  vagrant!
+  rake-release
+  rspec-core
   vagrant-ovirt4!
 
 BUNDLED WITH
-   1.14.4
+   1.17.2

data/README.md

@@ -63,6 +63,12 @@ Vagrant.configure("2") do |config|
     :ovirt__network_name => 'ovirtmgmt' #DHCP
     # Static configuration
     #:ovirt__ip => '192.168.2.198', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '192.168.2.125', :ovirt__netmask => '255.255.0.0', :ovirt__dns_servers => '192.168.2.1', :ovirt__dns_search => 'test.local'
+    # Static configuration with biosdevname. Guest OS assigns interface names (ens3, em1 or something else). ovirt__interface_name has to match that name.
+    #:ovirt__ip => '192.168.2.198', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '192.168.2.125', :ovirt__netmask => '255.255.0.0', :ovirt__dns_servers => '192.168.2.1', :ovirt__dns_search => 'test.local', :ovirt__interface_name => 'ens3'
+
+#  configure additional interface
+#  config.vm.network :private_network,
+#    :ovirt__ip => '192.168.2.199', :ovirt__network_name => 'ovirtmgmt', :ovirt__netmask => '255.255.0.0', :ovirt__interface_name => 'ens4'
 
   config.vm.provider :ovirt4 do |ovirt|
     ovirt.url = 'https://server/ovirt-engine/api'
@@ -74,9 +80,9 @@ Vagrant.configure("2") do |config|
     ovirt.cluster = 'Default'
     ovirt.template = 'Vagrant-Centos7-test'
     ovirt.console = 'vnc'
-    ovirt.disk_size = '15 GB' # only growing is supported. works the same way as below memory settings
+    ovirt.disk_size = '15 GiB' # only growing is supported. works the same way as below memory settings
     ovirt.memory_size = '1 GiB' #see https://github.com/dominikh/filesize for usage
-    ovirt.memory_guaranteed = '256 MB' #see https://github.com/dominikh/filesize for usage
+    ovirt.memory_guaranteed = '256 MiB' #see https://github.com/dominikh/filesize for usage
     ovirt.cpu_cores = 2
     ovirt.cpu_sockets = 2
     ovirt.cpu_threads = 2
@@ -132,25 +138,6 @@ end
     a. `storage_domain`: the storage domain where the disk should be created
 
 
-## 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,7 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'rake/release'
 require 'rspec/core/rake_task'
-require 'kitchen/rake_tasks'
 
 # Immediately sync all stdout so that tools like buildbot can
 # immediately load in the output.
@@ -14,20 +14,3 @@ Dir.chdir(File.expand_path("../", __FILE__))
 # This installs the tasks that help with gem creation and
 # publishing.
 Bundler::GemHelper.install_tasks
-
-# Install the `spec` task so that we can run tests.
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = "--order defined"
-end
-
-# 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.rb

@@ -13,8 +13,11 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use ConnectOVirt
           b.use Call, ReadState do |env, b2|
+            # synced_folders defaults to NFS on linux. Make it default to rsync as before.
+            env[:machine].config.nfs.functional = false
             if env[:machine_state_id] == :up
-              b2.use SyncFolders
+              b2.use SyncedFolderCleanup
+              b2.use SyncedFolders
               b2.use MessageAlreadyUp
               next
             end
@@ -37,7 +40,8 @@ module VagrantPlugins
 
             b2.use StartVM
             b2.use WaitTillUp
-            b2.use SyncFolders
+            b2.use SyncedFolderCleanup
+            b2.use SyncedFolders
           end
           b.use DisconnectOVirt
         end
@@ -54,8 +58,8 @@ module VagrantPlugins
 
             b2.use ConnectOVirt
             b2.use ProvisionerCleanup, :before if defined?(ProvisionerCleanup)
-            b2.use HaltVM
-            b2.use WaitTillDown
+            b2.use HaltVM unless env[:machine].state.id == :down
+            b2.use WaitTillDown unless env[:machine].state.id == :down
             b2.use DestroyVM
             b2.use DisconnectOVirt
           end
@@ -66,12 +70,15 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
+            # synced_folders defaults to NFS on linux. Make it default to rsync as before.
+            env[:machine].config.nfs.functional = false
             if !env[:result]
               b2.use MessageNotCreated
               next
             end
             b2.use Provision
-            b2.use SyncFolders
+            b2.use SyncedFolderCleanup
+            b2.use SyncedFolders
           end
         end
       end
@@ -161,7 +168,7 @@ module VagrantPlugins
       end
 
       def self.action_reload
-        with_ovirt do |env, b|
+        Vagrant::Action::Builder.new.tap do |b|
           b.use action_halt
           b.use action_up
         end
@@ -194,7 +201,8 @@ module VagrantPlugins
             b.use MessageNotSuspended
             next
           end
-          b.use action_up
+          b.use StartVM
+          b.use WaitTillUp
         end
       end
 
@@ -234,7 +242,8 @@ module VagrantPlugins
       autoload :SnapshotSave, action_root.join("snapshot_save")
       autoload :StartVM, action_root.join("start_vm")
       autoload :SuspendVM, action_root.join("suspend_vm")
-      autoload :SyncFolders, action_root.join("sync_folders")
+      autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
+      autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
       autoload :WaitTillDown, action_root.join("wait_till_down")
       autoload :WaitTillUp, action_root.join("wait_till_up")
       autoload :WaitTilSuspended, action_root.join("wait_til_suspended")

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

@@ -29,15 +29,15 @@ module VagrantPlugins
           env[:ui].info(" -- Optimized For: #{config.optimized_for}")
           env[:ui].info(" -- Description:   #{config.description}")
           env[:ui].info(" -- Comment:       #{config.comment}")
-          env[:ui].info(" -- Disk:          #{Filesize.from("#{config.disk_size} B").to_f('GB').to_i} GB") unless config.disk_size.nil?
+          env[:ui].info(" -- Disk:          #{Filesize.from("#{config.disk_size} B").to_f('GiB').to_i} GiB") unless config.disk_size.nil?
           env[:ui].info(" -- Additional Disks:") unless config.disks.empty?
           config.disks.each do |disk|
-            env[:ui].info(" ---- name=#{disk[:name]} size=#{Filesize.from("#{disk[:size]} B").to_f('GB').to_i} GB")
+            env[:ui].info(" ---- name=#{disk[:name]} size=#{Filesize.from("#{disk[:size]} B").to_f('GiB').to_i} GiB")
           end
           env[:ui].info(" -- Memory:        ")
-          env[:ui].info(" ---- Memory:      #{Filesize.from("#{config.memory_size} B").to_f('MB').to_i} MB")
-          env[:ui].info(" ---- Maximum:     #{Filesize.from("#{config.memory_maximum} B").to_f('MB').to_i} MB")
-          env[:ui].info(" ---- Guaranteed:  #{Filesize.from("#{config.memory_guaranteed} B").to_f('MB').to_i} MB")
+          env[:ui].info(" ---- Memory:      #{Filesize.from("#{config.memory_size} B").to_f('MiB').to_i} MiB")
+          env[:ui].info(" ---- Maximum:     #{Filesize.from("#{config.memory_maximum} B").to_f('MiB').to_i} MiB")
+          env[:ui].info(" ---- Guaranteed:  #{Filesize.from("#{config.memory_guaranteed} B").to_f('MiB').to_i} MiB")
           env[:ui].info(" -- Cpu:           ")
           env[:ui].info(" ---- Cores:       #{config.cpu_cores}")
           env[:ui].info(" ---- Sockets:     #{config.cpu_sockets}")

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

@@ -12,6 +12,17 @@ module VagrantPlugins
         def call(env)
           env[:ui].info(I18n.t("vagrant_ovirt4.halt_vm"))
 
+          # Halt via OS capability
+          begin
+            if env[:machine].guest.capability?(:halt)
+              env[:machine].guest.capability(:halt)
+              # Give the VM a chance to shutdown gracefully..."
+              sleep 10
+            end
+          rescue
+            env[:ui].info("Failed to shutdown guest gracefully.")
+          end
+
           machine = env[:vms_service].vm_service(env[:machine].id)
           machine.stop rescue nil #todo dont rescue
 

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

@@ -36,7 +36,12 @@ module VagrantPlugins
 
           nics_service = server.nics_service
           nics = nics_service.list
-          ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment).reported_devices.collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+          begin
+            ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment.reported_devices).collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first
+          rescue
+            # for backwards compatibility with ovirt 4.3
+            ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment).reported_devices.collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+          end
 
           # Return the info
           # TODO: Some info should be configurable in Vagrantfile

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

@@ -33,7 +33,13 @@ module VagrantPlugins
           end
           nics_service = server.nics_service
           nics = nics_service.list
-          ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment).reported_devices.collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+          begin
+            ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment.reported_devices).collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first
+          rescue
+            # for backwards compatibility with ovirt 4.3
+            ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment).reported_devices.collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+          end
+
           unless ip_addr.nil?
             env[:ip_address] = ip_addr
             @logger.debug("Got output #{env[:ip_address]}")

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

@@ -46,9 +46,15 @@ module VagrantPlugins
           (0...configured_ifaces_options.length()).each do |iface_index|
             iface_options = configured_ifaces_options[iface_index]
 
+            if iface_options[:interface_name] != nil then
+              iface_name = iface_options[:interface_name]
+            else
+              iface_name = "eth#{iface_index}"
+            end
+
             if iface_options[:ip] then
               nic_configuration = {
-                name: "eth#{iface_index}",
+                name: iface_name,
                 on_boot: true,
                 boot_protocol: OvirtSDK4::BootProtocol::STATIC,
                 ip: {
@@ -60,7 +66,7 @@ module VagrantPlugins
               }
             else
               nic_configuration = {
-                name: "eth#{iface_index}",
+                name: iface_name,
                 on_boot: true,
                 boot_protocol: OvirtSDK4::BootProtocol::DHCP,
               }

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

@@ -57,7 +57,13 @@ module VagrantPlugins
 
               nics_service = server.nics_service
               nics = nics_service.list
-              ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment).reported_devices.collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+              begin
+                ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment.reported_devices).collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first
+              rescue
+                # for backwards compatibility with ovirt 4.3
+                ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment).reported_devices.collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+              end
+
               unless ip_addr.nil?
                 env[:ui].info("Got IP: #{ip_addr}")
                 # Check if SSH-Server is up

data/lib/vagrant-ovirt4/config.rb

@@ -98,7 +98,7 @@ module VagrantPlugins
         @cpu_threads = 1 if @cpu_threads == UNSET_VALUE
         @cluster = nil if @cluster == UNSET_VALUE
         @console = nil if @console == UNSET_VALUE
-        @memory_size = '256 MB' if @memory_size == UNSET_VALUE
+        @memory_size = '256 MiB' if @memory_size == UNSET_VALUE
         @memory_maximum = @memory_size if @memory_maximum == UNSET_VALUE
         @memory_guaranteed = @memory_size if @memory_guaranteed == UNSET_VALUE
         @template = nil if @template == UNSET_VALUE

data/lib/vagrant-ovirt4/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '1.2.3'
+    VERSION = '2.0.0'
   end
 end
 

data/locales/en.yml

@@ -55,6 +55,10 @@ en:
         The instance is not running. Use `vagrant up` to start it.
       short_down: |-
         down
+      long_not_created: |-
+        The instance is not created. Use `vagrant up` to create it.
+      short_not_created: |-
+        not created
     errors:
       remove_vm_error: |-
         Error removing VM '%{vm_name}'. oVirt error message was '%{error_message}'

data/spec/vagrant-ovirt4/config_spec.rb

@@ -68,13 +68,13 @@ describe VagrantPlugins::OVirtProvider::Config do
     [:memory_size, :memory_maximum, :memory_guaranteed].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
-        instance.send("#{attribute}=".to_sym, "512 MB")
+        instance.send("#{attribute}=".to_sym, "512 MiB")
         instance.finalize!
         instance.send(attribute).should == 512000000
       end
 
       it "should convert the value" do
-        instance.send("#{attribute}=".to_sym, "1 GB")
+        instance.send("#{attribute}=".to_sym, "1 GiB")
         instance.finalize!
         instance.send(attribute).should == 1000000000
       end

data/vagrant-ovirt4.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'ovirt-engine-sdk', '~> 4.0.1'
   gem.add_runtime_dependency 'filesize', '~> 0'
+  gem.add_runtime_dependency 'nokogiri', '>= 1.10.8'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ovirt-engine-sdk
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.8
 description: Vagrant provider for oVirt and RHEV v4
 email:
 - myoung34@my.apsu.edu
@@ -45,13 +59,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
-- ".kitchen.yml"
 - ".rspec"
 - Dockerfile
 - Gemfile
 - Gemfile.lock
-- Jenkinsfile
 - LICENSE
 - README.md
 - Rakefile
@@ -85,7 +99,6 @@ files:
 - lib/vagrant-ovirt4/action/snapshot_save.rb
 - lib/vagrant-ovirt4/action/start_vm.rb
 - lib/vagrant-ovirt4/action/suspend_vm.rb
-- lib/vagrant-ovirt4/action/sync_folders.rb
 - lib/vagrant-ovirt4/action/wait_til_suspended.rb
 - lib/vagrant-ovirt4/action/wait_till_down.rb
 - lib/vagrant-ovirt4/action/wait_till_up.rb
@@ -113,10 +126,6 @@ files:
 - spec/vagrant-ovirt4/action/read_state_spec.rb
 - spec/vagrant-ovirt4/config_spec.rb
 - templates/Vagrantfile.erb
-- test/integration/bios_serial/bios_serial_spec.rb
-- test/integration/dynamic_network/network_spec.rb
-- test/integration/optimized_for.sh
-- test/integration/singleton-static_network/network_spec.rb
 - tools/prepare_redhat_for_box.sh
 - vagrant-ovirt4.gemspec
 homepage: https://github.com/myoung34/vagrant-ovirt4
@@ -138,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This vagrant plugin provides the ability to create, control, and destroy
@@ -156,7 +165,3 @@ 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/integration/bios_serial/bios_serial_spec.rb
-- test/integration/dynamic_network/network_spec.rb
-- test/integration/optimized_for.sh
-- test/integration/singleton-static_network/network_spec.rb

data/.kitchen.yml

@@ -1,83 +0,0 @@
-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
-  - name: bios_serial
-    driver_config:
-      vm_hostname: bios-serial
-      network:
-        - ["private_network", {ovirt__network_name: 'ovirtmgmt'}]
-      customize:
-        template: vagrant-centos7
-        bios_serial: 'banana-hammock'
-        cloud_init: |
-          runcmd:
-            - ifdown eth0
-            - service network restart
-  - name: optimized_for_default
-    verifier:
-      name: shell
-      command: curl --silent -k -L --user "${OVIRT_USERNAME}:${OVIRT_PASSWORD}" --header 'Content-Type: application/xml' --header 'Accept: application/xml' ${OVIRT_URL}/vms/d3f659e1-21ff-42a0-b5fa-7c2f74a36c2b | xmllint --xpath '/vm/type/text()' - | grep desktop
-    driver_config:
-      vm_hostname: optimized-for
-      network:
-        - ["private_network", {ovirt__network_name: 'ovirtmgmt'}]
-      customize:
-        template: vagrant-centos7
-        cloud_init: |
-          runcmd:
-            - ifdown eth0
-            - service network restart
-  - name: optimized_for_set
-    verifier:
-      name: shell
-      command: test/integration/optimized_for.sh
-    driver_config:
-      vm_hostname: optimized-for
-      network:
-        - ["private_network", {ovirt__network_name: 'ovirtmgmt'}]
-      customize:
-        template: vagrant-centos7
-        cloud_init: |
-          runcmd:
-            - ifdown eth0
-            - service network restart

data/Jenkinsfile

@@ -1,70 +0,0 @@
-#!/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/lib/vagrant-ovirt4/action/sync_folders.rb

@@ -1,69 +0,0 @@
-require "log4r"
-require "vagrant/util/subprocess"
-
-module VagrantPlugins
-  module OVirtProvider
-    module Action
-      class SyncFolders
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_ovirt::action::sync_folders")
-        end
-
-        def call(env)
-          @app.call(env)
-
-          ssh_info = env[:machine].ssh_info
-
-          env[:machine].config.vm.synced_folders.each do |id, data|
-            next if data[:disabled]
-            hostpath  = File.expand_path(data[:hostpath], env[:root_path])
-            guestpath = data[:guestpath]
-
-            # Make sure there is a trailing slash on the host path to avoid creating an additional directory with rsync
-            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
-
-            # on windows rsync.exe requires cygdrive-style paths.
-            # assumes: /c/...
-            # Should be msysgit and cygwin compatible if /etc/fstab in cygwin contains:
-            #    none / cygdrive binary,posix=0,user 0 0
-            if Vagrant::Util::Platform.windows?
-              hostpath = hostpath.gsub(/^(\w):/) { "/#{$1}" }
-            end
-
-            env[:ui].info(I18n.t("vagrant_ovirt4.rsync_folder", :hostpath => hostpath, :guestpath => guestpath))
-
-            # Create the guest path
-            env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
-            env[:machine].communicate.sudo("chown #{ssh_info[:username]} '#{guestpath}'")
-
-            # Rsync over to the guest path using the SSH info
-            command = [
-              "rsync", 
-              "--verbose", 
-              "--archive", 
-              "-z", 
-              "--owner", 
-              "--perms",
-              "--exclude", 
-              ".vagrant/",
-              "-e", 
-              "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path][0]}'",
-              hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"
-            ]
-
-            r = Vagrant::Util::Subprocess.execute(*command)
-            if r.exit_code != 0
-              raise Errors::RsyncError,
-                :guestpath => guestpath,
-                :hostpath => hostpath,
-                :stderr => r.stderr
-            end
-          end
-        end
-      end
-    end
-  end
-end
-

data/test/integration/bios_serial/bios_serial_spec.rb

@@ -1,6 +0,0 @@
-describe command('dmidecode -s system-serial-number') do
-  its(:exit_status) { should eq 0 }
-  its(:stderr) { should be_empty }
-  its(:stdout) { should match(/^banana-hammock$/) }
-end
-

data/test/integration/dynamic_network/network_spec.rb

@@ -1,6 +0,0 @@
-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/optimized_for.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-bios_serial=$(vagrant ssh -c 'sudo dmidecode -s system-serial-number' 2>/dev/null | tail  -n 1 | sed 's/[\r\n]//g')
-vm_id=$(curl --silent -k -L --user "${OVIRT_USERNAME}:${OVIRT_PASSWORD}" --header 'Content-Type: application/xml' --header 'Accept: application/xml' ${OVIRT_URL}/vms | xmllint --xpath 'string(./vms/vm[./serial_number/value/text() = "'$bios_serial'"]/@id)' -)
-curl --silent -k -L --user "${OVIRT_USERNAME}:${OVIRT_PASSWORD}" --header 'Content-Type: application/xml' --header 'Accept: application/xml' ${OVIRT_URL}/vms/${vm_id}  | xmllint --xpath './vm/type/text()' - | grep server

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

@@ -1,11 +0,0 @@
-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