vagrant-ovirt4 1.1.0 → 2.0.0

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

@@ -1,4 +1,6 @@
 require 'vagrant'
+require 'filesize'
+require 'ovirtsdk4'
 
 module VagrantPlugins
   module OVirtProvider
@@ -9,15 +11,25 @@ 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
       attr_accessor :template
       attr_accessor :memory_size
+      attr_accessor :memory_maximum
       attr_accessor :memory_guaranteed
       attr_accessor :cluster
       attr_accessor :console
       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
@@ -25,34 +37,102 @@ 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
         @template          = UNSET_VALUE
         @memory_size       = UNSET_VALUE
+        @memory_maximum    = UNSET_VALUE
         @memory_guaranteed = UNSET_VALUE
         @cluster           = UNSET_VALUE
         @console           = UNSET_VALUE
         @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 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
+          raise "Not able to parse either `memory_size` or `memory_guaranteed`. Please verify and check again."
+        end
       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
@@ -31,6 +35,10 @@ module VagrantPlugins
         error_key(:no_network_error)
       end
 
+      class NetworkNotFoundError < VagrantOVirtError
+        error_key(:network_not_found_error)
+      end
+
       class NoIPError < VagrantOVirtError
         error_key(:no_ip_error)
       end
@@ -42,6 +50,18 @@ module VagrantPlugins
       class RemoveSnapshotError < VagrantOVirtError
         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/plugin.rb

@@ -8,9 +8,9 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-# Note: snapshots only available in 1.8+
-if Vagrant::VERSION < '1.8.0'
-  raise "The Vagrant oVirt v4 plugin is only compatible with Vagrant 1.8+"
+# Note: snapshots only available in 1.9.1+
+if Vagrant::VERSION < '1.9.1'
+  raise "The Vagrant oVirt v4 plugin is only compatible with Vagrant 1.9.1+"
 end
 
 module VagrantPlugins

data/lib/vagrant-ovirt4/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '1.1.0'
+    VERSION = '2.0.0'
   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: |-
@@ -53,14 +55,26 @@ en:
         The instance is not running. Use `vagrant up` to start it.
       short_down: |-
         down
+      long_not_created: |-
+        The instance is not created. Use `vagrant up` to create it.
+      short_not_created: |-
+        not created
     errors:
+      remove_vm_error: |-
+        Error removing VM '%{vm_name}'. oVirt error message was '%{error_message}'
       no_vm_error: |-
-        No VM %{vm_name} found.
+        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: |-
+        No network provided and none were imported from the template. There would be no way to communicate with this machine.
+      network_not_found_error: |-
         No network %{network_name} found.
       wait_for_ready_vm_timeout: |-
         Timeout occurred while waiting for VM to become ready to start
@@ -72,3 +86,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,20 +33,28 @@ 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 }
     its("cluster")           { should be_nil }
     its("console")           { should be_nil }
     its("template")          { should be_nil }
-    its("memory_size")       { should == 256 }
-    its("memory_guaranteed") { should == 256 }
+    its("memory_size")       { should == 256000000 }
+    its("memory_maximum")    { should == 256000000 }
+    its("memory_guaranteed") { should == 256000000 }
     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, :memory_size, :memory_guaranteed, :cloud_init].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")
@@ -56,4 +64,46 @@ describe VagrantPlugins::OVirtProvider::Config do
     end
   end
 
+  describe "overriding memory defaults" do
+    [:memory_size, :memory_maximum, :memory_guaranteed].each do |attribute|
+
+      it "should not default #{attribute} if overridden" do
+        instance.send("#{attribute}=".to_sym, "512 MiB")
+        instance.finalize!
+        instance.send(attribute).should == 512000000
+      end
+
+      it "should convert the value" do
+        instance.send("#{attribute}=".to_sym, "1 GiB")
+        instance.finalize!
+        instance.send(attribute).should == 1000000000
+      end
+
+    end
+  end
+
+  describe "overriding affinity defaults" do
+    [:affinity].each do |attribute|
+
+      context 'valid value' do
+        it "should not default #{attribute} if overridden" do
+          instance.send("#{attribute}=".to_sym, "pinned")
+          instance.finalize!
+          instance.send(attribute).should == "pinned"
+        end
+      end
+
+      context 'invalid value' do
+        it "should error" do
+          expect {
+            instance.send("#{attribute}=".to_sym, "foo")
+            instance.finalize!
+          }.to raise_error(RuntimeError)
+
+        end
+
+      end
+
+    end
+  end
 end

data/templates/Vagrantfile.erb

@@ -0,0 +1,199 @@
+<% config[:vagrantfiles].each do |vagrantfile| %>
+require "<%= vagrantfile %>"
+require 'securerandom'
+<% end %>
+
+Vagrant.configure("2") do |c|
+  c.berkshelf.enabled = false if Vagrant.has_plugin?("vagrant-berkshelf")
+  <% if config[:cachier] %>
+  if Vagrant.has_plugin?("vagrant-cachier")
+    c.cache.scope = <%= [':box', ':machine'].include?(config[:cachier]) ? config[:cachier] : ':box' %>
+  end
+  <% end %>
+
+  c.vm.box = "<%= config[:box] %>"
+
+<% if config[:box_url] %>
+  c.vm.box_url = "<%= config[:box_url] %>"
+<% end %>
+
+<% if config[:box_version] %>
+  c.vm.box_version = "<%= config[:box_version] %>"
+<% end %>
+
+<% if !config[:box_check_update].nil? %>
+  c.vm.box_check_update = <%= config[:box_check_update] %>
+<% end %>
+
+<% if !config[:box_download_ca_cert].nil? %>
+  c.vm.box_download_ca_cert = "<%= config[:box_download_ca_cert] %>"
+<% end %>
+
+<% if !config[:box_download_insecure].nil? %>
+  c.vm.box_download_insecure = "<%= config[:box_download_insecure] %>"
+<% end %>
+
+<% if config[:vm_hostname] %>
+  c.vm.hostname = "kitchen-<%= config[:vm_hostname] %>-<%= ENV['VAGRANT_VERSION'] %>-<%= SecureRandom.uuid %>"
+<% end %>
+
+<% if config[:communicator] %>
+  c.vm.communicator = "<%= config[:communicator] %>"
+<% end %>
+
+<% if config[:guest] %>
+  c.vm.guest = "<%= config[:guest] %>"
+<% end %>
+
+<% if config[:communicator] %>
+  <% if config[:username] %>
+    c.<%= config[:communicator] %>.username = "<%= config[:username] %>"
+  <% end %>
+  <% if config[:password] %>
+    c.<%= config[:communicator] %>.password = "<%= config[:password] %>"
+  <% end %>
+<% else %>
+  <% if config[:username] %>
+    c.ssh.username = "<%= config[:username] %>"
+  <% end %>
+  <% if config[:password] %>
+    c.ssh.password = "<%= config[:password] %>"
+  <% end %>
+<% end %>
+
+<% if config[:ssh_key] %>
+  c.ssh.private_key_path = "<%= config[:ssh_key] %>"
+<% end %>
+<% config[:ssh].each do |key, value| %>
+  c.ssh.<%= key %> = <%= [true, false].include?(value) ? value : value.inspect %>
+<% end %>
+<% if config[:winrm] %>
+  <% config[:winrm].each do |key, value| %>
+    c.winrm.<%= key %> = <%= value %>
+  <% end %>
+<% end %>
+
+<% if config[:boot_timeout] %>
+  c.vm.boot_timeout = <%= config[:boot_timeout] %>
+<% end %>
+
+<% Array(config[:network]).each do |opts| %>
+  c.vm.network(:<%= opts[0] %>, <%= opts[1..-1].join(", ") %>)
+<% end %>
+
+  c.vm.synced_folder ".", "/vagrant", disabled: true
+<% config[:synced_folders].each do |source, destination, options| %>
+  c.vm.synced_folder <%= source.inspect %>, <%= destination.inspect %>, <%= options %>
+<% end %>
+
+  c.vm.provider :<%= config[:provider] %> do |p|
+<% case config[:provider]
+   when "virtualbox", /^vmware_/
+     if config[:gui] == true || config[:gui] == false %>
+    p.gui = <%= config[:gui] %>
+<%   end
+   end
+
+   case config[:provider]
+   when "virtualbox", /^vmware_/, "parallels"
+     if config[:linked_clone] == true || config[:linked_clone] == false %>
+    p.linked_clone = <%= config[:linked_clone] %>
+<%   end
+   end %>
+
+<% config[:customize].each do |key, value| %>
+  <% case config[:provider]
+     when "libvirt" %>
+    <% if key == :storage %>
+      <% if value.is_a? String %>
+    p.storage <%= value %>
+      <% elsif value.is_a? Array %>
+        <% value.each do |v| %>
+    p.storage <%= v %>
+        <% end %>
+      <% end %>
+    <% else %>
+      <% if value.is_a? String %>
+    p.<%= key %> = "<%= value%>"
+      <% else %>
+    p.<%= key %> = <%= value%>
+      <% end %>
+    <% end %>
+  <% when "lxc" %>
+    <% if key == :container_name %>
+    p.container_name = <%= value == ":machine" ? value : "\"#{value}\"" %>
+    <% elsif key == :backingstore %>
+    p.backingstore = "<%= value %>"
+    <% elsif key == :backingstore_options %>
+      <% config[:customize][:backingstore_options].each do |opt, opt_val| %>
+    p.backingstore_option "--<%= opt %>", "<%= opt_val %>"
+      <% end %>
+    <% elsif key == :include %>
+      <% Array(value).each do |include| %>
+    p.customize "<%= key %>", "<%= include %>"
+      <% end %>
+    <% else %>
+    p.customize "<%= key %>", "<%= value %>"
+    <% end %>
+  <% when "managed" %>
+    <% if key == :server %>
+    p.server = "<%= value %>"
+    <% end %>
+  <% when "parallels" %>
+    <% if key == :memory || key == :cpus %>
+    p.<%= key %> = <%= value %>
+    <% else %>
+    p.customize ["set", :id, "--<%= key.to_s.gsub('_', '-') %>", "<%= value %>"]
+    <% end %>
+  <% when "softlayer" %>
+    <% if key == :disk_capacity %>
+    p.<%= key %> = <%= value %>
+    <% else %>
+    p.<%= key %> = "<%= value %>"
+    <% end %>
+  <% when "virtualbox" %>
+    <% if key == :createhd %>
+    p.customize ["createhd", "--filename", "<%= value[:filename] %>", "--size", <%= value[:size] %>]
+    <% elsif key == :storageattach %>
+      <% options = [] %>
+      <% value.each do |storageattach_option_key, storageattach_option_value|
+           options << "\"--#{storageattach_option_key}\""
+           if storageattach_option_value.instance_of? Fixnum
+             options << storageattach_option_value
+           else
+             options << "\"#{storageattach_option_value}\""
+           end
+         end %>
+    p.customize ["storageattach", :id, <%= options.join(', ') %>]
+    <% elsif key == :cpuidset %>
+      <% ids = [] %>
+      <% value.each do | id |
+           ids << "\"#{id}\""
+         end %>
+    p.customize ["modifyvm", :id, "--cpuidset", <%= ids.join(', ') %>]
+    <% else %>
+    p.customize ["modifyvm", :id, "--<%= key %>", "<%= value %>"]
+    <% end %>
+  <% when /^vmware_/ %>
+    <% if key == :memory %>
+      <% unless config[:customize].include?(:memsize) %>
+    p.vmx["memsize"] = "<%= value %>"
+      <% end %>
+    <% elsif key == :cpus %>
+      <% unless config[:customize].include?(:numvcpus) %>
+    p.vmx["numvcpus"] = "<%= value %>"
+      <% end %>
+    <% else %>
+    p.vmx["<%= key %>"] = "<%= value %>"
+    <% end %>
+  <% when "openstack", "cloudstack", "hyperv", "ovirt3", "ovirt4", "rackspace", "aws" %>
+    <% if value.is_a? String %>
+    p.<%= key %> = "<%= value%>"
+    <% else  %>
+    p.<%= key %> = <%= value%>
+    <% end  %>
+  <% end %>
+<% end %>
+  end
+
+end