vm_shepherd 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b205f1eac35569f69fe5709c0019c0fd51a6e86
-  data.tar.gz: 105cc945195c4300389ef2d5e208203ff5d35d6d
+  metadata.gz: 65cd3b777476ef982c70b4c99fc270ce34f0084a
+  data.tar.gz: b5f22dfd3e3111c58816f5e9260b53e1cfbd868a
 SHA512:
-  metadata.gz: b872bef61ea5d9f432b822aebd8cfb8de74f97312d104ffc68c452b15ce4ee6c691c336899dddf52835f5b59715f2c5f49caaa951c361e8ce6a551e5295e0bf3
-  data.tar.gz: fda97963ff3c34a9546c870d6e00b87897213f12ca4a4295fc19d46c4d8c0eea765a58260dd9b8d566764686122a48452a449a69d8797ddd71897ba053c21e3b
+  metadata.gz: 3c48b1d7f31e478ede8d86e5834689d22db887e879b6031fdcebf72c33067d6b80676f6313fbac27ab600e90c445d1d35ac5eb1009d5b3ea295d40df77f5b1ba
+  data.tar.gz: cc6ebc49f345869086b765fcd2971abf7b768737ae7d8404ae2a226dea441afc2b0bcac1ccbea5f958c85723bf67b250b76599eecc82ba6b4fd0bd0d72934499

data/lib/vm_shepherd/aws_manager.rb

@@ -162,7 +162,7 @@ module VmShepherd
           logger.info("trying to delete volume: #{volume.id}")
           volume.delete
         rescue AWS::EC2::Errors::VolumeInUse
-          sleep 5
+          sleep VmShepherd::RetryHelper::RETRY_INTERVAL
           retry
         end
       end

data/lib/vm_shepherd/retry_helper.rb

@@ -4,7 +4,7 @@ module VmShepherd
     end
 
     RETRY_LIMIT = 60
-    RETRY_INTERVAL = 5
+    RETRY_INTERVAL = 10
 
     def retry_until(retry_limit: RETRY_LIMIT, &block)
       tries = 0

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
 end

data/spec/vm_shepherd/vcloud_manager_spec.rb

@@ -47,9 +47,10 @@ module VmShepherd
         end
 
         it 'expands the vapp_template into a TMP dir' do
-          expect(vcloud_manager).to receive(:system).with("cd #{tmpdir} && tar xfv '#{expanded_vapp_template_path}'")
+          command = "cd #{tmpdir} && tar xfv '#{expanded_vapp_template_path}'"
+          expect(vcloud_manager).to receive(:system).with(command)
 
-          expect { vcloud_manager.deploy(vapp_template_path, vapp_config) }.to raise_error
+          expect { vcloud_manager.deploy(vapp_template_path, vapp_config) }.to raise_error(RuntimeError, /#{command}/)
         end
 
         context 'when the template can be expanded' do
@@ -236,10 +237,14 @@ module VmShepherd
           end
 
           context 'when the vApp can NOT be deployed' do
+            let(:fake_deploy_error) { 'FAKE-VAPP-DEPLOY-ERROR' }
+
+            before { allow(VCloudSdk::Client).to receive(:new).and_raise('FAKE-VAPP-DEPLOY-ERROR') }
+
             it 'removes the expanded vApp template' do
               expect(FileUtils).to receive(:remove_entry_secure).with(tmpdir, force: true)
 
-              expect { vcloud_manager.deploy(vapp_template_path, vapp_config) }.to raise_error
+              expect { vcloud_manager.deploy(vapp_template_path, vapp_config) }.to raise_error(/#{fake_deploy_error}/)
             end
           end
         end
@@ -257,7 +262,7 @@ module VmShepherd
           it 'removes the expanded vApp template' do
             expect(FileUtils).to receive(:remove_entry_secure).with(tmpdir, force: true)
 
-            expect { vcloud_manager.deploy(vapp_template_path, vapp_config) }.to raise_error
+            expect { vcloud_manager.deploy(vapp_template_path, vapp_config) }.to raise_error(RuntimeError, /#{tar_expand_cmd}/)
           end
         end
       end
@@ -274,7 +279,7 @@ module VmShepherd
         it 'removes the expanded vApp template' do
           expect(FileUtils).to receive(:remove_entry_secure).with(tmpdir, force: true)
 
-          expect { vcloud_manager.deploy(vapp_template_path, vapp_config) }.to raise_error
+          expect { vcloud_manager.deploy(vapp_template_path, vapp_config) }.to raise_error(RuntimeError, /VM exists at FAKE_IP/)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.