vagrant-ovirt4 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 06efacb9cd5bc8d26e60779d35eb749df58e67c7
-  data.tar.gz: f4af437a4d0a5271517ab889a2778a8ef48bce23
+SHA256:
+  metadata.gz: 48a3502fc6d918fe1418248df8be2ca6ba8d2e0f477eb79784c0dbfd6a12c2e2
+  data.tar.gz: f33988dd5f134f0f6336e62ab21e4a4de534a434eb721e754301e6319e9043be
 SHA512:
-  metadata.gz: 450e1eaca5c4508127c18951ffe237b52991f4a0b3b85e833294d95ae4c04b3452b616442a13cf9008f1e35ffd0bcfff4f70faa100250e04043883b638fcb8cd
-  data.tar.gz: 99aff87c777092ca05e9fd4d5dbd31a4b0529dcf833214294c879b467c915c139767b5a2a517c63c1b0754fc046c562ef24d84f7bcc80e18e05256ef2e6f0dd2
+  metadata.gz: a84a0d2994268c8fa8df3715fbc5d3c5b40c1505cfdbb750e94539561498cc2d803ca532478bf24d9fc45d1a220bee0bcd1fd00b977f9bf221f841deed5860ec
+  data.tar.gz: 2533a97a3cfe3435cad9c3d9dc9199380874736f9221991e8b3072504a07dc7a590aceaf616450f4ddb7d0f52b169f57ef7855e3e3f7a75df1ea81e5ff638600

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: myoung34

data/.github/workflows/release.yml

@@ -0,0 +1,20 @@
+name: Release
+
+on:
+  push:
+    paths:
+      - lib/vagrant-ovirt4/version.rb
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: fregante/setup-git-user@v1
+      - name: Release Gem
+        uses: cadwallion/publish-rubygems-action@master
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RELEASE_COMMAND: rake release

data/.gitignore

@@ -5,3 +5,5 @@
 .vagrant
 /.idea
 *.gem
+/manifests
+vendor

data/Dockerfile

@@ -0,0 +1,11 @@
+FROM ruby:2.2.6
+ARG jenkins_uid=997
+ARG jenkins_gid=994
+ENV JENKINS_UID=$jenkins_uid
+ENV JENKINS_GID=$jenkins_gid
+RUN apt-get update && apt-get install -y sudo
+RUN groupadd -g $JENKINS_GID  jenkins
+RUN useradd jenkins -u $JENKINS_UID -g $JENKINS_GID --shell /bin/bash --create-home
+RUN echo '%jenkins ALL=NOPASSWD: ALL' >> /etc/sudoers
+RUN chown -R :jenkins /usr/local/bundle /usr/local/bin
+USER jenkins

data/Gemfile

@@ -1,20 +1,14 @@
-source 'https://rubygems.org'
-
-gemspec
+source 'http://rubygems.org'
 
 group :development do
-  #gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git'
+  gem 'rake'
+  gem 'rspec-core'
   gem 'pry'
   gem 'byebug'
   gem 'pry-byebug'
-end
-
-group :testing do
-  gem 'rspec-its'
-  gem 'rspec'
-  gem 'rake'
+  gem 'rake-release'
 end
 
 group :plugins do
-  #gem 'vagrant-ovirt4', :path => '.'
+  gem 'vagrant-ovirt4', :path => '.'
 end

data/Gemfile.lock

@@ -1,44 +1,38 @@
 PATH
   remote: .
   specs:
-    vagrant-ovirt4 (1.0.2)
-      ovirt-engine-sdk (~> 4.0, >= 4.0.6)
+    vagrant-ovirt4 (2.0.0)
+      filesize (~> 0)
+      nokogiri (>= 1.10.8)
+      ovirt-engine-sdk (~> 4.0.1)
 
 GEM
-  remote: https://rubygems.org/
+  remote: http://rubygems.org/
   specs:
-    byebug (9.0.6)
-    coderay (1.1.1)
-    diff-lcs (1.3)
-    json (2.0.3)
-    method_source (0.8.2)
-    ovirt-engine-sdk (4.1.2)
+    byebug (11.1.3)
+    coderay (1.1.2)
+    filesize (0.2.0)
+    json (2.5.1)
+    method_source (1.0.0)
+    mini_portile2 (2.5.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    ovirt-engine-sdk (4.0.12)
       json
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    rake (0.9.6)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    slop (3.6.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    racc (1.5.2)
+    rake (13.0.3)
+    rake-release (1.2.1)
+      bundler (>= 1.11, < 3)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
 
 PLATFORMS
   ruby
@@ -48,9 +42,9 @@ DEPENDENCIES
   pry
   pry-byebug
   rake
-  rspec
-  rspec-its
+  rake-release
+  rspec-core
   vagrant-ovirt4!
 
 BUNDLED WITH
-   1.14.4
+   1.17.2

data/README.md

@@ -56,12 +56,19 @@ $ 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,
-    :ip => '192.168.56.100', :nictype => 'virtio', :netmask => '255.255.255.0', #normal network configuration
-    :ovirt__ip => '192.168.2.198', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '192.168.2.125' # oVirt specific information, overwrites previous on oVirt provider
+    :ovirt__network_name => 'ovirtmgmt' #DHCP
+    # Static configuration
+    #:ovirt__ip => '192.168.2.198', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '192.168.2.125', :ovirt__netmask => '255.255.0.0', :ovirt__dns_servers => '192.168.2.1', :ovirt__dns_search => 'test.local'
+    # Static configuration with biosdevname. Guest OS assigns interface names (ens3, em1 or something else). ovirt__interface_name has to match that name.
+    #:ovirt__ip => '192.168.2.198', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '192.168.2.125', :ovirt__netmask => '255.255.0.0', :ovirt__dns_servers => '192.168.2.1', :ovirt__dns_search => 'test.local', :ovirt__interface_name => 'ens3'
+
+#  configure additional interface
+#  config.vm.network :private_network,
+#    :ovirt__ip => '192.168.2.199', :ovirt__network_name => 'ovirtmgmt', :ovirt__netmask => '255.255.0.0', :ovirt__interface_name => 'ens4'
 
   config.vm.provider :ovirt4 do |ovirt|
     ovirt.url = 'https://server/ovirt-engine/api'
@@ -69,14 +76,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.memory_size = 512 #MB
-    ovirt.memory_guaranteed = 256 #MB
+    ovirt.disk_size = '15 GiB' # 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 MiB' #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: |
@@ -85,6 +96,8 @@ write_files:
     permissions: '0644'
 EOF
 
+    # additional disks
+    ovirt.storage :file, size: "8 GiB", type: 'qcow2', storage_domain: "mystoragedomain"
   end
 end
 ```
@@ -106,18 +119,23 @@ 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.
-    a. Note: (TODO) [Unknown usage](https://github.com/myoung34/vagrant-ovirt4/issues/26)
   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.
-    a. Note: (TODO) Enforce this to be Spice, VNC, and RDP
   1. `memory_size` => The physical size of the memory for the VM (in MB). Defaults to `256`
   1. `memory_guaranteed` => The guaranteed size of the memory for the VM (in MB). Note: cannot be larger than `memory_size`. Defaults to `memory_size`
   1. `cpu_cores` => The number of CPU cores. Defaults to `1`
   1. `cpu_sockets` => The number of CPU cores. Defaults to `1`
   1. `cpu_threads` => The number of CPU threads. Defaults to `1`
   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
 
 
 ## Contributing
@@ -127,7 +145,3 @@ end
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-## Contributing Notes
-
-1. You must comment out `gemspec` in the [Gemfile](Gemfile), uncomment `vagrant` and `plugins/vagrant-ovirt4` in order for `bundle install` to work and use live code. Not sure why. Too lazy to figure it out.

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'rake/release'
 require 'rspec/core/rake_task'
 
 # Immediately sync all stdout so that tools like buildbot can
@@ -13,10 +14,3 @@ Dir.chdir(File.expand_path("../", __FILE__))
 # This installs the tasks that help with gem creation and
 # publishing.
 Bundler::GemHelper.install_tasks
-
-# Install the `spec` task so that we can run tests.
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = "--order defined"
-end
-# Default task is to run the unit tests
-task :default => :spec

data/lib/vagrant-ovirt4/action.rb

@@ -9,11 +9,15 @@ 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|
+            # synced_folders defaults to NFS on linux. Make it default to rsync as before.
+            env[:machine].config.nfs.functional = false
             if env[:machine_state_id] == :up
-              b2.use SyncFolders
+              b2.use SyncedFolderCleanup
+              b2.use SyncedFolders
               b2.use MessageAlreadyUp
               next
             end
@@ -26,7 +30,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
@@ -36,8 +40,10 @@ module VagrantPlugins
 
             b2.use StartVM
             b2.use WaitTillUp
-            b2.use SyncFolders
+            b2.use SyncedFolderCleanup
+            b2.use SyncedFolders
           end
+          b.use DisconnectOVirt
         end
       end
 
@@ -52,9 +58,10 @@ module VagrantPlugins
 
             b2.use ConnectOVirt
             b2.use ProvisionerCleanup, :before if defined?(ProvisionerCleanup)
-            b2.use HaltVM
-            b2.use WaitTillDown
+            b2.use HaltVM unless env[:machine].state.id == :down
+            b2.use WaitTillDown unless env[:machine].state.id == :down
             b2.use DestroyVM
+            b2.use DisconnectOVirt
           end
         end
       end
@@ -63,12 +70,15 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
+            # synced_folders defaults to NFS on linux. Make it default to rsync as before.
+            env[:machine].config.nfs.functional = false
             if !env[:result]
               b2.use MessageNotCreated
               next
             end
             b2.use Provision
-            b2.use SyncFolders
+            b2.use SyncedFolderCleanup
+            b2.use SyncedFolders
           end
         end
       end
@@ -77,9 +87,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 +103,7 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use ConnectOVirt
           b.use ReadSSHInfo
+          b.use DisconnectOVirt
         end
       end
 
@@ -111,6 +124,7 @@ module VagrantPlugins
             raise Errors::NoIPError if env[:ip_address].nil?
             b2.use SSHExec
           end
+          b.use DisconnectOVirt
         end
       end
 
@@ -131,6 +145,7 @@ module VagrantPlugins
             raise Errors::NoIPError if env[:ip_address].nil?
             b2.use SSHRun
           end
+          b.use DisconnectOVirt
         end
       end
 
@@ -153,7 +168,7 @@ module VagrantPlugins
       end
 
       def self.action_reload
-        with_ovirt do |env, b|
+        Vagrant::Action::Builder.new.tap do |b|
           b.use action_halt
           b.use action_up
         end
@@ -186,7 +201,8 @@ module VagrantPlugins
             b.use MessageNotSuspended
             next
           end
-          b.use action_up
+          b.use StartVM
+          b.use WaitTillUp
         end
       end
 
@@ -210,6 +226,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,13 +235,15 @@ 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")
       autoload :SnapshotSave, action_root.join("snapshot_save")
       autoload :StartVM, action_root.join("start_vm")
       autoload :SuspendVM, action_root.join("suspend_vm")
-      autoload :SyncFolders, action_root.join("sync_folders")
+      autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
+      autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
       autoload :WaitTillDown, action_root.join("wait_till_down")
       autoload :WaitTillUp, action_root.join("wait_till_up")
       autoload :WaitTilSuspended, action_root.join("wait_til_suspended")
@@ -248,6 +267,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,36 +16,72 @@ module VagrantPlugins
 
         def call(env)
 
-          iface = "nic1"
-          iface_options = nil
-          env[:machine].config.vm.networks.each do |config|
-            type, options = config
-            # We support private and public networks only. They mean both the
-            # same right now.
-            next unless [:private_network].include? type
+          config = env[:machine].provider_config
 
-            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
 
-          profiles_service = env[:connection].system_service.vnic_profiles_service
-          network_profile_id = profiles_service.list.map { |p| p.id if p.name == iface_options[:network_name] }.first
-          raise Errors::NoNetworkError, :network_name => iface_options[:network_name] if network_profile_id.nil?
-
-          @logger.info("Creating network interface #{iface}")
-          begin
-            nics_service = env[:vms_service].vm_service(env[:machine].id).nics_service
-            nics_service.add(
-              OvirtSDK4::Nic.new(
-                name: iface,
-                vnic_profile: {
-                  id: network_profile_id
-                }
-              )
-            )
-          rescue => e
-            raise Errors::AddInterfaceError,
-              :error_message => e.message
+          @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
+                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
+                    }
+                  )
+                )
+              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)