vm_shepherd 1.11.5 → 1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eccf2d989298fbd37af2ac556c0df012ba7801dd
-  data.tar.gz: cdc11913f4789dc33e776714cd4167adac22aca1
+  metadata.gz: b1fce84934b1f7e9b085ceef03f595043fa87826
+  data.tar.gz: 52fe82935e0695493ec950e134f10d1afd43b236
 SHA512:
-  metadata.gz: dc2f086841402650754a13cf3263d603af8ac889dd2c2ed45776bb5f6618969f2e752a778238ac7e12675438c26d2a40bc651d6641081075bbbcb708f5e24123
-  data.tar.gz: ca6f70713dd659001b0ead1a5941a097a7feb4d75ca0836f4a3f124af2defc406775a9b69c0fe14aec4c62e90bc0f24b163aea5665da5c872b0c405eff79fda4
+  metadata.gz: af63f5cc1bdacd6ebc0103ea8e10a69fb48a26de0d98c75e2db01f3f99c1db65c079c011fb1ddae53f258aab65ecd4a5cc8320fb2ab08e1520189b2ba5e22cdb
+  data.tar.gz: f749e89e48cdde0683fd8bea20eca068b6690902bfca2fb860fea28cbea60997696fd379994e6f8151aaf3aaba8396ae135a0b3f763d375e04ef44f52e0a5e27

data/lib/vm_shepherd/vcloud/destroyer.rb

@@ -6,8 +6,8 @@ module VmShepherd
         @vdc_name = vdc_name
       end
 
-      def clean_catalog_and_vapps(catalog:, vapp_names:, logger:, delete_vapps:)
-        clean_vapps(vapp_names, logger, delete_vapps)
+      def clean_catalog_and_vapps(catalog:, vapp_names:, logger:)
+        clean_vapps(vapp_names, logger)
         delete_catalog(catalog)
       end
 
@@ -17,11 +17,11 @@ module VmShepherd
         @vdc ||= @client.find_vdc_by_name(@vdc_name)
       end
 
-      def clean_vapps(vapp_names, logger, delete_vapps)
+      def clean_vapps(vapp_names, logger)
         vapp_names.each do |vapp_name|
           begin
             clean_vapp(vapp_name)
-            delete_vapp(vapp_name) if delete_vapps
+            delete_vapp(vapp_name)
           rescue VCloudSdk::ObjectNotFoundError => e
             logger.debug "Could not delete vapp '#{vapp_name}': #{e.inspect}"
           end
@@ -40,8 +40,11 @@ module VmShepherd
 
       def delete_vapp(vapp_name)
         vapp = vdc.find_vapp_by_name(vapp_name)
-        vapp.power_off
-        vapp.delete
+
+        if vapp.vms.any?
+          vapp.power_off
+          vapp.delete
+        end
       end
 
       def delete_catalog(catalog)

data/lib/vm_shepherd/vcloud_manager.rb

@@ -35,12 +35,12 @@ module VmShepherd
 
     def destroy(vapp_names, catalog)
       VmShepherd::Vcloud::Destroyer.new(client: client, vdc_name: @vdc_name).
-        clean_catalog_and_vapps(catalog: catalog, vapp_names: vapp_names, logger: @logger, delete_vapps: true)
+        clean_catalog_and_vapps(catalog: catalog, vapp_names: vapp_names, logger: @logger)
     end
 
     def clean_environment(vapp_names, catalog)
       VmShepherd::Vcloud::Destroyer.new(client: client, vdc_name: @vdc_name).
-        clean_catalog_and_vapps(catalog: catalog, vapp_names: vapp_names, logger: @logger, delete_vapps: false)
+        clean_catalog_and_vapps(catalog: catalog, vapp_names: vapp_names, logger: @logger)
     end
 
     private

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.11.5'.freeze
+  VERSION = '1.11.6'.freeze
 end

data/spec/vm_shepherd/vcloud/destroyer_spec.rb

@@ -35,7 +35,7 @@ module VmShepherd
           end
 
           it 'deletes the catalog' do
-            destroyer.clean_catalog_and_vapps(catalog: 'CATALOG_NAME', vapp_names: [], logger: fake_logger, delete_vapps: false)
+            destroyer.clean_catalog_and_vapps(catalog: 'CATALOG_NAME', vapp_names: [], logger: fake_logger)
 
             expect(client).to have_received(:delete_catalog_by_name).with('CATALOG_NAME')
           end
@@ -47,31 +47,35 @@ module VmShepherd
           end
 
           it 'skips deleting the catalog' do
-            destroyer.clean_catalog_and_vapps(catalog: 'CATALOG_NAME', vapp_names: [], logger: fake_logger, delete_vapps: false)
+            destroyer.clean_catalog_and_vapps(catalog: 'CATALOG_NAME', vapp_names: [], logger: fake_logger)
 
             expect(client).not_to have_received(:delete_catalog_by_name).with('CATALOG_NAME')
           end
         end
 
         it 'detaches and deletes persistent disks' do
-          destroyer.clean_catalog_and_vapps(catalog: 'CATALOG_NAME', vapp_names: ['VAPP_NAME'], logger: fake_logger, delete_vapps: false)
+          destroyer.clean_catalog_and_vapps(catalog: 'CATALOG_NAME', vapp_names: ['VAPP_NAME'], logger: fake_logger)
 
           expect(vm).to have_received(:detach_disk).with(disk)
           expect(vdc).to have_received(:delete_disk_by_name).with('DISK_NAME')
         end
 
-        context 'when the delete_vapps flag is true' do
+        context 'when there are VMs in the vApp' do
           it 'deletes the vapps' do
-            destroyer.clean_catalog_and_vapps(catalog: 'CATALOG_NAME', vapp_names: ['VAPP_NAME'], logger: fake_logger, delete_vapps: true)
+            destroyer.clean_catalog_and_vapps(catalog: 'CATALOG_NAME', vapp_names: ['VAPP_NAME'], logger: fake_logger)
 
             expect(vapp).to have_received(:power_off).ordered
             expect(vapp).to have_received(:delete).ordered
           end
         end
 
-        context 'when the delete_vapps flag is false' do
+        context 'when there are no VMs in the vApp' do
+          before do
+            allow(vapp).to receive(:vms).and_return([])
+          end
+
           it 'does not delete the vapps' do
-            destroyer.clean_catalog_and_vapps(catalog: 'CATALOG_NAME', vapp_names: ['VAPP_NAME'], logger: fake_logger, delete_vapps: false)
+            destroyer.clean_catalog_and_vapps(catalog: 'CATALOG_NAME', vapp_names: ['VAPP_NAME'], logger: fake_logger)
 
             expect(vapp).not_to have_received(:power_off)
             expect(vapp).not_to have_received(:delete)

data/spec/vm_shepherd/vcloud_manager_spec.rb

@@ -274,7 +274,7 @@ module VmShepherd
       it 'destroys everything including vapps' do
         destroyer = instance_double(VmShepherd::Vcloud::Destroyer)
         expect(VmShepherd::Vcloud::Destroyer).to receive(:new).with(client: client, vdc_name: vdc_name).and_return(destroyer)
-        expect(destroyer).to receive(:clean_catalog_and_vapps).with(catalog: vapp_catalog, vapp_names: [vapp_name], logger: logger, delete_vapps: true)
+        expect(destroyer).to receive(:clean_catalog_and_vapps).with(catalog: vapp_catalog, vapp_names: [vapp_name], logger: logger)
 
         vcloud_manager.destroy([vapp_name], vapp_catalog)
       end
@@ -292,7 +292,7 @@ module VmShepherd
       it 'destroys the environment expect for vapps' do
         destroyer = instance_double(VmShepherd::Vcloud::Destroyer)
         expect(VmShepherd::Vcloud::Destroyer).to receive(:new).with(client: client, vdc_name: vdc_name).and_return(destroyer)
-        expect(destroyer).to receive(:clean_catalog_and_vapps).with(catalog: vapp_catalog, vapp_names: [vapp_name], logger: logger, delete_vapps: false)
+        expect(destroyer).to receive(:clean_catalog_and_vapps).with(catalog: vapp_catalog, vapp_names: [vapp_name], logger: logger)
 
         vcloud_manager.clean_environment([vapp_name], vapp_catalog)
       end

metadata

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