vm_shepherd 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 316f95673f45c873990de6c9a8313e9f7c30c14d
-  data.tar.gz: a5cacb70390f6f42dfbac300b298cf720eaaaf96
+  metadata.gz: de929fb4a764180cac7a407c9af64ae3e366aa2d
+  data.tar.gz: 7cb4fbeab70a0a935dbf86207bac4bd4ac52a4ef
 SHA512:
-  metadata.gz: 21c6f2e27bf812d8349adabb9c91a2f360b29c94a17a359ede7c099d927af52ce80e78ae39f071f47bd07a64ccded8b52ab060be96cf608daf38da7e5050e607
-  data.tar.gz: c43837145203de571a44d3617e5b295036a78b2d956112ea9a5c42c34fd49e35fad534f34f6bddb09a5f7b4a2637992dcd8a655343fde52540c000e06d7894d2
+  metadata.gz: c88e36d8e2d33eda28ff8d8393ea30a1dab8e5fbfe02be84c38c0a9bc48d4d52c4f163a391e9a1b896de7322aec3cb649e95944eec3eb24c325581fcd604e425
+  data.tar.gz: df3b18222e369f83fe355d09dc5eb9c89879c3164546c3ca99b3660a1632875ca23a069f6350bada169c34338eb3ce89c47c42a6db5096cc8c078c31df875895

data/lib/vm_shepherd/aws_manager.rb

@@ -1,14 +1,12 @@
 require 'aws-sdk-v1'
+require 'vm_shepherd/retry_helper'
 
 module VmShepherd
   class AwsManager
-    class RetryLimitExceeded < StandardError
-    end
+    include VmShepherd::RetryHelper
 
     AWS_REGION = 'us-east-1'
     OPS_MANAGER_INSTANCE_TYPE = 'm3.medium'
-    RETRY_LIMIT = 60
-    RETRY_INTERVAL = 5
     DO_NOT_TERMINATE_TAG_KEY = 'do_not_terminate'
 
     def initialize(env_config)
@@ -136,18 +134,5 @@ module VmShepherd
         end
       end
     end
-
-    def retry_until(retry_limit: RETRY_LIMIT, &block)
-      tries = 0
-      condition_reached = false
-      loop do
-        tries += 1
-        raise(RetryLimitExceeded) if tries > retry_limit
-        condition_reached = block.call
-        break if condition_reached
-        sleep RETRY_INTERVAL
-      end
-      condition_reached
-    end
   end
 end

data/lib/vm_shepherd/openstack_manager.rb

@@ -32,7 +32,7 @@ module VmShepherd
         key_name: vm_options[:key_name],
         security_groups: security_groups,
         nics: [
-          { net_id: network.id, v4_fixed_ip: vm_options[:private_ip] }
+          {net_id: network.id, v4_fixed_ip: vm_options[:private_ip]}
         ],
       )
       server.wait_for { ready? }
@@ -86,6 +86,7 @@ module VmShepherd
       say("Destroying #{service.volumes.size} volumes:")
       service.volumes.each do |volume|
         say("  Destroying volume #{volume.id}")
+        volume.wait_for { volume.ready? }
         volume.destroy
       end
 

data/lib/vm_shepherd/retry_helper.rb

@@ -0,0 +1,22 @@
+module VmShepherd
+  module RetryHelper
+    class RetryLimitExceeded < StandardError
+    end
+
+    RETRY_LIMIT = 60
+    RETRY_INTERVAL = 5
+
+    def retry_until(retry_limit: RETRY_LIMIT, &block)
+      tries = 0
+      condition_reached = false
+      loop do
+        tries += 1
+        raise(RetryLimitExceeded) if tries > retry_limit
+        condition_reached = block.call
+        break if condition_reached
+        sleep RETRY_INTERVAL
+      end
+      condition_reached
+    end
+  end
+end

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/spec/vm_shepherd/openstack_manager_spec.rb

@@ -245,6 +245,7 @@ module VmShepherd
         Fog.mock!
         Fog::Mock.reset
         Fog::Mock.delay = 0
+        Fog.interval = 0
 
         make_server_and_image!('vm1')
         make_server_and_image!('vm2')
@@ -263,6 +264,8 @@ module VmShepherd
         b_dir = instance_double(Fog::Storage::OpenStack::Directory, key: 'b_dir')
         allow(b_dir).to receive(:files).and_return(b_dir_files)
         allow(openstack_vm_manager.storage_service).to receive(:directories).and_return([a_dir, b_dir])
+        allow_any_instance_of(Fog::Compute::OpenStack::Volume).to receive(:status).and_return('available')
+        allow(Fog).to receive(:sleep)
       end
 
       let(:a_dir_files) { [create_file_double('a_file'), create_file_double('b_file')] }
@@ -323,6 +326,26 @@ module VmShepherd
         }.to change { openstack_vm_manager.service.volumes.size }.from(2).to(0)
       end
 
+      context 'with stubbed volumes' do
+        let(:volumes) { [volume] }
+        let(:volume) do
+          openstack_vm_manager.service.volumes.create(
+            name: 'volume',
+            description: 'description',
+            size: 1,
+          )
+        end
+
+        before do
+          allow(openstack_vm_manager.service).to receive(:volumes).and_return(volumes)
+        end
+
+        it 'waits for volumes to be available before deleting' do
+          expect(volume).to receive(:status).and_return('detaching', 'detaching', 'available')
+          openstack_vm_manager.clean_environment
+        end
+      end
+
       it 'deletes everything in the correct container' do
         openstack_vm_manager.clean_environment
         expect(a_dir_files[0]).to have_received(:destroy)

data/spec/vm_shepherd/retry_helper_spec.rb

@@ -0,0 +1,58 @@
+require 'vm_shepherd/retry_helper'
+
+module VmShepherd
+  RSpec.describe RetryHelper do
+    subject(:retry_helper) { TestRetryHelper.new }
+
+    class TestRetryHelper
+      include RetryHelper
+    end
+
+    before do
+      allow(retry_helper).to receive(:sleep) # speed up retry logic
+    end
+
+    it 'calls the given block 60 times by default' do
+      sixty_times = [true] + [false] * 59
+      expect {
+        retry_helper.retry_until { sixty_times.pop }
+      }.not_to raise_error
+
+      sixty_one_times = [true] + [false] * 60
+      expect {
+        retry_helper.retry_until { sixty_one_times.pop }
+      }.to raise_error(RetryHelper::RetryLimitExceeded)
+    end
+
+    it 'throws an error if the block never returns true' do
+      expect {
+        retry_helper.retry_until { false }
+      }.to raise_error(RetryHelper::RetryLimitExceeded)
+    end
+
+    it 'returns early if the block returns a truthy value' do
+      counter = 0
+      retry_helper.retry_until do
+        counter += 1
+        counter == 6
+      end
+      expect(counter).to eq(6)
+    end
+
+    it 'returns the value of the block' do
+      expect(retry_helper.retry_until { 'retrying' }).to eq('retrying')
+    end
+
+    it 'calls the given block the given number of times' do
+      forty_two_times = [true] + [false] * 41
+      expect {
+        retry_helper.retry_until(retry_limit: 42) { forty_two_times.pop }
+      }.not_to raise_error
+
+      forty_three_times = [true] + [false] * 42
+      expect {
+        retry_helper.retry_until(retry_limit: 42) { forty_three_times.pop }
+      }.to raise_error(RetryHelper::RetryLimitExceeded)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -155,6 +155,7 @@ files:
 - lib/vm_shepherd.rb
 - lib/vm_shepherd/aws_manager.rb
 - lib/vm_shepherd/openstack_manager.rb
+- lib/vm_shepherd/retry_helper.rb
 - lib/vm_shepherd/shepherd.rb
 - lib/vm_shepherd/vcloud_manager.rb
 - lib/vm_shepherd/version.rb
@@ -169,6 +170,7 @@ files:
 - spec/support/patched_fog.rb
 - spec/vm_shepherd/aws_manager_spec.rb
 - spec/vm_shepherd/openstack_manager_spec.rb
+- spec/vm_shepherd/retry_helper_spec.rb
 - spec/vm_shepherd/shepherd_spec.rb
 - spec/vm_shepherd/vcloud_manager_spec.rb
 - spec/vm_shepherd/vsphere_manager_spec.rb
@@ -207,6 +209,7 @@ test_files:
 - spec/support/patched_fog.rb
 - spec/vm_shepherd/aws_manager_spec.rb
 - spec/vm_shepherd/openstack_manager_spec.rb
+- spec/vm_shepherd/retry_helper_spec.rb
 - spec/vm_shepherd/shepherd_spec.rb
 - spec/vm_shepherd/vcloud_manager_spec.rb
 - spec/vm_shepherd/vsphere_manager_spec.rb