vm_shepherd 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71fe2ca3d3b7b0e9900480d6233f987314f81175
-  data.tar.gz: 09bc7963729c23b8034301a94b57411752b87a29
+  metadata.gz: 219c652eba8784d7e3d73dca6d47434251d457cf
+  data.tar.gz: d93a9bed83c27bbd86d75f39bcecd8ce11d88549
 SHA512:
-  metadata.gz: 13831bc1f320b8246f58badb961aa86b2e8a08aa031554bc7cf372eb41e6b20bd872ef7bd3fcd5fe7f1f49a61f410695b53e8a5c2b51c13f6c85d3fec79abf25
-  data.tar.gz: 25f7b295197fa8d6336596987c6a45ff112dd5b9e7186a76f919b94e77294d0f6310c8799112684d006c0582e352f5ef07a78547a6780db71de6960d9893843f
+  metadata.gz: 50eb9bb8a26e7f8f7d566fb70c63746a04b90c5b341a498139c5d2e7edeb73ebd1dba1f09799dfc498d78b131517ab7f7f88a64d27ec871e0e6b739d7d16f7a6
+  data.tar.gz: 599c01489ea1bcc65321c8f331402028f5e1e63cd9573fa1b67084031293c1f8ae596013c11629207694649e8319113a60fa86c6a600c924a8a5f454bf1f6a3e

data/lib/vm_shepherd/openstack_manager.rb

@@ -66,6 +66,11 @@ module VmShepherd
     def clean_environment
       say("Destroying #{service.servers.size} instances:")
       service.servers.each do |server|
+        server.volumes.each do |volume|
+          say("  Detaching volume #{volume.id} from server #{server.id}")
+          server.detach_volume(volume.id)
+        end
+
         say("  Destroying instance #{server.id}")
         server.destroy
       end

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/spec/vm_shepherd/openstack_manager_spec.rb

@@ -282,7 +282,7 @@ module VmShepherd
           is_public: false,
         )
 
-        openstack_vm_manager.service.servers.create(
+        server = openstack_vm_manager.service.servers.create(
           name: name,
           flavor_ref: openstack_vm_manager.service.flavors.first.id,
           image_ref: image.id,
@@ -290,14 +290,22 @@ module VmShepherd
           security_groups: ['some security group'],
         )
 
-        openstack_vm_manager.service.volumes.create(
+        volume = openstack_vm_manager.service.volumes.create(
           name: name,
           description: "description #{name}",
           size: name.to_i,
         )
+        server.attach_volume(volume.id, 'xd1')
       end
 
-      it 'deletes all servers' do
+      it 'deletes all servers and server-volume attachments' do
+        openstack_vm_manager.service.servers.each do |server|
+          server.volumes.each do |volume|
+            expect(openstack_vm_manager.service).to receive(:detach_volume).with(server.id, volume.id).ordered
+          end
+          expect(openstack_vm_manager.service).to receive(:delete_server).with(server.id).ordered.and_call_original
+        end
+
         expect {
           openstack_vm_manager.clean_environment
         }.to change { openstack_vm_manager.service.servers.size }.from(2).to(0)

metadata

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