vagrant-ovirt4 1.2.3 → 2.1.3

data/spec/vagrant-ovirt4/action/create_vm_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+require 'vagrant-ovirt4/action/create_vm'
+require 'vagrant-ovirt4/config'
+
+describe VagrantPlugins::OVirtProvider::Action::CreateVM do
+  include_context 'provider:action'
+
+  let(:vm) { double('vm', id: 'ID') }
+
+  subject(:action) { described_class.new(app, env) }
+
+  before do
+    allow(env[:ui]).to receive(:info)
+    allow(env[:machine]).to receive(:"id=").with(vm.id)
+    allow(vm_service.get).to receive(:status).and_return('down')
+  end
+
+  context 'given a custom vmname' do
+    let(:vmname) { 'VMNAME' }
+
+    it 'uses that as the name for machine creation' do
+      env[:machine].provider_config.vmname = vmname
+      expect(env[:vms_service]).to receive(:add).with(hash_including(name: vmname)).and_return(vm)
+      action.call(env)
+    end
+  end
+
+  context 'given no custom vmname' do
+    context 'given a custom hostname' do
+      let(:hostname) { 'HOSTNAME' }
+
+      it 'uses that as the name for machine creation' do
+        expect(env[:machine].config.vm).to receive(:hostname).and_return(hostname)
+        expect(env[:vms_service]).to receive(:add).with(hash_including(name: hostname)).and_return(vm)
+        action.call(env)
+      end
+    end
+
+    context 'given no custom hostname' do
+      it 'uses a default name for machine creation' do
+        expect(env[:machine].config.vm).to receive(:hostname)
+        expect(env[:vms_service]).to receive(:add).with(hash_including(name: 'vagrant')).and_return(vm)
+        action.call(env)
+      end
+    end
+  end
+end

data/spec/vagrant-ovirt4/action/read_ssh_info_spec.rb

@@ -17,7 +17,7 @@ describe VagrantPlugins::OVirtProvider::Action::ReadSSHInfo do
     expect(action).to receive(:call).with(env)
     action.call(env)
   end
-  
+
   context 'unknown API error' do
     before do
       allow(env.machine).to receive(:id).and_return('wat')
@@ -25,35 +25,35 @@ describe VagrantPlugins::OVirtProvider::Action::ReadSSHInfo do
       allow(env.vms_service.vm_service).to receive(:get).and_raise('boom')
 
     end
-  
-    it 'continues the middleware chain' do
+
+    it 'returns nil' do
       expect(app).to receive(:call).with(env)
       action.call(env)
-      expect(env.machine_ssh_info).to eq(:not_created)
+      expect(env.machine_ssh_info).to be_nil
     end
-
   end
 
   context 'machine does not exist' do
     before do
       allow(env.machine).to receive(:id).and_return(nil)
     end
-  
-    it 'continues the middleware chain' do
+
+    it 'returns nil' do
       expect(app).to receive(:call).with(env)
       action.call(env)
-      expect(env.machine_ssh_info).to eq(:not_created)
+      expect(env.machine_ssh_info).to be_nil
     end
-
   end
 
   context 'machine exists' do
+    let(:port)     { 44 }
+
     before do
       allow(env.machine).to receive(:id).and_return('wat')
       allow(env.machine).to receive(:config).and_return(OpenStruct.new({
         ssh: OpenStruct.new({
-          guest_port: 44,
-        }),
+          guest_port: port
+        })
       }))
       allow(env.vms_service).to receive(:vm_service).and_return({})
       allow(env.vms_service.vm_service).to receive(:get).and_return({})
@@ -61,13 +61,27 @@ describe VagrantPlugins::OVirtProvider::Action::ReadSSHInfo do
       allow(env.vms_service.vm_service.nics_service).to receive(:list).and_return({})
       allow(env.vms_service.vm_service.get).to receive(:status).and_return('active')
     end
-  
-    it 'continues the middleware chain' do
-      expect(app).to receive(:call).with(env)
-      action.call(env)
-      expect(env.machine_ssh_info).to eq({:host=>nil, :port=>44, :username=>nil, :private_key_path=>nil, :forward_agent=>nil, :forward_x11=>nil})
+
+    context 'with no IP addresses defined' do
+      it 'returns nil' do
+        expect(app).to receive(:call).with(env)
+        action.call(env)
+        expect(env.machine_ssh_info).to be_nil
+      end
     end
 
+    context 'with at least one IP address defined' do
+      let(:host) { '10.10.10.10' }
+
+      before do
+        allow(action).to receive(:first_active_ipv4_address).and_return(host)
+      end
+
+      it 'returns filled-out SSH information' do
+        expect(app).to receive(:call).with(env)
+        action.call(env)
+        expect(env.machine_ssh_info).to eq(host: host, port: port, username: nil, private_key_path: nil, forward_agent: nil, forward_x11: nil)
+      end
+    end
   end
 end
-

data/spec/vagrant-ovirt4/action/start_vm_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require 'vagrant-ovirt4/action/start_vm'
+require 'vagrant-ovirt4/config'
+
+describe VagrantPlugins::OVirtProvider::Action::StartVM do
+  include_context 'provider:action'
+
+  subject(:action) { described_class.new(app, env) }
+
+  before do
+    allow(env[:ui]).to receive(:info)
+    allow(env[:machine].config.vm).to receive(:hostname)
+    allow(vm_service.get).to receive(:status).and_return('nominal')
+    allow(vm_service).to receive(:start)
+  end
+
+  def vm_initialization_hash_including_hostname(hostname)
+    hash_including(vm: hash_including(initialization: hash_including(host_name: hostname)))
+  end
+
+  context 'given a custom hostname' do
+    let(:hostname) { 'HOSTNAME' }
+
+    it 'uses that as the hostname for machine initialization' do
+      expect(env[:machine].config.vm).to receive(:hostname).and_return(hostname)
+      expect(vm_service).to receive(:start).with(vm_initialization_hash_including_hostname(hostname))
+      action.call(env)
+    end
+  end
+
+  context 'given no custom hostname' do
+    it 'uses a default value as the hostname for machine initialization' do
+      expect(vm_service).to receive(:start).with(vm_initialization_hash_including_hostname('vagrant'))
+      action.call(env)
+    end
+  end
+
+  context 'given a custom run_once setting' do
+    [true, false].each do |value|
+      it 'uses that setting' do
+        env[:machine].provider_config.run_once = value
+        expect(vm_service).to receive(:start).with(hash_including(vm: hash_including(run_once: value)))
+        action.call(env)
+      end
+    end
+  end
+
+  context 'given no custom run_once setting' do
+    it 'defaults to false' do
+      expect(vm_service).to receive(:start).with(hash_including(vm: hash_including(run_once: false)))
+      action.call(env)
+    end
+  end
+end

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 }
@@ -50,11 +50,12 @@ describe VagrantPlugins::OVirtProvider::Config do
     its("optimized_for")     { should be_nil }
     its("description")       { should == '' }
     its("comment")           { should == '' }
+    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].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")
@@ -64,19 +65,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 MB")
+        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 GB")
+        instance.send("#{attribute}=".to_sym, "1 GiB")
         instance.finalize!
-        instance.send(attribute).should == 1000000000
+        instance.send(attribute).should == 1073741824
       end
 
     end
@@ -84,26 +106,77 @@ 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
 
-      context 'valid value' do
-        it "should not default #{attribute} if overridden" do
-          instance.send("#{attribute}=".to_sym, "pinned")
+  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 "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,7 +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'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.1.3
 platform: ruby
 authors:
 - Marcus Young
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-05 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
@@ -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'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Vagrant provider for oVirt and RHEV v4
 email:
 - myoung34@my.apsu.edu
@@ -45,16 +59,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
-- ".kitchen.yml"
 - ".rspec"
+- CHANGELOG
 - Dockerfile
 - Gemfile
 - Gemfile.lock
-- Jenkinsfile
 - LICENSE
 - README.md
 - Rakefile
+- SECURITY.md
 - example_box/README.md
 - example_box/Vagrantfile
 - example_box/dummy.box
@@ -85,7 +100,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
@@ -97,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
@@ -111,19 +129,17 @@ 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
-- 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
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,13 +154,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-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
@@ -155,8 +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
-- 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
+- spec/vagrant-ovirt4/util/connection_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