vagrant-ovirt4 2.1.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 032a8a924b7d7f1870fc319f4d4ed13f33910d0bb6bccde70fce977f25c8cafd
-  data.tar.gz: d3495cebef0d0daf9c5d2d9bbd09a3c271844844c4a334258049dc55a0f31062
+  metadata.gz: 7f8d267202b71616a27bf1a4b721fe29264a7128d7643d0059a0558a3a6d76c8
+  data.tar.gz: 4dfc4ee00d4dfef59a9a9acf0e4639bdcd86bf4f030de479e6e0c526eb088441
 SHA512:
-  metadata.gz: 9b04cf43df3269c745ffb0bb7d503f9f192da7e3b7939d2b2428e3597684e4ed6dbebca051c16ff20529415f4a85ea506070658d84089e47bf9fbf9e16ae8c28
-  data.tar.gz: e6f60e4dbb661bcfa8cc39f8cd0fcb4633949490abf8910a5fc8f792c9ef45451aff4d6aed449e4e52e7d1cb020f6327a1dcf2d4743a1a342463263cf114782c
+  metadata.gz: 013cbee883c91387751dcb150c4cae7af3e73275845d67f9019e6b508564ad756adc48d8d6d84b721188bd631e006511a58928c3e44b34b0086deac8a50d2d74
+  data.tar.gz: b281f7740fbc84ca12bc8c81a95a6b1ebfeeaa4246c0726384b389a0130716291bf3d859650fcc697a22a7f97a671e114745e403a0b5bb27137b24197e6dc3a5

data/CHANGELOG

@@ -1,3 +1,22 @@
+v2.1.2
+79a0074 Fix lock file
+
+v2.1.1
+605663e Bump nokogiri from 1.13.3 to 1.13.4
+2981f5c Default to disabling run-once mode
+f048313 Enable oVirt conn debugging when VAGRANT_LOG=info
+3555e36 Add safe connection closing methods
+cdb765c Support :timeout and :timeout_connect options
+tomeon/test-all-vmtype-andvmaffinity-values
+2a9a653 Rakefile: add RSpec task
+7641780 test all valid VmType and VmAffinity values
+54efcde Add tests for vmname and hostname settings
+dc3ab3e Add "vmname" provider option
+233e4bb read_ssh_info: return nil on IPv4 lookup failure
+fcff147 Bump nokogiri from 1.12.5 to 1.13.3
+da44f24 Bump nokogiri from 1.11.4 to 1.12.5
+9025f4e Bump nokogiri from 1.11.3 to 1.11.4
+
 v2.1.0
 41b8c63 Move where rspec-mocks is included.
 0015c45 Update engine binding.

data/Gemfile.lock

@@ -28,7 +28,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-ovirt4 (2.1.0)
+    vagrant-ovirt4 (2.1.3)
       filesize (~> 0)
       nokogiri (~> 1)
       ovirt-engine-sdk (~> 4)
@@ -41,26 +41,27 @@ GEM
     byebug (11.1.3)
     childprocess (4.0.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.2.4)
     erubi (1.10.0)
-    ffi (1.15.0)
+    ffi (1.15.5)
     filesize (0.2.0)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
+      rexml (~> 3.0)
     hashicorp-checkpoint (0.1.5)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    json (2.5.1)
-    listen (3.5.1)
+    json (2.6.1)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
@@ -70,10 +71,9 @@ GEM
       multi_json (~> 1.14)
     method_source (1.0.0)
     mime (0.4.4)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    mini_portile2 (2.5.0)
+    mime-types-data (3.2022.0105)
     multi_json (1.15.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -81,49 +81,49 @@ GEM
       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)
+    nokogiri (1.13.4-x86_64-darwin)
       racc (~> 1.4)
     nori (2.6.0)
     ovirt-engine-sdk (4.4.1)
       json (>= 1, < 3)
-    pry (0.14.1)
+    pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.8.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
-    racc (1.5.2)
-    rake (13.0.3)
+      pry (~> 0.13.0)
+    racc (1.6.0)
+    rake (13.0.6)
     rake-release (1.3.0)
       bundler (>= 1.11, < 3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rb-kqueue (0.2.6)
+    rb-kqueue (0.2.8)
       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-expectations (3.10.1)
+    rexml (3.2.5)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     ruby_dep (1.3.1)
     rubyntlm (0.6.3)
-    rubyzip (2.3.0)
+    rubyzip (2.3.2)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8.1)
     vagrant_cloud (2.0.3)
       rest-client (~> 2.0.2)
     wdm (0.1.1)

data/README.md

@@ -1,3 +1,5 @@
+[OvirtSDK4::Connection#initialize]: https://rubydoc.info/gems/ovirt-engine-sdk/OvirtSDK4%2FConnection:initialize
+
 # Vagrant oVirt v4 Provider
 
 This is a [Vagrant](http://www.vagrantup.com) 1.1+ plugin that adds an
@@ -76,8 +78,12 @@ Vagrant.configure("2") do |config|
     ovirt.password = "password"
     ovirt.insecure = true
     ovirt.debug = true
+    ovirt.timeout = 120 # seconds
+    ovirt.connect_timeout = 30 # seconds
     ovirt.filtered_api = true #see http://www.ovirt.org/develop/release-management/features/infra/user-portal-permissions/
     ovirt.cluster = 'Default'
+    ovirt.vmname = 'my-vm'
+    ovirt.run_once = false
     ovirt.template = 'Vagrant-Centos7-test'
     ovirt.console = 'vnc'
     ovirt.disk_size = '15 GiB' # only growing is supported. works the same way as below memory settings
@@ -105,8 +111,8 @@ end
 ### Configuration options
 
 1. Vagrant specific
-  1. `config.vm.hostname` => Sets the hostname of the VM
-    a. Is the 'name' in the Virtual Machine tab of the UI
+  1. `config.vm.hostname` => Sets the hostname of the VM. Optional. String.
+     Default is `"vagrant"`.
     a. Is the 'hostname' of the VM configured by `cloud-init`
   1. `config.vm.network` => Sets the network information of the VM.
     a. Note: `:ip` => is ignored, but `:ovirt__ip` is used and merged with `:ip`
@@ -118,7 +124,22 @@ end
   1. `username` => The username for the API. Required. String. No default value.
   1. `password` => The password for the API. Required. String. No default value.
   1. `insecure` => Allow connecting to SSL sites without certificates. Optional. Bool. Default is `false`
-  1. `debug` => Turn on additional log statements. Optional. Bool. Default is `false`.
+  1. `debug` => Turn on additional log statements. Optional. Bool. Default is
+     `true` if Vagrant's logging verbosity is set to `info` or above
+     (`VAGRANT_LOG={info,debug,...}`); otherwise, the default is `false`.
+  1. `timeout` => Per [the oVirt SDK docs][OvirtSDK4::Connection#initialize],
+     "The maximun (_sic_) total time to wait for the response, in seconds. A value of
+     zero (the default) means wait for ever." Optional. Integer. Uses the
+     `OvirtSDK4::Connection` default if omitted; as of the time of writing,
+     this is `0` (i.e. wait forever).
+  1. `connect_timeout` => Per [the oVirt SDK docs][OvirtSDK4::Connection#initialize],
+     "The maximun (_sic_) time to wait for connection establishment, in
+     seconds." Optional. Integer. Uses the `OvirtSDK4::Connection` default if
+     omitted; as of the time of writing, this is `300`.
+  1. `vmname` => Sets the name of the VM. Optional. String. Default is
+     `config.vm.hostname`, if defined, otherwise `"vagrant"`.
+    a. Is the 'name' in the Virtual Machine tab of the UI
+  1. `run_once` => Launch VM in run-once mode. Optional. Default is `false`.
   1. `template` => The name of the template to use for creation. Required. String. No Default value.
   1. `cluster` => The name of the ovirt cluster to create within. Required. String. No Default value.
   1. `console` => The type of remote viewing protocol to use. Required. String. No Default value.

data/Rakefile

@@ -14,3 +14,7 @@ Dir.chdir(File.expand_path("../", __FILE__))
 # This installs the tasks that help with gem creation and
 # publishing.
 Bundler::GemHelper.install_tasks
+
+RSpec::Core::RakeTask.new
+
+task :default => [:spec]

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

@@ -19,9 +19,19 @@ module VagrantPlugins
           conn_attr[:url] = "#{config.url}"
           conn_attr[:username] = config.username if config.username
           conn_attr[:password] = config.password if config.password
-          conn_attr[:debug] = config.debug if config.debug
           conn_attr[:insecure] = true if config.insecure
           conn_attr[:headers] = {'Filter' => true} if config.filtered_api
+          conn_attr[:timeout] = config.timeout unless config.timeout.nil?
+          conn_attr[:connect_timeout] = config.connect_timeout unless config.connect_timeout.nil?
+
+          # Respect VAGRANT_LOG setting -- any level at least as verbose as
+          # "info" will result in logging oVirt connection debugging messages
+          # (read: libcurl verbose output).
+          conn_attr[:debug] = config.debug or @logger.info?
+
+          # Inject our own logger so that messages are namespaced under
+          # "connect_ovirt"
+          conn_attr[:log] = @logger
 
           @logger.info("Connecting to oVirt (#{config.url}) ...")
           ovirt_connection = OvirtSDK4::Connection.new(conn_attr)

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

@@ -1,10 +1,14 @@
 require 'log4r'
+require 'vagrant-ovirt4/util/connection'
+require 'vagrant-ovirt4/util/machine_names'
 require 'vagrant/util/retryable'
 
 module VagrantPlugins
   module OVirtProvider
     module Action
       class CreateVM
+        include Util::Connection
+        include Util::MachineNames
         include Vagrant::Util::Retryable
 
         def initialize(app, env)
@@ -16,12 +20,11 @@ module VagrantPlugins
           # Get config.
           config = env[:machine].provider_config
 
-          hostname = env[:machine].config.vm.hostname
-          hostname = 'vagrant' if hostname.nil?
+          vmname = machine_vmname(env[:machine])
 
           # Output the settings we're going to use to the user
           env[:ui].info(I18n.t("vagrant_ovirt4.creating_vm"))
-          env[:ui].info(" -- Name:          #{hostname}")
+          env[:ui].info(" -- Name:          #{vmname}")
           env[:ui].info(" -- Cluster:       #{config.cluster}")
           env[:ui].info(" -- Template:      #{config.template}")
           env[:ui].info(" -- Console Type:  #{config.console}")
@@ -46,7 +49,7 @@ module VagrantPlugins
 
           # Create oVirt VM.
           attr = {
-              :name     => hostname,
+              :name     => vmname,
               :description => config.description,
               :comment => config.comment,
               :cpu      => {
@@ -127,7 +130,7 @@ module VagrantPlugins
               OvirtSDK4::DiskAttachment.new(
                 disk: {
                   name: disk[:name],
-                  description: '#{hostname} storage disk',
+                  description: "#{vmname} storage disk",
                   format: disk[:type] == 'qcow2' ? OvirtSDK4::DiskFormat::COW : OvirtSDK4::DiskFormat::RAW,
                   provisioned_size: disk[:size],
                   storage_domains: [{
@@ -192,7 +195,7 @@ module VagrantPlugins
           destroy_env[:config_validate] = false
           destroy_env[:force_confirm_destroy] = true
           env[:action_runner].run(Action.action_destroy, destroy_env)
-          env[:connection].close()
+          safe_close_connection_standard!(env)
         end
       end
     end

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

@@ -1,10 +1,13 @@
 require 'log4r'
 require 'ovirtsdk4'
+require 'vagrant-ovirt4/util/connection'
 
 module VagrantPlugins
   module OVirtProvider
     module Action
       class DisconnectOVirt
+        include Util::Connection
+
         def initialize(app, env)
           @logger = Log4r::Logger.new("vagrant_ovirt4::action::disconnect_ovirt")
           @app = app
@@ -14,7 +17,7 @@ module VagrantPlugins
 
           # Get config options for ovirt provider.
           @logger.info("Disconnecting oVirt connection")
-          env[:connection].close()
+          safe_close_connection_standard!(env)
 
           @app.call(env)
         end

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

@@ -17,31 +17,31 @@ module VagrantPlugins
           @app.call(env)
         end
 
+        # This method powers OVirtProvider::Provider#ssh_info.  It returns a
+        # hash of SSH connection information if and only if at least one IPv4
+        # address associated with the machine in question could be retrieved
+        # from the oVirt API.  Otherwise, it returns nil.
         def read_ssh_info(env)
           vms_service, machine = env[:vms_service], env[:machine]
-          return :not_created if machine.id.nil?
+          return nil if machine.id.nil?
 
           # Find the machine
           server = vms_service.vm_service(machine.id)
           begin
             if server.get.nil?
               machine.id = nil
-              return :not_created
+              return nil
             end
           rescue Exception => e
             machine.id = nil
-            return :not_created
-            raise e
+            return nil
           end
 
           nics_service = server.nics_service
           nics = nics_service.list
-          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
+          ip_addr = first_active_ipv4_address(env, nics)
+
+          return nil if ip_addr.nil?
 
           # Return the info
           # TODO: Some info should be configurable in Vagrantfile
@@ -54,7 +54,16 @@ module VagrantPlugins
             :forward_x11      => machine.config.ssh.forward_x11,
           }
 
-        end 
+        end
+
+      private
+
+        def first_active_ipv4_address(env, nics)
+          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
+          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
       end
     end
   end

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

@@ -1,4 +1,6 @@
 require 'log4r'
+require 'vagrant-ovirt4/errors'
+require 'vagrant-ovirt4/util/machine_names'
 require 'vagrant/util/scoped_hash_override'
 
 module VagrantPlugins
@@ -7,6 +9,7 @@ module VagrantPlugins
 
       # Just start the VM.
       class StartVM
+        include Util::MachineNames
         include Vagrant::Util::ScopedHashOverride
 
         def initialize(app, env)
@@ -26,8 +29,7 @@ module VagrantPlugins
           end
 
           # FIX MULTIPLE NETWORK INTERFACES
-          hostname = env[:machine].config.vm.hostname
-          hostname = 'vagrant' if hostname.nil?
+          hostname = machine_hostname(env[:machine])
 
           initialization = {
             host_name: hostname,
@@ -81,6 +83,7 @@ module VagrantPlugins
           vm_configuration = {
             initialization: initialization,
             placement_policy: {},
+            run_once: config.run_once
           }
 
           vm_configuration[:placement_policy][:hosts] = [{ :name => config.placement_host }] unless config.placement_host.nil?

data/lib/vagrant-ovirt4/config.rb

@@ -29,7 +29,11 @@ module VagrantPlugins
       attr_accessor :optimized_for
       attr_accessor :description
       attr_accessor :comment
+      attr_accessor :vmname
       attr_accessor :disks
+      attr_accessor :timeout
+      attr_accessor :connect_timeout
+      attr_accessor :run_once
 
       def initialize
         @url               = UNSET_VALUE
@@ -55,6 +59,10 @@ module VagrantPlugins
         @optimized_for     = UNSET_VALUE
         @description       = UNSET_VALUE
         @comment           = UNSET_VALUE
+        @vmname            = UNSET_VALUE
+        @timeout           = UNSET_VALUE
+        @connect_timeout   = UNSET_VALUE
+        @run_once          = UNSET_VALUE
         @disks             = []
 
       end
@@ -109,6 +117,10 @@ module VagrantPlugins
         @optimized_for = nil if @optimized_for == UNSET_VALUE
         @description = '' if @description == UNSET_VALUE
         @comment = '' if @comment == UNSET_VALUE
+        @vmname = nil if @vmname == UNSET_VALUE
+        @timeout = nil if @timeout == UNSET_VALUE
+        @connect_timeout = nil if @connect_timeout == UNSET_VALUE
+        @run_once = @run_once == UNSET_VALUE ? false : !!@run_once
 
         unless optimized_for.nil?
           raise "Invalid 'optimized_for'. Must be one of #{OvirtSDK4::VmType.constants.map { |s| "'#{s.downcase}'" }.join(' ')}" unless OvirtSDK4::VmType.constants.include? optimized_for.upcase.to_sym
@@ -133,6 +145,24 @@ module VagrantPlugins
         rescue ArgumentError
           raise "Not able to parse either `memory_size` or `memory_guaranteed`. Please verify and check again."
         end
+
+        unless timeout.nil?
+          begin
+            @timeout = Integer(@timeout)
+            raise ArgumentError if @timeout < 0
+          rescue ArgumentError, TypeError
+            raise "`timeout` argument #{@timeout.inspect} is not a valid nonnegative integer"
+          end
+        end
+
+        unless connect_timeout.nil?
+          begin
+            @connect_timeout = Integer(@connect_timeout)
+            raise ArgumentError if @connect_timeout < 0
+          rescue ArgumentError, TypeError
+            raise "`connect_timeout` argument #{@connect_timeout.inspect} is not a valid nonnegative integer"
+          end
+        end
       end
 
     end

data/lib/vagrant-ovirt4/util/connection.rb

@@ -0,0 +1,40 @@
+require 'ovirtsdk4'
+require 'ovirtsdk4/connection'
+
+module VagrantPlugins
+  module OVirtProvider
+    module Util
+      module Connection
+        # Use OVirtSDK4::ConnectionError if available; SDK versions older than
+        # 4.2.0 used the generic OVirtSDK4::Error.
+        ERROR_CLASSES = (OvirtSDK4.const_defined?(:ConnectionError) ? [OvirtSDK4::ConnectionError, OvirtSDK4::Error] : [OvirtSDK4::Error]).freeze
+
+      module_function
+
+        # Close a connection, suppressing errors generated by the SDK.  Yield
+        # the error to the caller to re-raise if appropriate (or log, or do
+        # whatever).
+        def safe_close_connection!(conn)
+          conn.close
+        rescue *ERROR_CLASSES => e
+          yield e if block_given?
+        rescue StandardError => e
+          yield e if block_given?
+          raise e
+        end
+
+        # Wrapper for "#safe_close_connection" that issues a warning message
+        # with diagnostic information about the exception raised.
+        def safe_close_connection_with_warning!(conn, ui)
+          safe_close_connection!(conn) { |e| ui.warn("Encountered exception of class #{e.class}: #{e.message}") }
+        end
+
+        # Wrapper for "#safe_close_connection_with_warning" that extracts the
+        # connection and UI from a Vagrant environment.
+        def safe_close_connection_standard!(env)
+          safe_close_connection_with_warning!(env[:connection], env[:ui])
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-ovirt4/util/machine_names.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module OVirtProvider
+    module Util
+      module MachineNames
+        DEFAULT_NAME = 'vagrant'.freeze
+
+      module_function
+
+        def machine_hostname(machine)
+          machine.config.vm.hostname || DEFAULT_NAME
+        end
+
+        def machine_vmname(machine)
+          machine.provider_config.vmname || machine_hostname(machine)
+        end
+      end
+    end
+  end
+end
+
+

data/lib/vagrant-ovirt4/version.rb

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

data/spec/spec_helper.rb

@@ -1 +1,3 @@
 require 'vagrant'
+
+require_relative 'support/shared_context'

data/spec/support/shared_context.rb

@@ -0,0 +1,39 @@
+require 'vagrant-ovirt4/config'
+
+shared_context 'provider:action' do
+  let(:app) { double('app') }
+
+  let(:env) {
+    {
+      connection: double('connection',
+        system_service: double('system_service', disks_service: double('disks_service'))
+      ),
+      machine: double('machine',
+        provider: double('provider'),
+        provider_config: VagrantPlugins::OVirtProvider::Config.new,
+        name: 'machname',
+        id: 'ID',
+        config: double('config',
+          vm: double('vm_config',
+            networks: [],
+          ),
+        ),
+      ),
+      ui: double('ui'),
+      vms_service: double('vms_service'),
+    }
+  }
+
+  let(:vm_service) {
+    double('vm_service',
+      disk_attachments_service: double('disk_attachments_service', list: []),
+      get: double('get'),
+    )
+  }
+
+  before do
+    allow(app).to receive(:call)
+    allow(env[:vms_service]).to receive(:vm_service).with(env[:machine].id).and_return(vm_service)
+    env[:machine].provider_config.finalize!
+  end
+end

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

@@ -50,6 +50,7 @@ describe VagrantPlugins::OVirtProvider::Config do
     its("optimized_for")     { should be_nil }
     its("description")       { should == '' }
     its("comment")           { should == '' }
+    its("run_once")          { should be false }
 
   end
 
@@ -66,7 +67,9 @@ describe VagrantPlugins::OVirtProvider::Config do
 
   describe "overriding optimized_for" do
     [:optimized_for].each do |attribute|
-      ['server', 'desktop'].each do |value|
+      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!
@@ -103,27 +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
 
-      context 'valid value' do
-        it "should not default #{attribute} if overridden" do
-          instance.send("#{attribute}=".to_sym, "pinned")
+  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 "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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.3
 platform: ruby
 authors:
 - Marcus Young
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ovirt-engine-sdk
@@ -60,7 +60,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/FUNDING.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG
@@ -112,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
@@ -126,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
@@ -134,7 +139,7 @@ homepage: https://github.com/myoung34/vagrant-ovirt4
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,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
@@ -166,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