vm_shepherd 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b121dee2dca3c6d42da8b7476e5ae4cf6013345
-  data.tar.gz: ee6729d0c2c9b75efd53c3cb5936089ac6551c4f
+  metadata.gz: 3ea022dca3043409c217daf3acaffbcc0ee73205
+  data.tar.gz: 33265e1f41141d6bcf281f58d887369fb880484a
 SHA512:
-  metadata.gz: c35492e9a7324acaca7e5fe2385cca91ad9188581f96ff4ebe5632b288918a93cc36b757ab06b26bc239ad3fb62bbcd7bce39bd72ea30a8e36814e229259b412
-  data.tar.gz: d57003cb209534a08752db05c2ac7c96dd5bfe36b5f343d3673acc5f9133af3f79b520228205bb13de6e5a6b8ec115c8eeee7df9bbd4c5152caebf208231168a
+  metadata.gz: 074f1d4cdc3b3d965e2d8a0c4e5dd25a5d0c747a19787c044af44aa64517fab81166b03b7d8f7217801f55b369c4565e22ae03ac12956501f6334680d1c65737
+  data.tar.gz: c15a7975823d8532fd886488b04bcefed4129ef1b67b92cb8a665fa89447bc2c09a41836dea396e165db633fd513899e33f4a38246b1b928570369d884bc2c61

data/lib/vm_shepherd/vcloud/destroyer.rb

@@ -6,8 +6,8 @@ module VmShepherd
         @vdc_name = vdc_name
       end
 
-      def delete_catalog_and_vapps(catalog, vapp_names, logger)
-        delete_vapps(vapp_names, logger)
+      def delete_catalog_and_vms(catalog, vapp_names, logger)
+        delete_vms_in_vapps(vapp_names, logger)
         delete_catalog(catalog)
       end
 
@@ -17,10 +17,10 @@ module VmShepherd
         @vdc ||= @client.find_vdc_by_name(@vdc_name)
       end
 
-      def delete_vapps(vapp_names, logger)
+      def delete_vms_in_vapps(vapp_names, logger)
         vapp_names.each do |vapp_name|
           begin
-            delete_vapp(vapp_name)
+            delete_vms_in_vapp(vapp_name)
           rescue VCloudSdk::ObjectNotFoundError => e
             logger.debug "Could not delete vapp '#{vapp_name}': #{e.inspect}"
           end
@@ -31,7 +31,7 @@ module VmShepherd
         @client.delete_catalog_by_name(catalog) if @client.catalog_exists?(catalog)
       end
 
-      def delete_vapp(vapp_name)
+      def delete_vms_in_vapp(vapp_name)
         vapp = vdc.find_vapp_by_name(vapp_name)
         vapp.vms.map do |vm|
           vm.independent_disks.map do |disk|
@@ -39,8 +39,6 @@ module VmShepherd
             vdc.delete_disk_by_name(disk.name)
           end
         end
-        vapp.power_off
-        vapp.delete
       end
     end
   end

data/lib/vm_shepherd/vcloud_manager.rb

@@ -35,7 +35,7 @@ module VmShepherd
 
     def destroy(vapp_names, catalog)
       VmShepherd::Vcloud::Destroyer.new(client: client, vdc_name: @vdc_name).
-        delete_catalog_and_vapps(catalog, vapp_names, @logger)
+        delete_catalog_and_vms(catalog, vapp_names, @logger)
     end
 
     def clean_environment(vapp_names, catalog)

data/lib/vm_shepherd/version.rb

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

data/spec/vm_shepherd/vcloud/destroyer_spec.rb

@@ -28,14 +28,14 @@ module VmShepherd
         allow(vm).to receive(:detach_disk)
       end
 
-      describe '#delete_catalog_and_vapps' do
+      describe '#delete_catalog_and_vms' do
         context 'when the catalog exists' do
           before do
             allow(client).to receive(:catalog_exists?).with('CATALOG_NAME').and_return(true)
           end
 
           it 'deletes the catalog' do
-            destroyer.delete_catalog_and_vapps('CATALOG_NAME', [], fake_logger)
+            destroyer.delete_catalog_and_vms('CATALOG_NAME', [], fake_logger)
 
             expect(client).to have_received(:delete_catalog_by_name).with('CATALOG_NAME')
           end
@@ -47,25 +47,18 @@ module VmShepherd
           end
 
           it 'skips deleting the catalog' do
-            destroyer.delete_catalog_and_vapps('CATALOG_NAME', [], fake_logger)
+            destroyer.delete_catalog_and_vms('CATALOG_NAME', [], 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.delete_catalog_and_vapps('CATALOG_NAME', ['VAPP_NAME'], fake_logger)
+          destroyer.delete_catalog_and_vms('CATALOG_NAME', ['VAPP_NAME'], fake_logger)
 
           expect(vm).to have_received(:detach_disk).with(disk)
           expect(vdc).to have_received(:delete_disk_by_name).with('DISK_NAME')
         end
-
-        it 'powers off and deletes vapps' do
-          destroyer.delete_catalog_and_vapps('CATALOG_NAME', ['VAPP_NAME'], fake_logger)
-
-          expect(vapp).to have_received(:power_off)
-          expect(vapp).to have_received(:delete)
-        end
       end
     end
   end

data/spec/vm_shepherd/vcloud_manager_spec.rb

@@ -286,8 +286,6 @@ module VmShepherd
           expect(vdc).to receive(:find_vapp_by_name).with(vapp_name).and_return(vapp)
           expect(vm).to receive(:detach_disk).with(disk)
           expect(vdc).to receive(:delete_disk_by_name).with('disk name')
-          expect(vapp).to receive(:power_off)
-          expect(vapp).to receive(:delete)
           expect(client).to receive(:delete_catalog_by_name).with(vapp_catalog)
 
           expect(VCloudSdk::Client).to receive(:new).with(
@@ -338,8 +336,6 @@ module VmShepherd
           expect(vdc).to receive(:find_vapp_by_name).with(vapp_name).and_return(vapp)
           expect(vm).to receive(:detach_disk).with(disk)
           expect(vdc).to receive(:delete_disk_by_name).with('disk name')
-          expect(vapp).to receive(:power_off)
-          expect(vapp).to receive(:delete)
           expect(client).not_to receive(:delete_catalog_by_name).with(vapp_catalog)
 
           expect(VCloudSdk::Client).to receive(:new).with(

metadata

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