vm_shepherd 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 158b8027d9711d2346b03702c5a3302d9f723f35
-  data.tar.gz: ad05a0ea0e8928fd0bbbae0db8c833ef0edd08ee
+  metadata.gz: 3b121dee2dca3c6d42da8b7476e5ae4cf6013345
+  data.tar.gz: ee6729d0c2c9b75efd53c3cb5936089ac6551c4f
 SHA512:
-  metadata.gz: ebc04c69df9a355dd6cd9424463f591142ac1d74414677df1c3ddf8965564afa02a1d8176afb73bc92fd8083a3935c546cdcf50273cd5c5e244b9584a8f9e324
-  data.tar.gz: 9031ac449813be9d4f4986a00d345cd03edc2c73603ad727790e12063ee6940a805867f77d7cc435e2ad80e6b77e81407123bb101cdebab11108a0649d21cddb
+  metadata.gz: c35492e9a7324acaca7e5fe2385cca91ad9188581f96ff4ebe5632b288918a93cc36b757ab06b26bc239ad3fb62bbcd7bce39bd72ea30a8e36814e229259b412
+  data.tar.gz: d57003cb209534a08752db05c2ac7c96dd5bfe36b5f343d3673acc5f9133af3f79b520228205bb13de6e5a6b8ec115c8eeee7df9bbd4c5152caebf208231168a

data/lib/vm_shepherd/openstack_manager.rb

@@ -54,6 +54,10 @@ module VmShepherd
       if server
         say("Found running Ops Manager instance #{server.id}")
         server.destroy
+        retry_until(retry_limit: 30) do
+          say("  Waiting for #{vm_options[:name]} server to be destroyed")
+          service.servers.find { |srv| srv.name == vm_options[:name] }.nil?
+        end
         say('Ops Manager instance destroyed')
       end
 

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.11.1'.freeze
+  VERSION = '1.11.2'.freeze
 end

data/spec/vm_shepherd/openstack_manager_spec.rb

@@ -32,6 +32,8 @@ module VmShepherd
 
     subject(:openstack_vm_manager) { OpenstackManager.new(openstack_options) }
 
+    before { stub_const('VmShepherd::RetryHelper::RETRY_INTERVAL', 0) }
+
     describe '#service' do
       it 'creates a Fog::Compute connection' do
         expect(Fog::Compute).to receive(:new).with(
@@ -189,11 +191,9 @@ module VmShepherd
       let(:compute_service) { openstack_vm_manager.service }
       let(:image_service) { openstack_vm_manager.image_service }
 
-      let(:servers) { compute_service.servers }
-      let(:flavors) { compute_service.flavors }
+      let(:flavors) { [compute_service.flavors.create(name: 'some-flavor', ram: 1, vcpus: 1, disk: 1)] }
       let(:images) { image_service.images }
-      let(:image) { images.find { |image| image.name == openstack_vm_options[:name] } }
-      let(:instance) { servers.find { |server| server.name == openstack_vm_options[:name] } }
+      let(:server) { instance_double(Fog::Compute::OpenStack::Server, id: openstack_vm_options[:name], destroy: true) }
 
       before do
         allow(File).to receive(:size).with(path).and_return(file_size)
@@ -204,10 +204,9 @@ module VmShepherd
         Fog::Mock.delay = 0
 
         allow(compute_service).to receive(:flavors).and_return(flavors)
-        allow(compute_service).to receive(:servers).and_return(servers)
-        allow(image_service).to receive(:images).and_return(images)
+        allow(openstack_vm_manager.service).to receive(:servers).and_return(compute_service.servers)
+        allow(compute_service.servers).to receive(:find).and_return(server, nil)
 
-        flavors << flavors.create(name: 'some-flavor', ram: 1, vcpus: 1, disk: 1)
         openstack_vm_manager.deploy(path, openstack_vm_options)
       end
 
@@ -220,21 +219,26 @@ module VmShepherd
 
       it 'calls destroy on the correct instance' do
         destroy_correct_server = change do
-          servers.reload
-          servers.find { |server| server.name == openstack_vm_options[:name] }
+          compute_service.servers.reload
+          compute_service.servers.find { |server| server.name == openstack_vm_options[:name] }
         end.to(nil)
 
         expect { openstack_vm_manager.destroy(openstack_vm_options) }.to(destroy_correct_server)
       end
 
+      it 'waits until the correct server is gone before deleting the image' do
+        expect(compute_service.servers).to receive(:find).exactly(OpenstackManager::RETRY_LIMIT - 1).times.and_return(server)
+        expect(compute_service.servers).to receive(:find).exactly(1).times.and_return(nil)
+
+        openstack_vm_manager.destroy(openstack_vm_options)
+      end
+
       it 'calls destroy on the correct image' do
         expect { openstack_vm_manager.destroy(openstack_vm_options) }.to(destroy_correct_image)
       end
 
       context 'when the server does not exist' do
-        before do
-          allow(servers).to receive(:find).and_return(nil)
-        end
+        before { allow(compute_service.servers).to receive(:find).and_return(nil) }
 
         it 'returns without error' do
           expect { openstack_vm_manager.destroy(openstack_vm_options) }.not_to raise_error
@@ -323,8 +327,6 @@ module VmShepherd
       end
 
       it 'waits until there are no servers before deleting images' do
-        stub_const("VmShepherd::RetryHelper::RETRY_INTERVAL", 0)
-
         servers = instance_double(Array)
         allow(openstack_vm_manager.service).to receive(:servers).and_return(servers)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1