vagrant-ovirt4 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 39542385ebe4d052d2162d780c224872b24b7078
-  data.tar.gz: 8b5d7423e508a64525d10e4d0f267d4748d254fc
+SHA256:
+  metadata.gz: 7f0791674c10129bc4c799c0edc0a69688c5afad9bf97d5330c8dbfd804fc303
+  data.tar.gz: ff664c4cf2241450255854076a784cade3b519143e27c96cfe202f1af8bbb456
 SHA512:
-  metadata.gz: fee43b803b78e337acafe857b8e1924fc548f6ed572b71d668eb3d1b5714b74e3ff4d5d013135459bbf37f63d0515d64ee05a66c3a8b0e682756641a2cf6ff7a
-  data.tar.gz: 313e552a891fa6a0f01380782c28857a6c0168b052b45bd4befea2491ca03f3f2b06fec7b9b3201d57cb6e1bc213b2f12179131d5d49d65f5b1707265dfaf352
+  metadata.gz: 462531777be650d20de06a80c170d435733e62b42e60aa52600e9f52a72a36dd407be247682b68dccc8fad93b8b7d71c42c0f89f2734637be7e79c996f63fc9b
+  data.tar.gz: 7d5c64d01517722e218f6aed6110c47fcb60aa50fc6f00d2b66e5c1e55f5e84494bd961255524b9fe950b4dbd77e0356075069e0d78b0afe5ddedaf46da25571

data/.kitchen.yml

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

data/Gemfile.lock

@@ -24,7 +24,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-ovirt4 (1.2.2)
+    vagrant-ovirt4 (1.2.1)
       filesize (~> 0)
       ovirt-engine-sdk (~> 4.0.1)
 
@@ -45,10 +45,10 @@ GEM
     domain_name (0.5.20170223)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    excon (0.55.0)
+    excon (0.71.0)
     faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.17)
+    ffi (1.11.1)
     filesize (0.1.1)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -132,7 +132,7 @@ GEM
       byebug (~> 9.0)
       pry (~> 0.10)
     rainbow (2.2.1)
-    rake (0.9.6)
+    rake (13.0.1)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
@@ -163,7 +163,7 @@ GEM
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby_dep (1.3.1)
     rubyntlm (0.6.1)
-    rubyzip (1.2.1)
+    rubyzip (1.3.0)
     safe_yaml (1.0.4)
     slop (3.6.0)
     sslshake (1.0.13)

data/README.md

@@ -56,7 +56,7 @@ $ vagrant up --provider=ovirt4
 ```
 Vagrant.configure("2") do |config|
   config.vm.box = 'ovirt4'
-  config.vm.hostname = "foo" 
+  config.vm.hostname = "foo"
   config.vm.box_url = 'https://github.com/myoung34/vagrant-ovirt4/blob/master/example_box/dummy.box?raw=true'
 
   config.vm.network :private_network,
@@ -70,14 +70,18 @@ Vagrant.configure("2") do |config|
     ovirt.password = "password"
     ovirt.insecure = true
     ovirt.debug = true
+    ovirt.filtered_api = true #see http://www.ovirt.org/develop/release-management/features/infra/user-portal-permissions/
     ovirt.cluster = 'Default'
     ovirt.template = 'Vagrant-Centos7-test'
     ovirt.console = 'vnc'
+    ovirt.disk_size = '15 GB' # only growing is supported. works the same way as below memory settings
     ovirt.memory_size = '1 GiB' #see https://github.com/dominikh/filesize for usage
     ovirt.memory_guaranteed = '256 MB' #see https://github.com/dominikh/filesize for usage
     ovirt.cpu_cores = 2
     ovirt.cpu_sockets = 2
     ovirt.cpu_threads = 2
+    ovirt.bios_serial = aaabbbb-ccc-dddd
+    ovirt.optimized_for = 'server'
     ovirt.cloud_init =<<EOF
 write_files:
   - content: |
@@ -86,6 +90,8 @@ write_files:
     permissions: '0644'
 EOF
 
+    # additional disks
+    ovirt.storage :file, size: "8 GiB", type: 'qcow2', storage_domain: "mystoragedomain"
   end
 end
 ```
@@ -107,7 +113,6 @@ end
   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. `datacenter` => The name of the ovirt datacenter to create within. Required. String. No Default value.
   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.
@@ -119,12 +124,18 @@ end
   1. `cloud_init` => The cloud-init data to pass. Must be properly formatted as yaml. [Docs here](http://cloudinit.readthedocs.io/en/latest/topics/examples.html)
   1. `affinity` =>  The affinity to use. [See this for possible uses](http://www.rubydoc.info/gems/ovirt-engine-sdk/OvirtSDK4/VmAffinity). Optional. Invalid will cause a `RuntimeError`
   1. `placement_host` => The host to start the VM on. Optional.
+  1. `bios_serial` => The BIOS serial number to assign. Optional.
+  1. `optimized_for` => The "optimized for" setting. Can be one of 'Desktop' or 'Server' (case insensitive). Optional.
+  1. `storage` => adds a new storage disk to the VM
+    a. `size`: the size of the disk
+    a. `type`: the type of disk. It can be either `qcow2` or `raw`
+    a. `storage_domain`: the storage domain where the disk should be created
 
 
 ## Testing
 
 Currently pull-requests are tested via [test-kitchen using kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant).
-See [Jenkinsfile](Jenkinsfile) for more information. 
+See [Jenkinsfile](Jenkinsfile) for more information.
 If you'd like to run them yourself, however, they make not work in all setups. For example they assume `192.168.2.0/24`, host pinning will probably not have a host that's in all set ups, and the template names might not match.
 
 To run Unit tests: `bundle install; bundle exec rspec`

data/lib/vagrant-ovirt4/action.rb

@@ -9,6 +9,7 @@ module VagrantPlugins
       # This action is called to bring the box up from nothing.
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
+          b.use HandleBox
           b.use ConfigValidate
           b.use ConnectOVirt
           b.use Call, ReadState do |env, b2|
@@ -26,7 +27,7 @@ module VagrantPlugins
             if env[:machine_state_id] == :not_created
               b2.use SetNameOfDomain
               b2.use CreateVM
-              #b2.use ResizeDisk
+              b2.use ResizeDisk
 
               b2.use Provision
               b2.use CreateNetworkInterfaces
@@ -38,6 +39,7 @@ module VagrantPlugins
             b2.use WaitTillUp
             b2.use SyncFolders
           end
+          b.use DisconnectOVirt
         end
       end
 
@@ -55,6 +57,7 @@ module VagrantPlugins
             b2.use HaltVM
             b2.use WaitTillDown
             b2.use DestroyVM
+            b2.use DisconnectOVirt
           end
         end
       end
@@ -77,9 +80,11 @@ module VagrantPlugins
       # state is expected to be put into the `:machine_state_id` key.
       def self.action_read_state
         Vagrant::Action::Builder.new.tap do |b|
+          b.use HandleBox
           b.use ConfigValidate
           b.use ConnectOVirt
           b.use ReadState
+          b.use DisconnectOVirt
         end
       end
 
@@ -91,6 +96,7 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use ConnectOVirt
           b.use ReadSSHInfo
+          b.use DisconnectOVirt
         end
       end
 
@@ -111,6 +117,7 @@ module VagrantPlugins
             raise Errors::NoIPError if env[:ip_address].nil?
             b2.use SSHExec
           end
+          b.use DisconnectOVirt
         end
       end
 
@@ -131,6 +138,7 @@ module VagrantPlugins
             raise Errors::NoIPError if env[:ip_address].nil?
             b2.use SSHRun
           end
+          b.use DisconnectOVirt
         end
       end
 
@@ -210,6 +218,7 @@ module VagrantPlugins
 
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :ConnectOVirt, action_root.join("connect_ovirt")
+      autoload :DisconnectOVirt, action_root.join("disconnect_ovirt")
       autoload :CreateNetworkInterfaces, action_root.join("create_network_interfaces")
       autoload :CreateVM, action_root.join("create_vm")
       autoload :DestroyVM, action_root.join("destroy_vm")
@@ -218,6 +227,7 @@ module VagrantPlugins
       autoload :IsRunning, action_root.join("is_running")
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
       autoload :ReadState, action_root.join("read_state")
+      autoload :ResizeDisk, action_root.join("resize_disk")
       autoload :SetNameOfDomain, action_root.join("set_name_of_domain")
       autoload :SnapshotDelete, action_root.join("snapshot_delete")
       autoload :SnapshotList, action_root.join("snapshot_list")
@@ -248,6 +258,7 @@ module VagrantPlugins
             end
             yield env, b2
           end
+          b.use DisconnectOVirt
         end
       end
     end

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

@@ -21,6 +21,7 @@ module VagrantPlugins
           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
 
           @logger.info("Connecting to oVirt (#{config.url}) ...")
           OVirtProvider.ovirt_connection = OvirtSDK4::Connection.new(conn_attr)          

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

@@ -16,58 +16,72 @@ module VagrantPlugins
 
         def call(env)
 
-          iface_options = nil
           config = env[:machine].provider_config
-          env[:machine].config.vm.networks.each do |config|
-            type, options = config
-            # We support private networks only. They mean both the same right now.
-            next unless [:private_network].include? type
 
-            iface_options = scoped_hash_override(options, :ovirt)
+          # FIX MULTIPLE NETWORK INTERFACES
+          vagrantfile_networks = []
+          @logger.info("Found next configured networks in Vagrantfile:")
+          env[:machine].config.vm.networks.each do |network|
+            type, options = network
+
+            # We support private networks only
+            next unless type == :private_network
+            @logger.info("#{network}")
+
+            vagrantfile_networks << [type, options]
           end
 
-          begin
-            nics_service = env[:vms_service].vm_service(env[:machine].id).nics_service
-            if iface_options.nil?
-              # throw an error if they didn't provide any sort of information on interfaces _and_ the VM has none
-              raise Errors::NoNetworkError if nics_service.list.count == 0
-            else
-              # provided a network block of some sort. Search oVirt for the corresponding network_profile_ids
-              @logger.info("Finding network #{iface_options[:network_name]} for given cluster #{config.cluster}")
-              clusters_service = env[:connection].system_service.clusters_service
-              cluster = clusters_service.list(search: "name=#{config.cluster}").first
-              profiles_service = env[:connection].system_service.vnic_profiles_service
-              network_profile_ids = profiles_service.list.map do |profile|
-                if env[:connection].follow_link(profile.network).data_center.id == cluster.data_center.id and
-                     profile.name == iface_options[:network_name]
-                  profile.id
+          @logger.info("Processing each found configured network")
+          vagrantfile_networks.each do |network|
+            type, options = network
+
+            iface_options = scoped_hash_override(options, :ovirt)
+            @logger.info("Interface options: #{iface_options}")
+
+            begin
+              nics_service = env[:vms_service].vm_service(env[:machine].id).nics_service
+              if iface_options.nil?
+                # throw an error if they didn't provide any sort of information on interfaces _and_ the VM has none
+                raise Errors::NoNetworkError if nics_service.list.count == 0
+              else
+                # provided a network block of some sort. Search oVirt for the corresponding network_profile_ids
+                @logger.info("Finding network #{iface_options[:network_name]} for given cluster #{config.cluster}")
+                clusters_service = env[:connection].system_service.clusters_service
+                cluster = clusters_service.list(search: "name=#{config.cluster}").first
+                profiles_service = env[:connection].system_service.vnic_profiles_service
+                network_profile_ids = profiles_service.list.map do |profile|
+                  if env[:connection].follow_link(profile.network).data_center.id == cluster.data_center.id and
+                      profile.name == iface_options[:network_name]
+                    profile.id
+                  end
                 end
-              end
-              network_profile_id = network_profile_ids.compact.first
-              # error if they provided a 'network name' but it could not be located in the previous search
-              raise Errors::NetworkNotFoundError, :network_name => iface_options[:network_name] if network_profile_id.nil? and !iface_options[:network_name].nil?
+                network_profile_id = network_profile_ids.compact.first
+                # error if they provided a 'network name' but it could not be located in the previous search
+                raise Errors::NetworkNotFoundError, :network_name => iface_options[:network_name] if network_profile_id.nil? and !iface_options[:network_name].nil?
 
-              # quick and dirty way to look for a 'nic#' that is not already attached to the machine
-              iface = (("nic1".."nic8").flat_map { |x| x } - env[:vms_service].vm_service(env[:machine].id).nics_service.list.map(&:name)).first rescue "vagrant_nic1"
-              @logger.info("Creating network interface #{iface}")
-              nics_service.add(
-                OvirtSDK4::Nic.new(
-                  name: iface,
-                  vnic_profile: {
-                    id: network_profile_id
-                  }
+                # quick and dirty way to look for a 'nic#' that is not already attached to the machine
+                iface = (("nic1".."nic8").flat_map { |x| x } - env[:vms_service].vm_service(env[:machine].id).nics_service.list.map(&:name)).first rescue "vagrant_nic1"
+                @logger.info("Creating network interface #{iface}")
+                nics_service.add(
+                  OvirtSDK4::Nic.new(
+                    name: iface,
+                    vnic_profile: {
+                      id: network_profile_id
+                    }
+                  )
                 )
-              )
-            end
-          rescue => e
-            if config.debug
-              raise e
-            else
-              fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
-              raise Errors::AddInterfaceError,
-                :error_message => fault_message
+              end
+            rescue => e
+              if config.debug
+                raise e
+              else
+                fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+                raise Errors::AddInterfaceError,
+                  :error_message => fault_message
+              end
             end
           end
+          # END FIX MULTIPLE NETWORK INTERFACES
 
           # Continue the middleware chain.
           @app.call(env)

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

@@ -25,6 +25,15 @@ module VagrantPlugins
           env[:ui].info(" -- Cluster:       #{config.cluster}")
           env[:ui].info(" -- Template:      #{config.template}")
           env[:ui].info(" -- Console Type:  #{config.console}")
+          env[:ui].info(" -- BIOS Serial:   #{config.bios_serial}")
+          env[:ui].info(" -- Optimized For: #{config.optimized_for}")
+          env[:ui].info(" -- Description:   #{config.description}")
+          env[:ui].info(" -- Comment:       #{config.comment}")
+          env[:ui].info(" -- Disk:          #{Filesize.from("#{config.disk_size} B").to_f('GB').to_i} GB") unless config.disk_size.nil?
+          env[:ui].info(" -- Additional Disks:") unless config.disks.empty?
+          config.disks.each do |disk|
+            env[:ui].info(" ---- name=#{disk[:name]} size=#{Filesize.from("#{disk[:size]} B").to_f('GB').to_i} GB")
+          end
           env[:ui].info(" -- Memory:        ")
           env[:ui].info(" ---- Memory:      #{Filesize.from("#{config.memory_size} B").to_f('MB').to_i} MB")
           env[:ui].info(" ---- Maximum:     #{Filesize.from("#{config.memory_maximum} B").to_f('MB').to_i} MB")
@@ -38,6 +47,8 @@ module VagrantPlugins
           # Create oVirt VM.
           attr = {
               :name     => hostname,
+              :description => config.description,
+              :comment => config.comment,
               :cpu      => {
                 :architecture => 'x86_64',
                 :topology => {
@@ -61,10 +72,11 @@ module VagrantPlugins
               :display  => {
                 :type => config.console,
               },
+              :type => config.optimized_for,
           }
 
           begin
-            server = env[:vms_service].add(attr) 
+            server = env[:vms_service].add(attr)
           rescue OvirtSDK4::Error => e
             fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
             retry if e.message =~ /Related operation is currently in progress/
@@ -89,6 +101,9 @@ module VagrantPlugins
             disk_attachments = disk_attachments_service.list
             disk_attachments.each do |disk_attachment|
               disk = env[:connection].follow_link(disk_attachment.disk)
+              if config.debug
+                env[:ui].info("Checking disk status id=#{disk.id} name=#{disk.name} status=#{disk.status}")
+              end
               if disk.status != 'ok'
                 disk_ready = false
                 break
@@ -103,6 +118,67 @@ module VagrantPlugins
             raise Errors::WaitForReadyVmTimeout
           end
 
+          # add storage disks
+          vm_service = env[:vms_service].vm_service(env[:machine].id)
+          disk_attachments_service = vm_service.disk_attachments_service
+          storage_disks = []
+          config.disks.each do |disk|
+            disk_attachment = disk_attachments_service.add(
+              OvirtSDK4::DiskAttachment.new(
+                disk: {
+                  name: disk[:name],
+                  description: '#{hostname} storage disk',
+                  format: disk[:type] == 'qcow2' ? OvirtSDK4::DiskFormat::COW : OvirtSDK4::DiskFormat::RAW,
+                  provisioned_size: disk[:size],
+                  storage_domains: [{
+                    name: disk[:storage_domain]
+                  }]
+                },
+                interface: disk[:bus] == 'virtio' ? OvirtSDK4::DiskInterface::VIRTIO : OvirtSDK4::DiskInterface::IDE,
+                bootable: false,
+                active: true
+              )
+            )
+            storage_disks << disk_attachment
+            env[:ui].info("Added storage disk id=#{disk_attachment.disk.id} name=#{disk[:name]} size=#{disk[:size]}")
+          end
+
+          disks_service = env[:connection].system_service.disks_service
+          storage_disks.each do |s_disk|
+            disk_service = disks_service.disk_service(s_disk.disk.id)
+            loop do
+              sleep(5)
+              disk = disk_service.get
+              if config.debug
+                env[:ui].info("Checking disk status id=#{disk.id} name=#{disk.name} status=#{disk.status}")
+              end
+              break if disk.status == OvirtSDK4::DiskStatus::OK
+            end
+          end
+
+          begin
+            if config.bios_serial
+              vm_service = env[:vms_service].vm_service(env[:machine].id)
+              vm_service.update(
+                serial_number: {
+                  policy: OvirtSDK4::SerialNumberPolicy::CUSTOM,
+                  value: config.bios_serial,
+                }
+              )
+            end
+          rescue OvirtSDK4::Error => e
+            fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+            retry if e.message =~ /Related operation is currently in progress/
+
+            if config.debug
+              raise e
+            else
+              raise Errors::UpdateBiosError,
+                :error_message => fault_message
+            end
+          end
+
+
           @app.call(env)
         end
 
@@ -116,6 +192,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()
         end
       end
     end

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

@@ -0,0 +1,25 @@
+require 'log4r'
+require 'ovirtsdk4'
+
+module VagrantPlugins
+  module OVirtProvider
+    module Action
+      class DisconnectOVirt
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant_ovirt4::action::disconnect_ovirt")
+          @app = app
+        end
+
+        def call(env)
+
+          # Get config options for ovirt provider.
+          @logger.info("Disconnecting oVirt connection")
+          env[:connection].close()
+
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end

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

@@ -36,7 +36,7 @@ module VagrantPlugins
 
           nics_service = server.nics_service
           nics = nics_service.list
-          ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment).reported_devices.collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+          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
 
           # Return the info
           # TODO: Some info should be configurable in Vagrantfile

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

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

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

@@ -24,35 +24,37 @@ module VagrantPlugins
 
           # Get machine first.
           begin
-            machine = OVirtProvider::Util::Collection.find_matching(
-              env[:ovirt_compute].servers.all, env[:machine].id.to_s)
+            vm_service = env[:vms_service].vm_service(env[:machine].id.to_s)
           rescue => e
             raise Errors::NoVMError, :vm_id => env[:machine].id
           end
 
+          disk_attachments_service = vm_service.disk_attachments_service
+          disk_attachments = disk_attachments_service.list
+          disk = disk_attachments.first.disk
+
           # Extend disk size if necessary
           begin
-            machine.update_volume(
-              :id      => machine.volumes.first.id,
-              :size    => config.disk_size*1024*1024*1024,
+            disk_attachment_service = disk_attachments_service.attachment_service(disk.id)
+            disk_attachment = disk_attachment_service.update(
+              OvirtSDK4::DiskAttachment.new(disk: {provisioned_size: config.disk_size})
             )
           rescue => e
             raise Errors::UpdateVolumeError,
               :error_message => e.message
           end
 
-          # Wait till all volumes are ready.
+          # Wait until resize operation has finished.
+          disks_service = env[:connection].system_service.disks_service
+          disk_service = disks_service.disk_service(disk.id)
           env[:ui].info(I18n.t("vagrant_ovirt4.wait_for_ready_volume"))
-          for i in 0..10
-            ready = true
-            machine = env[:ovirt_compute].servers.get(env[:machine].id.to_s)
-            machine.volumes.each do |volume|
-              if volume.status != 'ok'
-                ready = false
-                break
-              end
+          ready = false
+          for i in 0..120
+            disk = disk_service.get
+            if disk.status == OvirtSDK4::DiskStatus::OK
+              ready = true
+              break
             end
-            break if ready
             sleep 2
           end
 

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

@@ -25,22 +25,30 @@ module VagrantPlugins
               :vm_name => env[:machine].id.to_s
           end
 
-          iface_options = nil
-          env[:machine].config.vm.networks.each do |config|
-            type, options = config
-            next unless [:private_network].include? type
+          # FIX MULTIPLE NETWORK INTERFACES
+          hostname = env[:machine].config.vm.hostname
+          hostname = 'vagrant' if hostname.nil?
+
+          initialization = {
+            host_name: hostname,
+            nic_configurations: [],
+            custom_script: config.cloud_init,
+          }
 
-            iface_options = scoped_hash_override(options, :ovirt)
+          configured_ifaces_options = []
+          env[:machine].config.vm.networks.each do |network|
+            type, options = network
+            next unless type == :private_network
+
+            configured_ifaces_options << scoped_hash_override(options, :ovirt)
           end
 
-          hostname = env[:machine].config.vm.hostname
-          hostname = 'vagrant' if hostname.nil?
+          (0...configured_ifaces_options.length()).each do |iface_index|
+            iface_options = configured_ifaces_options[iface_index]
 
-          nic_configuration = nil
-          unless iface_options.nil?
             if iface_options[:ip] then
               nic_configuration = {
-                name: 'eth0',
+                name: "eth#{iface_index}",
                 on_boot: true,
                 boot_protocol: OvirtSDK4::BootProtocol::STATIC,
                 ip: {
@@ -52,21 +60,17 @@ module VagrantPlugins
               }
             else
               nic_configuration = {
-                name: 'eth0',
+                name: "eth#{iface_index}",
                 on_boot: true,
                 boot_protocol: OvirtSDK4::BootProtocol::DHCP,
               }
             end
 
-            initialization = {
-              host_name: hostname,
-              nic_configurations: [nic_configuration],
-              custom_script: config.cloud_init,
-            }
-
+            initialization[:nic_configurations] << nic_configuration
             initialization[:dns_servers] = iface_options[:dns_servers] unless iface_options[:dns_servers].nil?
             initialization[:dns_search] = iface_options[:dns_search] unless iface_options[:dns_search].nil?
           end
+          # END FIX MULTIPLE NETWORK INTERFACES
 
           vm_configuration = {
             initialization: initialization,

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

@@ -1,6 +1,8 @@
 require 'log4r'
 require 'vagrant-ovirt4/util/timer'
 require 'vagrant/util/retryable'
+require 'socket'
+require 'timeout'
 
 module VagrantPlugins
   module OVirtProvider
@@ -16,6 +18,23 @@ module VagrantPlugins
           @app = app
         end
 
+        def port_open?(ip, port, seconds=10)
+          # => checks if a port is open or not on a remote host
+          Timeout::timeout(seconds) do
+            begin
+              TCPSocket.new(ip, port).close
+              @logger.info("SSH Check OK for IP: #{ip}")
+              true
+            rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, SocketError => e
+              @logger.info("SSH Connection Failed for IP #{ip}: #{e}")
+              false
+            end
+          end
+          rescue Timeout::Error
+            @logger.info("SSH Connection Failed: Timeout for IP: #{ip}" )
+            false
+        end
+
         def call(env)
           # Initialize metrics if they haven't been
           env[:metrics] ||= {}
@@ -38,11 +57,15 @@ module VagrantPlugins
 
               nics_service = server.nics_service
               nics = nics_service.list
-              ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment).reported_devices.collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+              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
               unless ip_addr.nil?
-                env[:ip_address] = ip_addr
-                break
-                @logger.debug("Got output #{env[:ip_address]}")
+                env[:ui].info("Got IP: #{ip_addr}")
+                # Check if SSH-Server is up
+                if port_open?(ip_addr, 22)
+                  env[:ip_address] = ip_addr
+                  break
+                  @logger.debug("Got output #{env[:ip_address]}")
+                end
               end
               sleep 5
             end

data/lib/vagrant-ovirt4/config.rb

@@ -11,6 +11,8 @@ module VagrantPlugins
       attr_accessor :password
       attr_accessor :insecure
       attr_accessor :debug
+      attr_accessor :disk_size
+      attr_accessor :filtered_api
       attr_accessor :cpu_cores
       attr_accessor :cpu_sockets
       attr_accessor :cpu_threads
@@ -23,6 +25,11 @@ module VagrantPlugins
       attr_accessor :cloud_init
       attr_accessor :affinity
       attr_accessor :placement_host
+      attr_accessor :bios_serial
+      attr_accessor :optimized_for
+      attr_accessor :description
+      attr_accessor :comment
+      attr_accessor :disks
 
       def initialize
         @url               = UNSET_VALUE
@@ -30,6 +37,8 @@ module VagrantPlugins
         @password          = UNSET_VALUE
         @insecure          = UNSET_VALUE
         @debug             = UNSET_VALUE
+        @disk_size         = UNSET_VALUE
+        @filtered_api      = UNSET_VALUE
         @cpu_cores         = UNSET_VALUE
         @cpu_sockets       = UNSET_VALUE
         @cpu_threads       = UNSET_VALUE
@@ -42,15 +51,48 @@ module VagrantPlugins
         @cloud_init        = UNSET_VALUE
         @affinity          = UNSET_VALUE
         @placement_host    = UNSET_VALUE
+        @bios_serial       = UNSET_VALUE
+        @optimized_for     = UNSET_VALUE
+        @description       = UNSET_VALUE
+        @comment           = UNSET_VALUE
+        @disks             = []
 
       end
 
+      def storage(storage_type, options = {})
+        if storage_type == :file
+          _handle_disk_storage(options)
+        end
+      end
+
+      def _handle_disk_storage(options ={})
+        options = {
+          name: "storage_disk_#{@disks.length + 1}",
+          type: 'qcow2',
+          size: Filesize.from('8G').to_f('B').to_i,
+          bus: 'virtio'
+        }.merge(options)
+
+        disk = {
+          name: options[:name],
+          device: options[:device],
+          type: options[:type],
+          size: Filesize.from(options[:size]).to_f('B').to_i,
+          storage_domain: options[:storage_domain],
+          bus: options[:bus]
+        }
+
+        @disks << disk  # append
+      end
+
       def finalize!
         @url = nil if @url == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
         @password = nil if @password == UNSET_VALUE
         @insecure = false if @insecure == UNSET_VALUE
         @debug = false if @debug == UNSET_VALUE
+        @disk_size = nil if @disk_size == UNSET_VALUE
+        @filtered_api = false if @filtered_api == UNSET_VALUE
         @cpu_cores = 1 if @cpu_cores == UNSET_VALUE
         @cpu_sockets = 1 if @cpu_sockets == UNSET_VALUE
         @cpu_threads = 1 if @cpu_threads == UNSET_VALUE
@@ -63,16 +105,32 @@ module VagrantPlugins
         @cloud_init = nil if @cloud_init == UNSET_VALUE
         @affinity = nil if @affinity == UNSET_VALUE
         @placement_host = nil if @placement_host == UNSET_VALUE
+        @bios_serial = nil if @bios_serial == UNSET_VALUE
+        @optimized_for = nil if @optimized_for == UNSET_VALUE
+        @description = '' if @description == UNSET_VALUE
+        @comment = '' if @comment == UNSET_VALUE
+
+        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
+        end
 
         unless affinity.nil?
           raise "Invalid affinity. Must be one of #{OvirtSDK4::VmAffinity.constants.map { |s| "'#{s.downcase}'" }.join(' ')}" unless OvirtSDK4::VmAffinity.constants.include? affinity.upcase.to_sym
         end
 
+        unless disk_size.nil?
+          begin
+            @disk_size = Filesize.from(@disk_size).to_f('B').to_i
+          rescue ArgumentError
+            raise "Not able to parse 'disk_size'. Please verify and check again."
+          end
+        end
+
         begin
           @memory_size = Filesize.from(@memory_size).to_f('B').to_i
           @memory_maximum = Filesize.from(@memory_maximum).to_f('B').to_i
           @memory_guaranteed = Filesize.from(@memory_guaranteed).to_f('B').to_i
-        rescue ArgumentError 
+        rescue ArgumentError
           raise "Not able to parse either `memory_size` or `memory_guaranteed`. Please verify and check again."
         end
       end

data/lib/vagrant-ovirt4/errors.rb

@@ -7,6 +7,10 @@ module VagrantPlugins
         error_namespace("vagrant_ovirt4.errors")
       end
 
+      class RsyncError < VagrantOVirtError
+        error_key(:rsync_error)
+      end
+
       class NoVMError < VagrantOVirtError
         error_key(:no_vm_error)
       end
@@ -47,9 +51,17 @@ module VagrantPlugins
         error_key(:remove_snapshot_error)
       end
 
+      class UpdateVolumeError < VagrantOVirtError
+        error_key(:resize_disk_error)
+      end
+
       class RemoveVMError < VagrantOVirtError
         error_key(:remove_vm_error)
       end
+
+      class UpdateBiosError < VagrantOVirtError
+        error_key(:update_bios_error)
+      end
     end
   end
 end

data/lib/vagrant-ovirt4/version.rb

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

data/locales/en.yml

@@ -14,6 +14,8 @@ en:
       VM is currently powering up. Please run `vagrant halt` to abort or wait until its status is 'up'.
     wait_for_ready_vm: |-
       Waiting for VM to become "ready" to start...
+    wait_for_ready_volume: |-
+      Waiting for disk resize to finish...
     error_recovering: |-
       An error occured. Recovering..
     waiting_for_ip: |-
@@ -58,8 +60,12 @@ en:
         Error removing VM '%{vm_name}'. oVirt error message was '%{error_message}'
       no_vm_error: |-
         No VM found with id '%{vm_id}'
+      rsync_error: |-
+        An rsync error occurred. oVirt error message was '%{error_message}'
       create_vm_error: |-
         Creation failed. oVirt error message was '%{error_message}'
+      update_bios_error: |-
+        BIOS update failed. oVirt error message was '%{error_message}'
       start_vm_error: |-
         Unable to start VM: %{error_message}
       no_network_error: |-
@@ -76,3 +82,5 @@ en:
         Snapshot with id %{id} is the active snapshot which cannot be removed.
       remove_snapshot_error: |-
         Snapshot with id %{id} Could not be removed. Details: %{error_message}.
+      resize_disk_error: |-
+        Disk resize failed. oVirt error message was '%{error_message}'

data/spec/vagrant-ovirt4/config_spec.rb

@@ -33,6 +33,7 @@ describe VagrantPlugins::OVirtProvider::Config do
     its("password")          { should be_nil }
     its("insecure")          { should == false }
     its("debug")             { should == false }
+    its("filtered_api")      { should == false }
     its("cpu_cores")         { should == 1 }
     its("cpu_sockets")       { should == 1 }
     its("cpu_threads")       { should == 1 }
@@ -45,11 +46,15 @@ describe VagrantPlugins::OVirtProvider::Config do
     its("cloud_init")        { should be_nil }
     its("affinity")          { should be_nil }
     its("placement_host")    { should be_nil }
+    its("bios_serial")       { should be_nil }
+    its("optimized_for")     { should be_nil }
+    its("description")       { should == '' }
+    its("comment")           { should == '' }
 
   end
 
   describe "overriding defaults" do
-    [:url, :username, :password, :insecure, :debug, :cpu_cores, :cpu_sockets, :cpu_threads, :cluster, :console, :template, :cloud_init, :placement_host].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, :optimized_for, :description, :comment].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")

data/test/integration/bios_serial/bios_serial_spec.rb

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

data/test/integration/optimized_for.sh

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ovirt-engine-sdk
@@ -65,6 +65,7 @@ files:
 - lib/vagrant-ovirt4/action/create_network_interfaces.rb
 - lib/vagrant-ovirt4/action/create_vm.rb
 - lib/vagrant-ovirt4/action/destroy_vm.rb
+- lib/vagrant-ovirt4/action/disconnect_ovirt.rb
 - lib/vagrant-ovirt4/action/halt_vm.rb
 - lib/vagrant-ovirt4/action/is_created.rb
 - lib/vagrant-ovirt4/action/is_running.rb
@@ -112,8 +113,9 @@ files:
 - spec/vagrant-ovirt4/action/read_state_spec.rb
 - spec/vagrant-ovirt4/config_spec.rb
 - templates/Vagrantfile.erb
-- test/Vagrantfile
+- 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
@@ -136,8 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: This vagrant plugin provides the ability to create, control, and destroy
@@ -155,6 +156,7 @@ test_files:
 - spec/vagrant-ovirt4/action/read_ssh_info_spec.rb
 - spec/vagrant-ovirt4/action/read_state_spec.rb
 - spec/vagrant-ovirt4/config_spec.rb
-- test/Vagrantfile
+- test/integration/bios_serial/bios_serial_spec.rb
 - test/integration/dynamic_network/network_spec.rb
+- test/integration/optimized_for.sh
 - test/integration/singleton-static_network/network_spec.rb

data/test/Vagrantfile

@@ -1,19 +0,0 @@
-Vagrant.configure("2") do |config|
-  config.vm.box = 'ovirt4'
-  config.vm.hostname = "testing"
-  config.vm.box_url = 'https://github.com/myoung34/vagrant-ovirt4/blob/master/example_box/dummy.box?raw=true'
-
-  config.vm.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'
-
-
-  config.vm.provider :ovirt4 do |ovirt|
-    ovirt.url = 'https://ovirt/ovirt-engine/api'
-    ovirt.username = "#{ENV['OVIRT_TEST_USER']}"
-    ovirt.password = "#{ENV['OVIRT_TEST_PASS']}"
-    ovirt.insecure = true
-    ovirt.cluster = 'Default'
-    ovirt.template = 'vagrant-centos7'
-  end
-end