vagrant-ovirt4 2.0.0 → 2.2.0

data/spec/vagrant-ovirt4/config_spec.rb

@@ -11,11 +11,53 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = [:should, :expect]
   end
+
+  # When this setting is enabled, check that we saw calls to all available
+  # provider config readers and writers.
+  config.add_setting :check_provider_config_attr_accessor_calls
+  config.check_provider_config_attr_accessor_calls ||= ENV.key?('CI')
 end
 
 describe VagrantPlugins::OVirtProvider::Config do
   let(:instance) { described_class.new }
 
+  if RSpec.configuration.check_provider_config_attr_accessor_calls
+    before :all do
+      @writers ||=  described_class.instance_methods.grep(/\w\=$/).sort - Vagrant.plugin('2', :config).instance_methods
+      @readers ||= @writers.map { |w| w.to_s.sub(/\=$/, '').to_sym }
+
+      @writer_calls ||= Hash.new { |h, w| h[w] = 0 }
+      @reader_calls ||= Hash.new { |h, r| h[r] = 0 }
+    end
+
+    before :each do
+      @writers.each do |writer|
+        ivar = :"@#{writer.to_s.sub(/\=$/, '')}"
+        allow(instance).to receive(writer) do |arg|
+          instance.instance_variable_set(ivar, arg)
+          @writer_calls[writer] += 1
+          arg
+        end
+      end
+
+      @readers.each do |reader|
+        ivar = :"@#{reader}"
+
+        allow(instance).to receive(reader) do
+          @reader_calls[reader] += 1
+          instance.instance_variable_get(ivar)
+        end
+      end
+    end
+
+    after :all do
+      missing_writers = @writers.select { |w| @writer_calls[w].zero? }
+      missing_readers = @readers.select { |w| @reader_calls[w].zero? }
+      all = missing_readers + missing_writers
+      fail "saw no tests of the following config methods: #{all.map(&:inspect).join(", ")}" unless all.empty?
+    end
+  end
+
   # Ensure tests are not affected by AWS credential environment variables
   before :each do
     ENV.stub(:[] => nil)
@@ -40,9 +82,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 }
@@ -50,11 +92,16 @@ describe VagrantPlugins::OVirtProvider::Config do
     its("optimized_for")     { should be_nil }
     its("description")       { should == '' }
     its("comment")           { should == '' }
+    its("vmname")            { should be_nil }
+    its("timeout")           { should be_nil }
+    its("connect_timeout")   { should be_nil }
+    its("disks")             { should be_empty }
+    its("run_once")          { should be false }
 
   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, :vmname].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")
@@ -64,19 +111,40 @@ describe VagrantPlugins::OVirtProvider::Config do
     end
   end
 
+  describe "overriding optimized_for" do
+    [:optimized_for].each do |attribute|
+      OvirtSDK4::VmType.constants.each do |const|
+        value = const.to_s.downcase
+
+        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
@@ -84,26 +152,143 @@ describe VagrantPlugins::OVirtProvider::Config do
 
   describe "overriding affinity defaults" do
     [:affinity].each do |attribute|
+      OvirtSDK4::VmAffinity.constants.each do |const|
+        value = const.to_s.downcase
+
+        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 disk size defaults" do
+    ['10 GiB', '999 M', '101010101 KB'].each do |value|
+      it "should accept #{value.inspect} for disk size" do
+        instance.send("disk_size=".to_sym, value)
+        expect { instance.finalize! }.not_to raise_error
+      end
+    end
 
-      context 'valid value' do
-        it "should not default #{attribute} if overridden" do
-          instance.send("#{attribute}=".to_sym, "pinned")
+    [-1, '10 Umm', Object.new].each do |value|
+      it "should reject #{value.inspect} for disk size" do
+        instance.send("disk_size=".to_sym, value)
+        expect { instance.finalize! }.to raise_error do |error|
+          expect(error).to be_a(RuntimeError)
+          expect(error.message).to match(/^Not able to parse '[^']+'\. Please verify and check again\.$/)
+        end
+      end
+    end
+
+  end
+
+  describe "overriding timeout defaults" do
+    [:timeout, :connect_timeout].each do |attribute|
+      [0, 6, 1_000_000, 8.10, nil].each do |value|
+        it "should accept #{value.to_s} for #{attribute}" do
+          instance.send("#{attribute}=".to_sym, value)
           instance.finalize!
-          instance.send(attribute).should == "pinned"
+
+          if value.nil?
+            instance.send(attribute).should be_nil
+          else
+            instance.send(attribute).should == Integer(value)
+          end
         end
       end
 
-      context 'invalid value' do
-        it "should error" do
+      ["foo", Object.new, -100].each do |value|
+        it "should reject a value for #{attribute} outside of the defined values" do
           expect {
-            instance.send("#{attribute}=".to_sym, "foo")
+            instance.send("#{attribute}=".to_sym, value)
             instance.finalize!
-          }.to raise_error(RuntimeError)
-
+          }.to raise_error { |error|
+            expect(error).to be_a(RuntimeError)
+            expect(error.message).to match(/nonnegative integer/)
+          }
         end
+      end
+    end
+
+  end
+
+  describe "adding storage" do
+    let(:storage)        { :file }
+    let(:storage_size)   { '8 GiB' }
+    let(:storage_type)   { 'qcow2' }
+    let(:storage_domain) { 'mystoragedomain' }
+
+    def configure_storage!
+      instance.storage(storage, size: storage_size, type: storage_type, storage_domain: storage_domain)
+    end
+
+    before do
+      expect(instance.disks).to be_empty
+    end
+
+    it "handles storage specifications" do
+      configure_storage!
+      instance.finalize!
+      expect(instance.disks).not_to be_empty
+      expect(instance.disks).to include(hash_including(
+        name: 'storage_disk_1',
+        type: storage_type,
+        bus: 'virtio',
+        storage_domain: storage_domain,
+      ))
+    end
 
+    context "given a type other than #{:file.inspect}" do
+      let(:storage) { :foobar }
+
+      it "ignores the storage specification" do
+        configure_storage!
+        instance.finalize!
+        expect(instance.disks).to be_empty
       end
+    end
 
+    context "given an invalid storage size" do
+      let(:storage_size) { 'Nope' }
+
+      it "raises an exception" do
+        expect { configure_storage! }.to raise_error(ArgumentError)
+      end
     end
+
   end
+
+  describe "overriding run_once defaults" do
+    context "given truthy values" do
+      [Object.new, {}, true, 1, 0].each do |value|
+        it "should convert #{value.inspect} to 'true'" do
+          instance.run_once = value
+          instance.finalize!
+          expect(instance.run_once).to be true
+        end
+      end
+    end
+
+    context "given falsey values" do
+      [false, nil].each do |value|
+        it "should convert #{value.inspect} to 'false'" do
+          instance.run_once = value
+          instance.finalize!
+          expect(instance.run_once).to be false
+        end
+      end
+    end
+
+  end
+
 end

data/spec/vagrant-ovirt4/util/connection_spec.rb

@@ -0,0 +1,80 @@
+require 'vagrant-ovirt4/util/connection'
+
+describe VagrantPlugins::OVirtProvider::Util::Connection do
+  class MockConnection
+    def initialize(exception)
+      @closed = false
+      @exception = exception
+    end
+
+    def close
+      raise @exception if @closed
+      @closed = true
+    end
+  end
+
+  let(:error_class) { described_class::ERROR_CLASSES.first }
+  let(:exception) { error_class.new('already closed') }
+  let(:conn) { MockConnection.new(exception) }
+
+  describe '#safe_close_connection!' do
+    context 'when called on an open connection' do
+      it 'does not raise an error' do
+        expect { described_class.safe_close_connection!(conn) }.not_to raise_error
+      end
+    end
+
+    context 'when called on an already-closed connection' do
+      context 'and the error pertains to double-closing' do
+        it 'yields the error' do
+          expect { described_class.safe_close_connection!(conn) }.not_to raise_error
+          expect { |b| described_class.safe_close_connection!(conn, &b) }.to yield_with_args(exception)
+        end
+      end
+
+      context 'and the error does not pertain to double-close' do
+        let(:exception) { RuntimeError.new('sorry, no') }
+
+        it 'yields and then raises the error' do
+          expect { described_class.safe_close_connection!(conn) }.not_to raise_error
+          expect { |b| described_class.safe_close_connection!(conn, &b) }.to yield_with_args(exception).and raise_error(exception)
+        end
+      end
+    end
+  end
+
+  describe '#safe_connection_connection_standard!' do
+    let(:env) {
+      {
+        connection: conn,
+        ui: double('ui'),
+      }
+    }
+
+    context 'when called on an open connection' do
+      it 'does not raise an error' do
+        expect { described_class.safe_close_connection_standard!(env) }.not_to raise_error
+      end
+    end
+
+    context 'when called on an already-closed connection' do
+      context 'and the error pertains to double-closing' do
+        it 'logs a warning' do
+          expect { described_class.safe_close_connection_standard!(env) }.not_to raise_error
+          expect(env[:ui]).to receive(:warn).with(/^Encountered exception of class #{exception.class}: #{exception.message}/)
+          expect { described_class.safe_close_connection_standard!(env) }.not_to raise_error
+        end
+      end
+
+      context 'and the error does not pertain to double-close' do
+        let(:exception) { RuntimeError.new('sorry, no') }
+
+        it 'logs a warning and then raises the error' do
+          expect { described_class.safe_close_connection_standard!(env) }.not_to raise_error
+          expect(env[:ui]).to receive(:warn).with(/^Encountered exception of class #{exception.class}: #{exception.message}/)
+          expect { |b| described_class.safe_close_connection_standard!(env) }.to raise_error(exception)
+        end
+      end
+    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.2.0
 platform: ruby
 authors:
 - Marcus Young
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2022-04-14 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
@@ -60,15 +60,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/FUNDING.yml"
-- ".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
@@ -110,10 +111,14 @@ files:
 - lib/vagrant-ovirt4/provider.rb
 - lib/vagrant-ovirt4/util.rb
 - lib/vagrant-ovirt4/util/collection.rb
+- lib/vagrant-ovirt4/util/connection.rb
+- lib/vagrant-ovirt4/util/machine_names.rb
 - lib/vagrant-ovirt4/util/timer.rb
 - lib/vagrant-ovirt4/version.rb
 - locales/en.yml
 - spec/spec_helper.rb
+- spec/support/shared_context.rb
+- spec/vagrant-ovirt4/action/create_vm_spec.rb
 - spec/vagrant-ovirt4/action/is_created_spec.rb
 - spec/vagrant-ovirt4/action/is_running_spec.rb
 - spec/vagrant-ovirt4/action/message_already_up_spec.rb
@@ -124,7 +129,9 @@ files:
 - spec/vagrant-ovirt4/action/message_saving_state_spec.rb
 - spec/vagrant-ovirt4/action/read_ssh_info_spec.rb
 - spec/vagrant-ovirt4/action/read_state_spec.rb
+- spec/vagrant-ovirt4/action/start_vm_spec.rb
 - spec/vagrant-ovirt4/config_spec.rb
+- spec/vagrant-ovirt4/util/connection_spec.rb
 - templates/Vagrantfile.erb
 - tools/prepare_redhat_for_box.sh
 - vagrant-ovirt4.gemspec
@@ -132,7 +139,7 @@ homepage: https://github.com/myoung34/vagrant-ovirt4
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,13 +154,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: This vagrant plugin provides the ability to create, control, and destroy
   virtual machines under oVirt/RHEV
 test_files:
 - spec/spec_helper.rb
+- spec/support/shared_context.rb
+- spec/vagrant-ovirt4/action/create_vm_spec.rb
 - spec/vagrant-ovirt4/action/is_created_spec.rb
 - spec/vagrant-ovirt4/action/is_running_spec.rb
 - spec/vagrant-ovirt4/action/message_already_up_spec.rb
@@ -164,4 +173,6 @@ test_files:
 - spec/vagrant-ovirt4/action/message_saving_state_spec.rb
 - spec/vagrant-ovirt4/action/read_ssh_info_spec.rb
 - spec/vagrant-ovirt4/action/read_state_spec.rb
+- spec/vagrant-ovirt4/action/start_vm_spec.rb
 - spec/vagrant-ovirt4/config_spec.rb
+- spec/vagrant-ovirt4/util/connection_spec.rb

data/.github/workflows/release.yml

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