vm_shepherd 1.8.4 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88deef3c10c81db0c5ea70d8cfd04e85999424ba
-  data.tar.gz: 4d4a8c296e95d0c574d76f67a5f92ee21c2edf66
+  metadata.gz: 9005c41f3252dada8327d25150585f18eab17a14
+  data.tar.gz: c1b4637cbe43854e4a1a3e1569beffa64c333adf
 SHA512:
-  metadata.gz: 1c71799a37d10d37049f2bce2410d34d3b8c0c6ca16ff242312786d76c486f98032216e7c25ad7d867c522fc810828ec69b73dcadda3a5f31e9bb0ad835eec66
-  data.tar.gz: 6332671a327756f8b1893082b4f67580f07cf52dc00c57d364802570d5457c5d5992b08129845239a9643ce5c716303bbc6aeb9ff7782a988b175db17882ff00
+  metadata.gz: 3545eaa72f1f99a5896eb1a2660ea995bc08ffe810a45f5368111e05ef9500eb222326d1000b6257d2bfdeda899bfa63b6f3ef4b67ca470dc30e3515a9def169
+  data.tar.gz: bf1964936e38d28329afa32d70c83e506f129ec8b879bd65fdd0367790c536af3113213c2a54b5e609b31c541bc35aec8faef79984b4dc4b003847395f5e3f80

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.8.4'.freeze
+  VERSION = '1.9.0'.freeze
 end

data/lib/vm_shepherd/vsphere_manager.rb

@@ -41,7 +41,7 @@ module VmShepherd
           begin
             logger.info("BEGIN datastore_folder.destroy_task folder=#{folder_name}")
 
-            connection.serviceContent.fileManager.DeleteDatastoreFile_Task(
+            file_manager.DeleteDatastoreFile_Task(
               datacenter: datacenter,
               name: "[#{datastore}] #{folder_name}"
             ).wait_for_completion
@@ -124,7 +124,10 @@ module VmShepherd
       3.times do |attempt|
         break unless (folder = datacenter.vmFolder.traverse(folder_name))
 
-        find_vms(folder).each { |vm| power_off_vm(vm) }
+        find_vms(folder).each do |vm|
+          power_off_vm(vm)
+          destroy_vm_datastore_folder(vm)
+        end
 
         begin
           logger.info("BEGIN folder.destroy_task folder=#{folder_name} attempt ##{attempt}")
@@ -162,6 +165,18 @@ module VmShepherd
       end
     end
 
+
+    def destroy_vm_datastore_folder(vm)
+      begin
+        vm_datastore_folder = vm.config.files.snapshotDirectory
+        logger.info("BEGIN vm_datastore_folder.delete_datastore_file_task folder=#{vm_datastore_folder}")
+        file_manager.DeleteDatastoreFile_Task(name: vm_datastore_folder, datacenter: datacenter).wait_for_completion
+        logger.info("END vm_datastore_folder.delete_datastore_file_task folder=#{vm_datastore_folder}")
+      rescue RbVmomi::Fault => e
+        logger.info("ERROR vm_datastore_folder.delete_datastore_file_task. Skipping ... folder=#{vm_datastore_folder} #{e.inspect}")
+      end
+    end
+
     def deploy_ovf_template(ovf_file_path, vsphere_config)
       template_name = [TEMPLATE_PREFIX, Time.new.strftime('%F-%H-%M'), cluster(vsphere_config).name].join('-')
       logger.info("BEGIN deploy_ovf ovf_file=#{ovf_file_path} template_name=#{template_name}")
@@ -312,6 +327,12 @@ module VmShepherd
       end
     end
 
+    def file_manager
+      connection.serviceContent.fileManager.tap do |fm|
+        fail("ERROR finding filemanager") unless fm.is_a?(RbVmomi::VIM::FileManager)
+      end
+    end
+
     def target_folder(vsphere_config)
       datacenter.vmFolder.traverse(vsphere_config[:folder], RbVmomi::VIM::Folder, true)
     end

data/spec/vm_shepherd/vsphere_manager_spec.rb

@@ -36,9 +36,9 @@ module VmShepherd
         allow(datacenter).to receive(:vmFolder).and_return(folder)
         allow(folder).to receive(:traverse).with('FAKE_DATACENTER_FOLDERS').and_return(folder)
         allow(service_content).to receive(:fileManager).and_return(filemanager)
+        allow(filemanager).to receive(:is_a?).with(RbVmomi::VIM::FileManager).and_return(true)
         # stubbed private methods:
         allow(subject).to receive(:find_vms).and_return(vms)
-        allow(subject).to receive(:power_off_vm)
         allow(subject).to receive(:delete_folder_and_vms)
       end
 

metadata

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