vagrant-ovirt4 1.2.0 → 2.1.0

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

@@ -14,7 +14,20 @@ module VagrantPlugins
           env[:ui].info(I18n.t("vagrant_ovirt4.destroy_vm"))
 
           vm_service = env[:vms_service].vm_service(env[:machine].id)
-          vm_service.remove
+          begin
+            vm_service.remove
+          rescue OvirtSDK4::Error => e
+            fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+            retry if e.message =~ /Please try again/
+
+            if config.debug
+              raise e
+            else
+              raise Errors::RemoveVMError,
+                :error_message => fault_message
+            end
+          end
+
           env[:machine].id = nil
 
           @app.call(env)

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/halt_vm.rb

@@ -12,6 +12,17 @@ module VagrantPlugins
         def call(env)
           env[:ui].info(I18n.t("vagrant_ovirt4.halt_vm"))
 
+          # Halt via OS capability
+          begin
+            if env[:machine].guest.capability?(:halt)
+              env[:machine].guest.capability(:halt)
+              # Give the VM a chance to shutdown gracefully..."
+              sleep 10
+            end
+          rescue
+            env[:ui].info("Failed to shutdown guest gracefully.")
+          end
+
           machine = env[:vms_service].vm_service(env[:machine].id)
           machine.stop rescue nil #todo dont rescue
 

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

@@ -36,7 +36,12 @@ 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
+          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
 
           # Return the info
           # TODO: Some info should be configurable in Vagrantfile

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

@@ -33,7 +33,13 @@ 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
+          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
+
           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,36 +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_name => env[:machine].id.to_s
+            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/snapshot_list.rb

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

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

@@ -25,22 +25,36 @@ 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,
+          }
+
+          configured_ifaces_options = []
+          env[:machine].config.vm.networks.each do |network|
+            type, options = network
+            next unless type == :private_network
 
-            iface_options = scoped_hash_override(options, :ovirt)
+            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]
+
+            if iface_options[:interface_name] != nil then
+              iface_name = iface_options[:interface_name]
+            else
+              iface_name = "eth#{iface_index}"
+            end
 
-          nic_configuration = nil
-          unless iface_options.nil?
             if iface_options[:ip] then
               nic_configuration = {
-                name: 'eth0',
+                name: iface_name,
                 on_boot: true,
                 boot_protocol: OvirtSDK4::BootProtocol::STATIC,
                 ip: {
@@ -52,21 +66,17 @@ module VagrantPlugins
               }
             else
               nic_configuration = {
-                name: 'eth0',
+                name: iface_name,
                 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,
@@ -85,12 +95,16 @@ module VagrantPlugins
               vm: vm_configuration
             )
           rescue OvirtSDK4::Error => e
-            if config.debug
-              raise e
-            else
-              fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
-              raise Errors::StartVMError,
-                :error_message => fault_message
+            fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+            retry if e.message =~ /Please try again/
+
+            if e.message !~ /VM is running/
+              if config.debug
+                raise e
+              else
+                raise Errors::StartVMError,
+                  :error_message => fault_message
+              end
             end
 
           end

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

@@ -20,7 +20,7 @@ module VagrantPlugins
           for i in 1..300
             ready = true
             if vm_service.get == nil
-              raise NoVMError, :vm_name => ''
+              raise NoVMError, :vm_id => env[:machine].id
             end
 
             if vm_service.get.status.to_sym != :suspended

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

@@ -21,10 +21,21 @@ module VagrantPlugins
           env[:ui].info(I18n.t("vagrant_ovirt4.wait_till_down"))
           for i in 1..300
             ready = true
-            if vm_service.get == nil
-              raise NoVMError, :vm_name => ''
+            begin
+              if vm_service.get == nil
+                raise NoVMError, :error_message => '', :vm_id => env[:machine].id
+              end
+            rescue OvirtSDK4::Error => e
+              fault_message = /Fault detail is \"\[?(.+?)\]?\".*/.match(e.message)[1] rescue e.message
+              if config.debug
+                raise e
+              else
+                raise Errors::NoVMError, :error_message => fault_message, :vm_id => env[:machine].id
+              end
             end
 
+
+
             if vm_service.get.status.to_sym != :down
               ready = false
             end

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] ||= {}
@@ -33,23 +52,33 @@ module VagrantPlugins
               # Get VM.
               server = env[:vms_service].vm_service(env[:machine].id)
               if server == nil
-                raise NoVMError, :vm_name => ''
+                raise Errors::NoVMError, :vm_id => env[:machine].id
               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
+              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
+
               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
           end
           terminate(env) if env[:interrupted]
           if env[:ip_address].nil?
-            raise NoIPError
+            raise Errors::NoIPError
           else
             @logger.info("Got IP address #{env[:ip_address]}")
             @logger.info("Time for getting IP: #{env[:metrics]["instance_ip_time"]}")

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,37 +51,86 @@ 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
         @cluster = nil if @cluster == UNSET_VALUE
         @console = nil if @console == UNSET_VALUE
-        @memory_size = '256 MB' if @memory_size == UNSET_VALUE
+        @memory_size = '256 MiB' if @memory_size == UNSET_VALUE
         @memory_maximum = @memory_size if @memory_maximum == UNSET_VALUE
         @memory_guaranteed = @memory_size if @memory_guaranteed == UNSET_VALUE
         @template = nil if @template == UNSET_VALUE
         @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