chef-provisioning-vra 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24ec90bf7c616780c06ad82ec5e23070b4e4c388
-  data.tar.gz: ea67c1833771612241790aa650bdaf60c13cf50b
+  metadata.gz: f46d3e01ef741106c72a6f3ca7d95ff868e132ae
+  data.tar.gz: b1d172a0eee394d504886690d688a895126566c2
 SHA512:
-  metadata.gz: fea45711fe93dfda82a6052ba22df4e2f9794d095fd7607bf007a8bbc7013926806bcf5d3b0348cbb56445dd8a8c8cceb880b63e854751ab3fd1c9dee11525e7
-  data.tar.gz: d70b63e72dc7f7731968283a594a684246b15a4357c87bddb30c17f2d0f024bf77fc1dc7f53f881172614190cf97adaf16490bd341b5de7b2904068983a5623b
+  metadata.gz: 7b03355e6a996baf1a96530dac85937536ef8ff5000963921dd38e11864cf908d28934b0cfae37a12f7c079f0597a2e6cfe3cd1fcb764502a6eba15de6cb47aa
+  data.tar.gz: c641d8830df10e30286a14c42992d87cf216eb52ac76ccba3c149fcda9d966fd58b16c34453f7b54ec8d55bb099a3cf7b9f7228e03485c84ed1ea9b2eb29bfc8

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # chef-provisioning-vra CHANGELOG
 
+## v0.2.0 (2015-12-15)
+* [pr#5](https://github.com/chef-partners/chef-provisioning-vra/pull/5) Adding retry logic in wait_for method if an exception is encountered
+
 ## v0.1.1 (2015-11-18)
 * [pr#3](https://github.com/chef-partners/chef-provisioning-vra/pull/3) Loosen version constraing on vmware-vra-gem
 

data/Gemfile

@@ -2,4 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in chef-provisioning-vra.gemspec
 gemspec
-

data/README.md

@@ -80,6 +80,19 @@ bootstrap_options: {
 }
 ```
 
+If your parameter name contains a hyphen, such as when you're passing in "provider" parameters, you will need to use the older "hash rocket" syntax:
+
+```ruby
+bootstrap_options: {
+  extra_parameters: {
+    'provider-MyCustomProperty' => {
+      type: 'string',
+      value: 'my value'
+    }
+  }
+}
+```
+
 ### Transport Options
 
 All transport options are optional.

data/lib/chef/provisioning/vra_driver/driver.rb

@@ -225,13 +225,28 @@ class Chef
           driver_options.fetch(:max_wait_time, 600).to_i
         end
 
+        def max_retries
+          driver_options.fetch(:max_retries, 1).to_i
+        end
+
         def wait_for(action_handler, &block)
           sleep_time    = 5
           start_time    = Time.now.utc.to_i
+          try           = 0
 
           Timeout.timeout(max_wait_time) do
             loop do
-              return if block.call == true
+              begin
+                return if block.call == true
+              rescue => e
+                action_handler.report_progress("Error encountered: #{e.class} - #{e.message}")
+
+                try += 1
+                if try > max_retries
+                  action_handler.report_progress('Retries exceeded, aborting...')
+                  raise
+                end
+              end
 
               time_elapsed = Time.now.utc.to_i - start_time
               action_handler.report_progress("been waiting #{time_elapsed}/#{max_wait_time} seconds" \

data/lib/chef/provisioning/vra_driver/version.rb

@@ -19,7 +19,7 @@
 class Chef
   module Provisioning
     module VraDriver
-      VERSION = '0.1.1'
+      VERSION = '0.2.0'
     end
   end
 end

data/spec/unit/chef/provisioning/vra_driver/driver_spec.rb

@@ -568,6 +568,83 @@ describe Chef::Provisioning::VraDriver::Driver do
     end
   end
 
+  describe '#max_retries' do
+    it 'returns the configured value in driver_options' do
+      allow(driver).to receive(:driver_options).and_return(max_retries: 3)
+
+      expect(driver.max_retries).to eq(3)
+    end
+
+    it 'returns the default value if there is no value in driver_options' do
+      allow(driver).to receive(:driver_options).and_return({})
+
+      expect(driver.max_retries).to eq(1)
+    end
+  end
+
+  describe '#wait_for' do
+    before do
+      allow(driver).to receive(:sleep)
+    end
+
+    context 'when the block returns true immediately' do
+      it 'does not retry' do
+        expect(driver).not_to receive(:sleep)
+        driver.wait_for(action_handler) { true }
+      end
+    end
+
+    context 'when the block returns true after 3 tries' do
+      it 'retries twice' do
+        expect(driver).to receive(:sleep).twice
+
+        @loop_count = 0
+        driver.wait_for(action_handler) do
+          @loop_count += 1
+          @loop_count == 3
+        end
+      end
+    end
+
+    context 'when an exception is raised on first try but not second' do
+      it 'does not raise an exception' do
+        allow(driver).to receive(:max_retries).and_return(1)
+        expect do
+          driver.wait_for(action_handler) do
+            if @raised_exception
+              true
+            else
+              @raised_exception = true
+              raise 'Raising exception on first loop'
+            end
+          end
+        end.not_to raise_error
+      end
+    end
+
+    context 'when an exception is raised on both tries' do
+      it 'raises an exception' do
+        allow(driver).to receive(:max_retries).and_return(1)
+        expect { driver.wait_for(action_handler) { raise RuntimeError } }.to raise_error(RuntimeError)
+      end
+    end
+
+    context 'when max_retries is 5 and the block raises exceptions' do
+      it 'tries the block 6 times' do
+        allow(driver).to receive(:max_retries).and_return(5)
+
+        @loop_count = 0
+        expect do
+          driver.wait_for(action_handler) do
+            @loop_count += 1
+            raise RuntimeError
+          end
+        end.to raise_error(RuntimeError)
+        expect(@loop_count).to eq(6)
+      end
+    end
+  end
+
   describe '#username_for' do
     context 'when machine_spec reference entry exists' do
       it 'returns the correct username' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vra
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-provisioning