vm_shepherd 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e40010121984be566b3f88a3e7d12984223d10df
-  data.tar.gz: 85e3ec192349a2a70de3612dcde0ec982edec9f0
+  metadata.gz: e61d2d0bffe4fd5fbe2ef132b05a0b334ce8a8be
+  data.tar.gz: c0b639a5ba9e19ccb2950da552e9c5f3185d0f56
 SHA512:
-  metadata.gz: a0afc08340253f1d54b01762c960f1e879ca367e6ecb6fa0d47bd19e9cef67566f820131af993db862c082b03fa51333369a65d5735cbecce62fddb106a2ad22
-  data.tar.gz: bea513f347e77b7fee6cf95404a9f4a17e7f20acf881bd40a785c4c3163f43a19a4e563e4b169b01cc6f8a5c166da882cd37594efdf303e66b0418871ae7aa33
+  metadata.gz: 1f529936e8fa331185f96d0e9f68cd69bfdde4bb7e2d2f7a425522333a944e4ba2e50502d5a0c4bf3e8c43534428e35459a60af22535e2870a939ddfb7d09b77
+  data.tar.gz: d12b06f004e913fa49fcfd47cdd78f105f2956cc6da979294fd1ce4d004b5d8d2be2457195c4fd6402e1102779bb2786d0de409ab595d3f4b16e9c74b97fb18d

data/lib/vm_shepherd/openstack_manager.rb

@@ -46,15 +46,17 @@ module VmShepherd
 
     def destroy(vm_options)
       say('Destroying Ops Manager instances')
-      ip = service.addresses.find { |address| address.ip == vm_options[:public_ip] }
-      server = service.servers.get(ip.instance_id)
+
+      server = service.servers.find { |srv| srv.name == vm_options[:name] }
       if server
         say("Found running Ops Manager instance #{server.id}")
-        image = image_service.images.get(server.image['id'])
-        say("Found Ops Manager image #{image.id}")
-
         server.destroy
         say('Ops Manager instance destroyed')
+      end
+
+      image = image_service.images.find { |img| img.name == vm_options[:name] }
+      if image
+        say("Found Ops Manager image #{image.id}")
         image.destroy
         say('Ops Manager image destroyed')
       end
@@ -62,6 +64,34 @@ module VmShepherd
     end
 
     def clean_environment
+      say("Destroying #{service.servers.size} instances:")
+      service.servers.each do |server|
+        say("  Destroying instance #{server.id}")
+        server.destroy
+      end
+
+      private_images = image_service.images.reject(&:is_public)
+
+      say("Destroying #{private_images.size} images:")
+      private_images.each do |image|
+        say("  Destroying image #{image.id}")
+        image.destroy
+      end
+
+      say("Destroying #{service.volumes.size} volumes:")
+      service.volumes.each do |volume|
+        say("  Destroying volume #{volume.id}")
+        volume.destroy
+      end
+
+      say("Destroying contents of #{storage_service.directories.size} containers:")
+      storage_service.directories.each do |directory|
+        say("  Destroying #{directory.files.size} files from #{directory.key}")
+        directory.files.each do |file|
+          say("    Destroying file #{file.key}")
+          file.destroy
+        end
+      end
     end
 
     def service
@@ -92,7 +122,16 @@ module VmShepherd
         openstack_username: username,
         openstack_tenant: tenant,
         openstack_api_key: api_key,
-        openstack_endpoint_type: 'publicURL',
+      )
+    end
+
+    def storage_service
+      @network_service ||= Fog::Storage.new(
+        provider: 'openstack',
+        openstack_auth_url: auth_url,
+        openstack_username: username,
+        openstack_tenant: tenant,
+        openstack_api_key: api_key,
       )
     end
 

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '0.7.1'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/spec/vm_shepherd/openstack_manager_spec.rb

@@ -5,12 +5,13 @@ module VmShepherd
   RSpec.describe OpenstackManager do
     include PatchedFog
 
+    let(:tenant_name) { 'tenant' }
     let(:openstack_options) do
       {
         auth_url: 'http://example.com/version/tokens',
         username: 'username',
         api_key: 'api-key',
-        tenant: 'tenant',
+        tenant: tenant_name,
       }
     end
     let(:openstack_vm_options) do
@@ -71,7 +72,6 @@ module VmShepherd
               openstack_username: openstack_options[:username],
               openstack_tenant: openstack_options[:tenant],
               openstack_api_key: openstack_options[:api_key],
-              openstack_endpoint_type: 'publicURL',
             }
           )
         openstack_vm_manager.network_service
@@ -155,7 +155,7 @@ module VmShepherd
           assigned_network = network_service.networks.find { |network| network.name == openstack_vm_options[:network_name] }
           expect(servers).to receive(:create).with(
               hash_including(:nics => [
-                  { net_id: assigned_network.id, v4_fixed_ip: openstack_vm_options[:private_ip]}
+                  {net_id: assigned_network.id, v4_fixed_ip: openstack_vm_options[:private_ip]}
                 ]
               )
             ).and_call_original
@@ -183,10 +183,8 @@ module VmShepherd
 
       let(:compute_service) { openstack_vm_manager.service }
       let(:image_service) { openstack_vm_manager.image_service }
-      let(:network_service) { openstack_vm_manager.network_service }
 
       let(:servers) { compute_service.servers }
-      let(:addresses) { compute_service.addresses }
       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] } }
@@ -200,12 +198,18 @@ module VmShepherd
         Fog::Mock.delay = 0
 
         allow(compute_service).to receive(:servers).and_return(servers)
-        allow(compute_service).to receive(:addresses).and_return(addresses)
         allow(image_service).to receive(:images).and_return(images)
 
         openstack_vm_manager.deploy(path, openstack_vm_options)
       end
 
+      def destroy_correct_image
+        change do
+          images.reload
+          images.select { |image| image.name == openstack_vm_options[:name] }.any?
+        end.from(true).to(false)
+      end
+
       it 'calls destroy on the correct instance' do
         destroy_correct_server = change do
           servers.reload
@@ -216,22 +220,107 @@ module VmShepherd
       end
 
       it 'calls destroy on the correct image' do
-        destroy_correct_image = change do
-          images.reload
-          images.find { |image| image.name == openstack_vm_options[:name] }
-        end.to(nil)
-
         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(:get).and_return(nil)
+          allow(servers).to receive(:find).and_return(nil)
         end
 
         it 'returns without error' do
           expect { openstack_vm_manager.destroy(openstack_vm_options) }.not_to raise_error
         end
+
+        it 'calls destroy on the correct image' do
+          expect { openstack_vm_manager.destroy(openstack_vm_options) }.to(destroy_correct_image)
+        end
+      end
+    end
+
+    describe '#clean_environment' do
+      before do
+        allow(openstack_vm_manager).to receive(:say)
+
+        Fog.mock!
+        Fog::Mock.reset
+        Fog::Mock.delay = 0
+
+        make_server_and_image!('vm1')
+        make_server_and_image!('vm2')
+        openstack_vm_manager.image_service.images.create(
+          name: 'public',
+          size: 13784321,
+          disk_format: 'raw',
+          container_format: 'bare',
+          location: '/tmp/notreal',
+          is_public: true,
+        )
+
+        openstack_vm_manager.storage_service.directories
+        a_dir = instance_double(Fog::Storage::OpenStack::Directory, key: 'a_dir')
+        allow(a_dir).to receive(:files).and_return(a_dir_files)
+        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])
+      end
+
+      let(:a_dir_files) { [create_file_double('a_file'), create_file_double('b_file')] }
+      let(:b_dir_files) { [create_file_double('c_file'), create_file_double('d_file')] }
+
+      def create_file_double(key)
+        instance_double(Fog::Storage::OpenStack::File, destroy: nil, key: key)
+      end
+
+      def make_server_and_image!(name)
+        image = openstack_vm_manager.image_service.images.create(
+          name: name,
+          size: 13784321,
+          disk_format: 'raw',
+          container_format: 'bare',
+          location: '/tmp/notreal',
+          is_public: false,
+        )
+
+        openstack_vm_manager.service.servers.create(
+          name: name,
+          flavor_ref: openstack_vm_manager.service.flavors.first.id,
+          image_ref: image.id,
+          key_name: 'some key',
+          security_groups: ['some security group'],
+        )
+
+        openstack_vm_manager.service.volumes.create(
+          name: name,
+          description: "description #{name}",
+          size: name.to_i,
+        )
+      end
+
+      it 'deletes all servers' do
+        expect {
+          openstack_vm_manager.clean_environment
+        }.to change { openstack_vm_manager.service.servers.size }.from(2).to(0)
+      end
+
+      it 'deletes all private images' do
+        expect {
+          openstack_vm_manager.clean_environment
+        }.to change { openstack_vm_manager.image_service.images.size }.from(3).to(1)
+      end
+
+      it 'deletes all volumes' do
+        expect {
+          openstack_vm_manager.clean_environment
+        }.to change { openstack_vm_manager.service.volumes.size }.from(2).to(0)
+      end
+
+      it 'deletes everything in the correct container' do
+        openstack_vm_manager.clean_environment
+        expect(a_dir_files[0]).to have_received(:destroy)
+        expect(a_dir_files[1]).to have_received(:destroy)
+        expect(b_dir_files[0]).to have_received(:destroy)
+        expect(b_dir_files[1]).to have_received(:destroy)
       end
     end
   end

metadata

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