vagrant-ovirt4 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48a3502fc6d918fe1418248df8be2ca6ba8d2e0f477eb79784c0dbfd6a12c2e2
-  data.tar.gz: f33988dd5f134f0f6336e62ab21e4a4de534a434eb721e754301e6319e9043be
+  metadata.gz: 032a8a924b7d7f1870fc319f4d4ed13f33910d0bb6bccde70fce977f25c8cafd
+  data.tar.gz: d3495cebef0d0daf9c5d2d9bbd09a3c271844844c4a334258049dc55a0f31062
 SHA512:
-  metadata.gz: a84a0d2994268c8fa8df3715fbc5d3c5b40c1505cfdbb750e94539561498cc2d803ca532478bf24d9fc45d1a220bee0bcd1fd00b977f9bf221f841deed5860ec
-  data.tar.gz: 2533a97a3cfe3435cad9c3d9dc9199380874736f9221991e8b3072504a07dc7a590aceaf616450f4ddb7d0f52b169f57ef7855e3e3f7a75df1ea81e5ff638600
+  metadata.gz: 9b04cf43df3269c745ffb0bb7d503f9f192da7e3b7939d2b2428e3597684e4ed6dbebca051c16ff20529415f4a85ea506070658d84089e47bf9fbf9e16ae8c28
+  data.tar.gz: e6f60e4dbb661bcfa8cc39f8cd0fcb4633949490abf8910a5fc8f792c9ef45451aff4d6aed449e4e52e7d1cb020f6327a1dcf2d4743a1a342463263cf114782c

data/CHANGELOG

@@ -0,0 +1,31 @@
+v2.1.0
+41b8c63 Move where rspec-mocks is included.
+0015c45 Update engine binding.
+b2a0015 Not actually using the vagrant-spec thing.
+a598043 Address the change in parsing.
+0ad3b72 Get the tests runnable.
+a8f1d5f Test the connection before passing it on for use.
+8adf277 list only snapshots for vm's defined in the environment
+a2ee89b Add security.md
+3399aab Add CHANGELOG
+
+v2.0.0
+
+1810832 Attempt to fix gem push
+9d1ef6b handle fallback with rescue
+6cc0f90 fix for backwards compatibility with ovirt 4.3
+2298314 Make no assumptions on biosdevname/systemd device naming
+1d870df Support for network interfaces named by biosdevname
+5c8035a add missing translation
+f9b6e28 fixed double disconnect due to action_up used in combination wth with_ovirt
+96f17c0 fixed doule disconnect on reload due to use of with_ovirt
+697e3d4 fixed inconsistent usages of memory units (MB/MiB and GB/GiB)
+5a68e8b vagrant destroy only calls halt if vm is up
+8772ee9 fix for erroneous rsync and state error due to missing ip address
+5b49114 Bump nokogiri from 1.10.9 to 1.11.0
+b8314fb fix for waiting indefinitely for an ip when deploying on ovirt 4.4
+722f2e0 Default to rsync instead of NFS like before
+2582f53 Use vagrant builtin rsync folder sync
+84c6c53 In case graceful shutdown failed, fallback to stopping VM immediately
+640d640 Fix up dependencies
+029b53b give guests a chance to shutdown gracefully before pulling the plug with a poweroff

data/Gemfile

@@ -3,10 +3,13 @@ source 'http://rubygems.org'
 group :development do
   gem 'rake'
   gem 'rspec-core'
+  gem 'rspec-its'
+  gem "rspec-mocks", "~> 3.5"
   gem 'pry'
   gem 'byebug'
   gem 'pry-byebug'
   gem 'rake-release'
+  gem "vagrant", git: "https://github.com/hashicorp/vagrant.git"
 end
 
 group :plugins do

data/Gemfile.lock

@@ -1,38 +1,150 @@
+GIT
+  remote: https://github.com/hashicorp/vagrant.git
+  revision: 22795b161bf67a4c0ebbe32c9ce8777cb888c4a7
+  specs:
+    vagrant (2.2.11.dev)
+      bcrypt_pbkdf (~> 1.0.0)
+      childprocess (~> 4.0.0)
+      ed25519 (~> 1.2.4)
+      erubi
+      hashicorp-checkpoint (~> 0.1.5)
+      i18n (~> 1.8)
+      listen (~> 3.1)
+      log4r (~> 1.1.9, < 1.1.11)
+      mime (~> 0.4.4)
+      net-scp (~> 1.2.0)
+      net-sftp (~> 3.0)
+      net-ssh (~> 6.0)
+      rb-kqueue (~> 0.2.0)
+      rest-client (>= 1.6.0, < 3.0)
+      ruby_dep (<= 1.3.1)
+      rubyzip (~> 2.0)
+      vagrant_cloud (~> 2.0.3)
+      wdm (~> 0.1.0)
+      winrm (>= 2.3.4, < 3.0)
+      winrm-elevated (>= 1.2.1, < 2.0)
+      winrm-fs (>= 1.3.4, < 2.0)
+
 PATH
   remote: .
   specs:
-    vagrant-ovirt4 (2.0.0)
+    vagrant-ovirt4 (2.1.0)
       filesize (~> 0)
-      nokogiri (>= 1.10.8)
-      ovirt-engine-sdk (~> 4.0.1)
+      nokogiri (~> 1)
+      ovirt-engine-sdk (~> 4)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    bcrypt_pbkdf (1.0.1)
+    builder (3.2.4)
     byebug (11.1.3)
-    coderay (1.1.2)
+    childprocess (4.0.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    ed25519 (1.2.4)
+    erubi (1.10.0)
+    ffi (1.15.0)
     filesize (0.2.0)
+    gssapi (1.3.1)
+      ffi (>= 1.0.1)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    hashicorp-checkpoint (0.1.5)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
     json (2.5.1)
+    listen (3.5.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    little-plugger (1.1.4)
+    log4r (1.1.10)
+    logging (2.3.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.14)
     method_source (1.0.0)
+    mime (0.4.4)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0225)
     mini_portile2 (2.5.0)
-    nokogiri (1.11.1)
+    multi_json (1.15.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-sftp (3.0.0)
+      net-ssh (>= 5.0.0, < 7.0.0)
+    net-ssh (6.1.0)
+    netrc (0.11.0)
+    nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    ovirt-engine-sdk (4.0.12)
-      json
-    pry (0.13.1)
+    nori (2.6.0)
+    ovirt-engine-sdk (4.4.1)
+      json (>= 1, < 3)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (~> 0.10)
     racc (1.5.2)
     rake (13.0.3)
-    rake-release (1.2.1)
+    rake-release (1.3.0)
       bundler (>= 1.11, < 3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rb-kqueue (0.2.6)
+      ffi (>= 0.5.0)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby_dep (1.3.1)
+    rubyntlm (0.6.3)
+    rubyzip (2.3.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    vagrant_cloud (2.0.3)
+      rest-client (~> 2.0.2)
+    wdm (0.1.1)
+    winrm (2.3.6)
+      builder (>= 2.1.2)
+      erubi (~> 1.8)
+      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.3)
+    winrm-elevated (1.2.3)
+      erubi (~> 1.8)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.3.5)
+      erubi (~> 1.8)
+      logging (>= 1.6.1, < 3.0)
+      rubyzip (~> 2.0)
+      winrm (~> 2.0)
 
 PLATFORMS
   ruby
@@ -44,6 +156,9 @@ DEPENDENCIES
   rake
   rake-release
   rspec-core
+  rspec-its
+  rspec-mocks (~> 3.5)
+  vagrant!
   vagrant-ovirt4!
 
 BUNDLED WITH

data/README.md

@@ -145,3 +145,10 @@ end
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+Some pointers:
+
+* To install the requirements when developing:
+    * `bundle install`
+* To run the test suite:
+    * `bundle exec rspec spec/`

data/SECURITY.md

@@ -0,0 +1,23 @@
+## Security
+
+If you believe you have found a security vulnerability, please report it to me as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.** Instead, please report them to me directly at [myoung34@my.apsu.edu](mailto:myoung34@my.apsu.edu).  
+
+If you'd like to communicate securely, my keybase is [here](https://keybase.io/3vilpenguin)
+
+Please include the requested information listed below (as much as you can provide) to help better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+## Preferred Languages
+
+I prefer all communications to be in English.

data/lib/vagrant-ovirt4.rb

@@ -1,3 +1,4 @@
+require 'log4r'
 require 'pathname'
 require 'vagrant-ovirt4/plugin'
 
@@ -8,9 +9,11 @@ module VagrantPlugins
     autoload :Errors, lib_path.join("errors")
     autoload :Util,   lib_path.join("util")
 
+    @@logger = Log4r::Logger.new("vagrant_ovirt4::provider")
     @@ovirt_connection = nil
     @@vms_service = nil
     def self.ovirt_connection
+      @@logger.warn('Use of deprecated OVirtProvider.ovirt_connection detected.')
       @@ovirt_connection
     end
 
@@ -19,6 +22,7 @@ module VagrantPlugins
     end
 
     def self.vms_service
+      @@logger.warn('Use of deprecated OVirtProvider.vms_service detected.')
       @@vms_service
     end
 

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

@@ -24,12 +24,24 @@ module VagrantPlugins
           conn_attr[:headers] = {'Filter' => true} if config.filtered_api
 
           @logger.info("Connecting to oVirt (#{config.url}) ...")
-          OVirtProvider.ovirt_connection = OvirtSDK4::Connection.new(conn_attr)          
-          OVirtProvider.vms_service = OVirtProvider.ovirt_connection.system_service.vms_service
-          env[:connection] = OVirtProvider.ovirt_connection
-          env[:vms_service] = OVirtProvider.vms_service
-
-          @app.call(env)
+          ovirt_connection = OvirtSDK4::Connection.new(conn_attr)
+          vms_service = ovirt_connection.system_service.vms_service
+
+          # XXX: Continue setting deprecated global properties. Use of the
+          # related values from env should be preferred.
+          OVirtProvider.ovirt_connection = ovirt_connection
+          OVirtProvider.vms_service = vms_service
+
+          begin
+            ovirt_connection.test(true, 30)
+          rescue => error
+            raise Errors::ServiceConnectionError,
+              :error_message => error.message
+          else
+            env[:connection] = ovirt_connection
+            env[:vms_service] = vms_service
+            @app.call(env)
+          end
         end
 
       end

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

@@ -14,34 +14,30 @@ module VagrantPlugins
 
           system_service = env[:connection].system_service
 
-          # Find all the virtual machines and store the id and name in a
+          #Find all storage domains and store the id and name in a
           # hash, so that looking them up later will be faster:
-          vms_map = Hash[env[:vms_service].list.map { |vm| [vm.id, vm.name] }]
-          
-          # Same for storage domains:
           sds_service = system_service.storage_domains_service
           sds_map = Hash[sds_service.list.map { |sd| [sd.id, sd.name] }]
           
           # For each virtual machine find its snapshots, then for each snapshot
           # find its disks:
           xs = [['id', 'description', 'date']]
-          vms_map.each do |vm_id, vm_name|
-            vm_service = env[:vms_service].vm_service(vm_id)
-            snaps_service = vm_service.snapshots_service
-            snaps_map = Hash[snaps_service.list.map { |snap| [snap.id, { description: snap.description, date: snap.date }] }]
-            snaps_map.each do |snap_id, metadata|
-              snap_description = metadata[:description]
-              snap_date = metadata[:date]
-              snap_service = snaps_service.snapshot_service(snap_id)
-              disks_service = snap_service.disks_service
-              disks_service.list.each do |disk|
-                next unless disk.storage_domains.any?
-                sd_id = disk.storage_domains.first.id
-                sd_name = sds_map[sd_id]
-                xs.push([snap_id, snap_description, snap_date.to_s])
-              end
+          vm_service = env[:vms_service].vm_service(env[:machine].id)
+          snaps_service = vm_service.snapshots_service
+          snaps_map = Hash[snaps_service.list.map { |snap| [snap.id, { description: snap.description, date: snap.date }] }]
+          snaps_map.each do |snap_id, metadata|
+            snap_description = metadata[:description]
+            snap_date = metadata[:date]
+            snap_service = snaps_service.snapshot_service(snap_id)
+            disks_service = snap_service.disks_service
+            disks_service.list.each do |disk|
+              next unless disk.storage_domains.any?
+              sd_id = disk.storage_domains.first.id
+              sd_name = sds_map[sd_id]
+              xs.push([snap_id, snap_description, snap_date.to_s])
             end
           end
+
           widths = xs.transpose.map { |column_arr| column_arr.map(&:size).max }
           env[:machine_snapshot_list] = 
               xs.map { |row_arr| 

data/lib/vagrant-ovirt4/errors.rb

@@ -7,6 +7,10 @@ module VagrantPlugins
         error_namespace("vagrant_ovirt4.errors")
       end
 
+      class ServiceConnectionError < VagrantOVirtError
+        error_key(:service_connection_error)
+      end
+
       class RsyncError < VagrantOVirtError
         error_key(:rsync_error)
       end

data/lib/vagrant-ovirt4/version.rb

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

data/locales/en.yml

@@ -60,6 +60,8 @@ en:
       short_not_created: |-
         not created
     errors:
+      service_connection_error: |-
+        Error connecting to the oVirt cluster endpoint: "%{error_message}"
       remove_vm_error: |-
         Error removing VM '%{vm_name}'. oVirt error message was '%{error_message}'
       no_vm_error: |-

data/spec/vagrant-ovirt4/config_spec.rb

@@ -40,9 +40,9 @@ describe VagrantPlugins::OVirtProvider::Config do
     its("cluster")           { should be_nil }
     its("console")           { should be_nil }
     its("template")          { should be_nil }
-    its("memory_size")       { should == 256000000 }
-    its("memory_maximum")    { should == 256000000 }
-    its("memory_guaranteed") { should == 256000000 }
+    its("memory_size")       { should == 268435456 }
+    its("memory_maximum")    { should == 268435456 }
+    its("memory_guaranteed") { should == 268435456 }
     its("cloud_init")        { should be_nil }
     its("affinity")          { should be_nil }
     its("placement_host")    { should be_nil }
@@ -54,7 +54,7 @@ describe VagrantPlugins::OVirtProvider::Config do
   end
 
   describe "overriding defaults" do
-    [:url, :username, :password, :insecure, :debug, :filtered_api, :cpu_cores, :cpu_sockets, :cpu_threads, :cluster, :console, :template, :cloud_init, :placement_host, :bios_serial, :optimized_for, :description, :comment].each do |attribute|
+    [:url, :username, :password, :insecure, :debug, :filtered_api, :cpu_cores, :cpu_sockets, :cpu_threads, :cluster, :console, :template, :cloud_init, :placement_host, :bios_serial, :description, :comment].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")
@@ -64,19 +64,38 @@ describe VagrantPlugins::OVirtProvider::Config do
     end
   end
 
+  describe "overriding optimized_for" do
+    [:optimized_for].each do |attribute|
+      ['server', 'desktop'].each do |value|
+        it "should accept #{value} for #{attribute}" do
+          instance.send("#{attribute}=".to_sym, value)
+          instance.finalize!
+          instance.send(attribute).should == value
+        end
+      end
+
+      it "should reject a value for #{attribute} outside of the defined values" do
+        expect {
+          instance.send("#{attribute}=".to_sym, "foo")
+          instance.finalize!
+        }.to raise_error(RuntimeError)
+      end
+    end
+  end
+
   describe "overriding memory defaults" do
     [:memory_size, :memory_maximum, :memory_guaranteed].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "512 MiB")
         instance.finalize!
-        instance.send(attribute).should == 512000000
+        instance.send(attribute).should == 536870912
       end
 
       it "should convert the value" do
         instance.send("#{attribute}=".to_sym, "1 GiB")
         instance.finalize!
-        instance.send(attribute).should == 1000000000
+        instance.send(attribute).should == 1073741824
       end
 
     end
@@ -106,4 +125,5 @@ describe VagrantPlugins::OVirtProvider::Config do
 
     end
   end
+
 end

data/vagrant-ovirt4.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ovirt-engine-sdk
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: '1'
 description: Vagrant provider for oVirt and RHEV v4
 email:
 - myoung34@my.apsu.edu
@@ -63,12 +63,14 @@ files:
 - ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
+- CHANGELOG
 - Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- SECURITY.md
 - example_box/README.md
 - example_box/Vagrantfile
 - example_box/dummy.box