vm_shepherd 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b09a65c54281ecc35d7692d7523b18b10256887c
-  data.tar.gz: b1f694776d98a19c90cc2b566c83f4b213e06607
+SHA256:
+  metadata.gz: f0c4eae538ba72ae93a1bc16e07b93153be92fb3730b0c1ee995c75aaa7bbec6
+  data.tar.gz: c46d2af2473fb238bfb1bec5e85f8ec13d19f9a0e32f5d7c88db23bd0ad3ac25
 SHA512:
-  metadata.gz: e09d8e6e66dfc6f2f4dd877684302f62b26f61eb00a8e4ea05b83c8c4c71b9e0e5f83ad2d08f3edf6db3d75fdccebefa4da00f3da2c8f126df25a1dbc9f8ce8e
-  data.tar.gz: 95523f5119b7a298512d471caf0a8d367e2a17bb5837b23f35bdf2f1d894e49b933b817d0f9c15525c3ac7a52aa9daad0257cb079bc2e150ded11803f076fd3e
+  metadata.gz: c24318537ae944dc68ccd6c214baa05c1906ba78011ae2391a4a1e8b115c5fddc20813f1556a0634a95436dfcf6b73679570bccb35386ac77936e576cc76628e
+  data.tar.gz: 8db0afde7bfa78be5acaf6d0736cd0a4d0fb75cce46054777873125a5ead9f6c4a479834bbeb69ab765cba7ca4bc9189708ec9b4ae6119148e231189bc04dcbc

data/.rubocop.yml

@@ -3,4 +3,4 @@ AllCops:
     - Gemfile
     - Rakefile
     - vm_shepherd.gemspec
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.6

data/.ruby-version

@@ -1 +1 @@
-2.2.4
+2.6.3

data/lib/vm_shepherd/shepherd.rb

@@ -164,6 +164,8 @@ module VmShepherd
               datacenter_folders_to_clean: vm_shepherd_config.dig('cleanup', 'datacenter_folders_to_clean'),
               datastores: vm_shepherd_config.dig('cleanup', 'datastores'),
               datastore_folders_to_clean: vm_shepherd_config.dig('cleanup', 'datastore_folders_to_clean'),
+              cluster_name: vm_shepherd_config.dig('vsphere', 'cluster'),
+              resource_pool_name: vm_shepherd_config.dig('vsphere', 'resource_pool'),
             )
           end
         when VmShepherd::AWS_IAAS_TYPE then

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.7.0'.freeze
+  VERSION = '3.7.1'.freeze
 end

data/lib/vm_shepherd/vsphere_manager.rb

@@ -27,12 +27,12 @@ module VmShepherd
       FileUtils.remove_entry_secure(ovf_file_path, force: true) unless ovf_file_path.nil?
     end
 
-    def clean_environment(datacenter_folders_to_clean:, datastores:, datastore_folders_to_clean:)
+    def clean_environment(datacenter_folders_to_clean:, datastores:, datastore_folders_to_clean:, cluster_name: nil, resource_pool_name: nil)
       return if datacenter_folders_to_clean.nil? || datastores.nil? || datacenter_folders_to_clean.nil?
 
       datacenter_folders_to_clean.each do |folder_name|
         validate_folder_name!(folder_name)
-        delete_folder_and_vms(folder_name)
+        delete_folder_and_vms(folder_name, cluster_name, resource_pool_name)
       end
 
       datastore_folders_to_clean.each do |folder_name|
@@ -129,12 +129,13 @@ module VmShepherd
       datacenter.vmFolder.traverse(folder_name, RbVmomi::VIM::Folder, true)
     end
 
-    def delete_folder_and_vms(folder_name)
+    def delete_folder_and_vms(folder_name, cluster_name = nil, resource_pool_name = nil)
       3.times do |attempt|
         break unless (folder = datacenter.vmFolder.traverse(folder_name))
 
         find_vms(folder).each do |vm|
           power_off_vm(vm)
+          convert_template_to_vm(vm, cluster_name, resource_pool_name)
         end
 
         begin
@@ -160,6 +161,7 @@ module VmShepherd
 
     def power_off_vm(vm)
       2.times do
+        # This will implicitly skip over VM templates, which always are in the "poweredOff" state
         break if vm.runtime.powerState == 'poweredOff'
 
         begin
@@ -173,6 +175,14 @@ module VmShepherd
       end
     end
 
+    def convert_template_to_vm(vm, cluster_name, resource_pool_name)
+      return unless vm.config.template
+
+      cluster = datacenter.find_compute_resource(cluster_name)
+      pool = cluster.resourcePool.resourcePool.find { |rp| rp.name == resource_pool_name }
+      vm.MarkAsVirtualMachine(pool: pool)
+    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}")

data/spec/vm_shepherd/shepherd_spec.rb

@@ -825,6 +825,8 @@ module VmShepherd
             datacenter_folders_to_clean: first_config.dig('cleanup', 'datacenter_folders_to_clean'),
             datastores:                  first_config.dig('cleanup', 'datastores'),
             datastore_folders_to_clean:  first_config.dig('cleanup', 'datastore_folders_to_clean'),
+            cluster_name:  first_config.dig('vsphere', 'cluster'),
+            resource_pool_name:  first_config.dig('vsphere', 'resource_pool'),
           }
         end
         let(:last_ova_manager) { instance_double(VsphereManager) }
@@ -833,6 +835,8 @@ module VmShepherd
             datacenter_folders_to_clean: last_config.dig('cleanup', 'datacenter_folders_to_clean'),
             datastores:                  last_config.dig('cleanup', 'datastores'),
             datastore_folders_to_clean:  last_config.dig('cleanup', 'datastore_folders_to_clean'),
+            cluster_name:  last_config.dig('vsphere', 'cluster'),
+            resource_pool_name:  last_config.dig('vsphere', 'resource_pool'),
           }
         end
 

data/vm_shepherd.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ruby_vcloud_sdk', '0.7.4'
 
   spec.add_dependency 'rbvmomi', '1.11.3'
+  spec.add_dependency 'xmlrpc'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Ops Manager Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -80,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.11.3
+- !ruby/object:Gem::Dependency
+  name: xmlrpc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +207,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -208,9 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.
 test_files: