vagrant-ovirt4 1.2.0 → 2.1.0

data/lib/vagrant-ovirt4/errors.rb

@@ -7,6 +7,14 @@ module VagrantPlugins
         error_namespace("vagrant_ovirt4.errors")
       end
 
+      class ServiceConnectionError < VagrantOVirtError
+        error_key(:service_connection_error)
+      end
+
+      class RsyncError < VagrantOVirtError
+        error_key(:rsync_error)
+      end
+
       class NoVMError < VagrantOVirtError
         error_key(:no_vm_error)
       end
@@ -46,6 +54,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.2.0'
+    VERSION = '2.1.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,11 +55,23 @@ 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:
+      service_connection_error: |-
+        Error connecting to the oVirt cluster endpoint: "%{error_message}"
+      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: |-
@@ -74,3 +88,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,23 +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 == 256000000 }
-    its("memory_maximum")    { should == 256000000 }
-    its("memory_guaranteed") { should == 256000000 }
+    its("memory_size")       { should == 268435456 }
+    its("memory_maximum")    { should == 268435456 }
+    its("memory_guaranteed") { should == 268435456 }
     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, :description, :comment].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")
@@ -59,19 +64,38 @@ describe VagrantPlugins::OVirtProvider::Config do
     end
   end
 
+  describe "overriding optimized_for" do
+    [:optimized_for].each do |attribute|
+      ['server', 'desktop'].each do |value|
+        it "should accept #{value} for #{attribute}" do
+          instance.send("#{attribute}=".to_sym, value)
+          instance.finalize!
+          instance.send(attribute).should == value
+        end
+      end
+
+      it "should reject a value for #{attribute} outside of the defined values" do
+        expect {
+          instance.send("#{attribute}=".to_sym, "foo")
+          instance.finalize!
+        }.to raise_error(RuntimeError)
+      end
+    end
+  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 MB")
+        instance.send("#{attribute}=".to_sym, "512 MiB")
         instance.finalize!
-        instance.send(attribute).should == 512000000
+        instance.send(attribute).should == 536870912
       end
 
       it "should convert the value" do
-        instance.send("#{attribute}=".to_sym, "1 GB")
+        instance.send("#{attribute}=".to_sym, "1 GiB")
         instance.finalize!
-        instance.send(attribute).should == 1000000000
+        instance.send(attribute).should == 1073741824
       end
 
     end
@@ -101,4 +125,5 @@ describe VagrantPlugins::OVirtProvider::Config do
 
     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

data/tools/prepare_redhat_for_box.sh

@@ -106,6 +106,8 @@ chkconfig iptables off
 chkconfig firewalld off
 chkconfig ip6tables off
 for i in cloud-init ovirt-guest-agent; do chkconfig $i on; done
+chkconfig NetworkManager off
+
 sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/sysconfig/selinux
 [ -f /etc/selinux/config ] && sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config
 
@@ -121,8 +123,11 @@ echo $'' > /etc/sysconfig/network-scripts/ifcfg-eth0
 CLOUD_CONFIG=/etc/cloud/cloud.cfg
 grep  -q ' - resolv-conf' $CLOUD_CONFIG || sed -i -e 's/ - timezone/&\n - resolv-conf/' $CLOUD_CONFIG
 
+# Chef
+[[ $ATOMIC != "true" ]] && curl -L --silent https://omnitruck.chef.io/install.sh | bash
+
+
 # Do some cleanup..
 rm -f /root/.bash_history
 rm -f /root/authorized_keys
 [[ $ATOMIC != "true" ]] && yum clean all
-

data/vagrant-ovirt4.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = VagrantPlugins::OVirtProvider::VERSION
 
-  gem.add_runtime_dependency 'ovirt-engine-sdk', '~> 4.0', '>= 4.0.6'
+  gem.add_runtime_dependency 'ovirt-engine-sdk', '~> 4'
   gem.add_runtime_dependency 'filesize', '~> 0'
+  gem.add_runtime_dependency 'nokogiri', '~> 1'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Marcus Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ovirt-engine-sdk
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Vagrant provider for oVirt and RHEV v4
 email:
 - myoung34@my.apsu.edu
@@ -51,13 +59,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
+- CHANGELOG
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- SECURITY.md
 - example_box/README.md
 - example_box/Vagrantfile
 - example_box/dummy.box
@@ -68,6 +81,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
@@ -87,11 +101,9 @@ files:
 - lib/vagrant-ovirt4/action/snapshot_save.rb
 - lib/vagrant-ovirt4/action/start_vm.rb
 - lib/vagrant-ovirt4/action/suspend_vm.rb
-- lib/vagrant-ovirt4/action/sync_folders.rb
 - lib/vagrant-ovirt4/action/wait_til_suspended.rb
 - lib/vagrant-ovirt4/action/wait_till_down.rb
 - lib/vagrant-ovirt4/action/wait_till_up.rb
-- lib/vagrant-ovirt4/cap/nic_mac_addresses.rb
 - lib/vagrant-ovirt4/cap/snapshot_list.rb
 - lib/vagrant-ovirt4/cap/snapshot_save.rb
 - lib/vagrant-ovirt4/config.rb
@@ -115,7 +127,7 @@ 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.rb
+- templates/Vagrantfile.erb
 - tools/prepare_redhat_for_box.sh
 - vagrant-ovirt4.gemspec
 homepage: https://github.com/myoung34/vagrant-ovirt4
@@ -137,8 +149,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.3
 signing_key: 
 specification_version: 4
 summary: This vagrant plugin provides the ability to create, control, and destroy