vagrant-ovirt4 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f8d267202b71616a27bf1a4b721fe29264a7128d7643d0059a0558a3a6d76c8
-  data.tar.gz: 4dfc4ee00d4dfef59a9a9acf0e4639bdcd86bf4f030de479e6e0c526eb088441
+  metadata.gz: a9d8f5174e1f8b016b4b832ec0ad9b90306bfb2bddde338213d29c697010b43d
+  data.tar.gz: '0637690ae57219b53d018430ab5573495a086ec7ed1ceb2d90d6f2f6f670c629'
 SHA512:
-  metadata.gz: 013cbee883c91387751dcb150c4cae7af3e73275845d67f9019e6b508564ad756adc48d8d6d84b721188bd631e006511a58928c3e44b34b0086deac8a50d2d74
-  data.tar.gz: b281f7740fbc84ca12bc8c81a95a6b1ebfeeaa4246c0726384b389a0130716291bf3d859650fcc697a22a7f97a671e114745e403a0b5bb27137b24197e6dc3a5
+  metadata.gz: 90e8331a727b24e155d29dcf1d3f8567903f5b7eef088d64dd4b7da363ee32e68bae8ee2ff32e80e002cfa57745d1047b0c3b521b08322bab74457f5095f251d
+  data.tar.gz: c5b3b0a0c3d05a34ad1f89c716314b50ec39c0157c40f93d3a74cc0b531f37d76c16468b7ed20386751da2683eda9bdcbcc45999e5eaac724e9ea44209c53f8b

data/CHANGELOG

@@ -1,3 +1,7 @@
+v2.2.0
+ef555e3 Config spec: assert that we test all attributes
+6e47c1b Add tests for additional configuration params
+
 v2.1.2
 79a0074 Fix lock file
 

data/Gemfile.lock

@@ -28,7 +28,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-ovirt4 (2.1.3)
+    vagrant-ovirt4 (2.2.0)
       filesize (~> 0)
       nokogiri (~> 1)
       ovirt-engine-sdk (~> 4)

data/lib/vagrant-ovirt4/config.rb

@@ -5,6 +5,7 @@ require 'ovirtsdk4'
 module VagrantPlugins
   module OVirtProvider
     class Config < Vagrant.plugin('2', :config)
+      attr_reader :disks
 
       attr_accessor :url
       attr_accessor :username
@@ -30,7 +31,6 @@ module VagrantPlugins
       attr_accessor :description
       attr_accessor :comment
       attr_accessor :vmname
-      attr_accessor :disks
       attr_accessor :timeout
       attr_accessor :connect_timeout
       attr_accessor :run_once

data/lib/vagrant-ovirt4/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '2.1.3'
+    VERSION = '2.2.0'
   end
 end
 

data/spec/vagrant-ovirt4/config_spec.rb

@@ -11,11 +11,53 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = [:should, :expect]
   end
+
+  # When this setting is enabled, check that we saw calls to all available
+  # provider config readers and writers.
+  config.add_setting :check_provider_config_attr_accessor_calls
+  config.check_provider_config_attr_accessor_calls ||= ENV.key?('CI')
 end
 
 describe VagrantPlugins::OVirtProvider::Config do
   let(:instance) { described_class.new }
 
+  if RSpec.configuration.check_provider_config_attr_accessor_calls
+    before :all do
+      @writers ||=  described_class.instance_methods.grep(/\w\=$/).sort - Vagrant.plugin('2', :config).instance_methods
+      @readers ||= @writers.map { |w| w.to_s.sub(/\=$/, '').to_sym }
+
+      @writer_calls ||= Hash.new { |h, w| h[w] = 0 }
+      @reader_calls ||= Hash.new { |h, r| h[r] = 0 }
+    end
+
+    before :each do
+      @writers.each do |writer|
+        ivar = :"@#{writer.to_s.sub(/\=$/, '')}"
+        allow(instance).to receive(writer) do |arg|
+          instance.instance_variable_set(ivar, arg)
+          @writer_calls[writer] += 1
+          arg
+        end
+      end
+
+      @readers.each do |reader|
+        ivar = :"@#{reader}"
+
+        allow(instance).to receive(reader) do
+          @reader_calls[reader] += 1
+          instance.instance_variable_get(ivar)
+        end
+      end
+    end
+
+    after :all do
+      missing_writers = @writers.select { |w| @writer_calls[w].zero? }
+      missing_readers = @readers.select { |w| @reader_calls[w].zero? }
+      all = missing_readers + missing_writers
+      fail "saw no tests of the following config methods: #{all.map(&:inspect).join(", ")}" unless all.empty?
+    end
+  end
+
   # Ensure tests are not affected by AWS credential environment variables
   before :each do
     ENV.stub(:[] => nil)
@@ -50,12 +92,16 @@ describe VagrantPlugins::OVirtProvider::Config do
     its("optimized_for")     { should be_nil }
     its("description")       { should == '' }
     its("comment")           { should == '' }
+    its("vmname")            { should be_nil }
+    its("timeout")           { should be_nil }
+    its("connect_timeout")   { should be_nil }
+    its("disks")             { should be_empty }
     its("run_once")          { should be false }
 
   end
 
   describe "overriding defaults" do
-    [: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|
+    [:url, :username, :password, :insecure, :debug, :filtered_api, :cpu_cores, :cpu_sockets, :cpu_threads, :cluster, :console, :template, :cloud_init, :placement_host, :bios_serial, :description, :comment, :vmname].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")
@@ -126,6 +172,26 @@ describe VagrantPlugins::OVirtProvider::Config do
 
   end
 
+  describe "overriding disk size defaults" do
+    ['10 GiB', '999 M', '101010101 KB'].each do |value|
+      it "should accept #{value.inspect} for disk size" do
+        instance.send("disk_size=".to_sym, value)
+        expect { instance.finalize! }.not_to raise_error
+      end
+    end
+
+    [-1, '10 Umm', Object.new].each do |value|
+      it "should reject #{value.inspect} for disk size" do
+        instance.send("disk_size=".to_sym, value)
+        expect { instance.finalize! }.to raise_error do |error|
+          expect(error).to be_a(RuntimeError)
+          expect(error.message).to match(/^Not able to parse '[^']+'\. Please verify and check again\.$/)
+        end
+      end
+    end
+
+  end
+
   describe "overriding timeout defaults" do
     [:timeout, :connect_timeout].each do |attribute|
       [0, 6, 1_000_000, 8.10, nil].each do |value|
@@ -156,6 +222,52 @@ describe VagrantPlugins::OVirtProvider::Config do
 
   end
 
+  describe "adding storage" do
+    let(:storage)        { :file }
+    let(:storage_size)   { '8 GiB' }
+    let(:storage_type)   { 'qcow2' }
+    let(:storage_domain) { 'mystoragedomain' }
+
+    def configure_storage!
+      instance.storage(storage, size: storage_size, type: storage_type, storage_domain: storage_domain)
+    end
+
+    before do
+      expect(instance.disks).to be_empty
+    end
+
+    it "handles storage specifications" do
+      configure_storage!
+      instance.finalize!
+      expect(instance.disks).not_to be_empty
+      expect(instance.disks).to include(hash_including(
+        name: 'storage_disk_1',
+        type: storage_type,
+        bus: 'virtio',
+        storage_domain: storage_domain,
+      ))
+    end
+
+    context "given a type other than #{:file.inspect}" do
+      let(:storage) { :foobar }
+
+      it "ignores the storage specification" do
+        configure_storage!
+        instance.finalize!
+        expect(instance.disks).to be_empty
+      end
+    end
+
+    context "given an invalid storage size" do
+      let(:storage_size) { 'Nope' }
+
+      it "raises an exception" do
+        expect { configure_storage! }.to raise_error(ArgumentError)
+      end
+    end
+
+  end
+
   describe "overriding run_once defaults" do
     context "given truthy values" do
       [Object.new, {}, true, 1, 0].each do |value|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt4
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Marcus Young