vagrant-ovirt4 1.1.0 → 2.0.0

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

@@ -20,16 +20,24 @@ module VagrantPlugins
           hostname = 'vagrant' if hostname.nil?
 
           # Output the settings we're going to use to the user
-          memory_size = config.memory_size*1024*1024
-          memory_guaranteed = config.memory_guaranteed*1024*1024
           env[:ui].info(I18n.t("vagrant_ovirt4.creating_vm"))
           env[:ui].info(" -- Name:          #{hostname}")
           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('GiB').to_i} GiB") 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('GiB').to_i} GiB")
+          end
           env[:ui].info(" -- Memory:        ")
-          env[:ui].info(" ---- Memory:      #{config.memory_size}")
-          env[:ui].info(" ---- Guaranteed:  #{config.memory_guaranteed}")
+          env[:ui].info(" ---- Memory:      #{Filesize.from("#{config.memory_size} B").to_f('MiB').to_i} MiB")
+          env[:ui].info(" ---- Maximum:     #{Filesize.from("#{config.memory_maximum} B").to_f('MiB').to_i} MiB")
+          env[:ui].info(" ---- Guaranteed:  #{Filesize.from("#{config.memory_guaranteed} B").to_f('MiB').to_i} MiB")
           env[:ui].info(" -- Cpu:           ")
           env[:ui].info(" ---- Cores:       #{config.cpu_cores}")
           env[:ui].info(" ---- Sockets:     #{config.cpu_sockets}")
@@ -39,6 +47,8 @@ module VagrantPlugins
           # Create oVirt VM.
           attr = {
               :name     => hostname,
+              :description => config.description,
+              :comment => config.comment,
               :cpu      => {
                 :architecture => 'x86_64',
                 :topology => {
@@ -47,11 +57,12 @@ module VagrantPlugins
                   :threads => config.cpu_threads,
                 },
               },
-              :memory   => memory_size,
-              :memory_policy => {
-                :ballooning => true,
-                :guaranteed => memory_guaranteed,
-              },
+              :memory_policy => OvirtSDK4::MemoryPolicy.new(
+                ballooning: true,
+                guaranteed: config.memory_guaranteed,
+                max: config.memory_maximum,
+              ),
+              :memory   => config.memory_size,
               :cluster  => {
                 :name => config.cluster,
               },
@@ -61,14 +72,21 @@ 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
-            raise Errors::CreateVMError,
-              :error_message => fault_message
+            retry if e.message =~ /Related operation is currently in progress/
+
+            if config.debug
+              raise e
+            else
+              raise Errors::CreateVMError,
+                :error_message => fault_message
+            end
           end
 
           # Immediately save the ID since it is created at this point.
@@ -77,17 +95,21 @@ module VagrantPlugins
           # Wait till all volumes are ready.
           env[:ui].info(I18n.t("vagrant_ovirt4.wait_for_ready_vm"))
           for i in 0..300
-            ready = true
+            disk_ready = true
             vm_service = env[:vms_service].vm_service(env[:machine].id)
             disk_attachments_service = vm_service.disk_attachments_service
             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'
-                ready = false
+                disk_ready = false
                 break
               end
             end
+            ready = (disk_ready and env[:vms_service].vm_service(server.id).get.status.to_sym == :down)
             break if ready
             sleep 2
           end
@@ -96,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
 
@@ -109,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/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/start_vm.rb

@@ -15,6 +15,8 @@ module VagrantPlugins
         end
 
         def call(env)
+          config = env[:machine].provider_config
+
           env[:ui].info(I18n.t("vagrant_ovirt4.starting_vm"))
 
           machine = env[:vms_service].vm_service(env[:machine].id)
@@ -23,49 +25,89 @@ 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]
+
+            if iface_options[:interface_name] != nil then
+              iface_name = iface_options[:interface_name]
+            else
+              iface_name = "eth#{iface_index}"
+            end
 
-          nic_configuration = nil
-          if iface_options[:ip] then
-            nic_configuration = {
-              name: 'eth0',
-              on_boot: true,
-              boot_protocol: OvirtSDK4::BootProtocol::STATIC,
-              ip: {
-                version: OvirtSDK4::IpVersion::V4,
-                address: iface_options[:ip],
-                gateway: iface_options[:gateway],
+            if iface_options[:ip] then
+              nic_configuration = {
+                name: iface_name,
+                on_boot: true,
+                boot_protocol: OvirtSDK4::BootProtocol::STATIC,
+                ip: {
+                  version: OvirtSDK4::IpVersion::V4,
+                  address: iface_options[:ip],
+                  gateway: iface_options[:gateway],
+                  netmask: iface_options[:netmask],
+                }
               }
-            }
-          else
-            nic_configuration = {
-              name: 'eth0',
-              on_boot: true,
-              boot_protocol: OvirtSDK4::BootProtocol::DYNAMIC,
-            }
+            else
+              nic_configuration = {
+                name: iface_name,
+                on_boot: true,
+                boot_protocol: OvirtSDK4::BootProtocol::DHCP,
+              }
+            end
+
+            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: {
-              host_name: hostname,
-              nic_configurations: [nic_configuration],
-              custom_script: env[:machine].provider_config.cloud_init,
-            }
+            initialization: initialization,
+            placement_policy: {},
           }
-          
-          machine.start(
-            use_cloud_init: true,
-            vm: vm_configuration
-          )
+
+          vm_configuration[:placement_policy][:hosts] = [{ :name => config.placement_host }] unless config.placement_host.nil?
+          vm_configuration[:placement_policy][:affinity] = config.affinity unless config.affinity.nil?
+
+          vm_configuration.delete(:placement_policy) if vm_configuration[:placement_policy].empty?
+          vm_configuration.delete(:nic_configurations) if vm_configuration[:nic_configurations].nil? or vm_configuration[:nic_configurations].empty?
+
+          begin
+            machine.start(
+              use_cloud_init: true,
+              vm: vm_configuration
+            )
+          rescue OvirtSDK4::Error => e
+            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
 
           @app.call(env)
         end