vmpooler 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52bdb481f0c4e9f3bfd690d4f85c906be9d15324b5c67d4f958fb64e290e8fd0
-  data.tar.gz: 941ee17c0f392d87a1691488a4479b607c05162ca4cb971929f71e2220692fec
+  metadata.gz: b755def48f79be4614be09b1137b7ecb20a59feced1dc521fdc1ba9454a1efa2
+  data.tar.gz: b3de3d1a6252b6bc3260235421366734f98c031e5895978d22060d770989e0d8
 SHA512:
-  metadata.gz: 890cf253d1c32449ecc28d2c8ca143139fdda22a700fc4f90512cdfff15eab5a7e787cce4d57c89da517fd6f0ec589d25eb6cf5254b465894f92c83262af9058
-  data.tar.gz: da550116fa03211da3db4e03fd5fe662bc80da252a82980d462eaf1bda35404591cf0f63d148e485e5d922ba647afd1e0077c2edeca55d6797ce72cbd2f629a5
+  metadata.gz: ba6ef4065c811dffbdafc2035c40092f59fc9921a83595bcbe73a42f8b1df74d355a9bc573a9301e6245d70e61132a906feb3b0a22988b4bf11639e921e4d283
+  data.tar.gz: 457c5212222bf9052cf9ef5e941417d75c85e86ef878910a44a3f35f8b4e4fa5ef22619bc0c10bea8be14091e2d79087b1292bee094719eddb60825e115dc5c6

data/lib/vmpooler/api/v1.rb

@@ -909,13 +909,6 @@ module Vmpooler
                 max_lifetime_upper_limit = max_lifetime_upper_limit.to_i
                 if arg.to_i >= max_lifetime_upper_limit
                   failure.push("You provided a lifetime (#{arg}) that exceeds the configured maximum of #{max_lifetime_upper_limit}.")
-                else
-                  # also make sure we do not extend past max_lifetime_upper_limit
-                  rdata = backend.hgetall('vmpooler__vm__' + params[:hostname])
-                  running = ((Time.now - Time.parse(rdata['checkout'])) / 60 / 60).round(2)
-                  unless running + arg.to_i < max_lifetime_upper_limit
-                    failure.push("You provided a lifetime (#{arg}) that will extend the current lifetime past the configured maximum of #{max_lifetime_upper_limit}.")
-                  end
                 end
               end
 

data/lib/vmpooler/pool_manager.rb

@@ -444,7 +444,7 @@ module Vmpooler
         if provider_purge
           Thread.new do
             begin
-              purge_vms_and_folders($providers[provider.to_s])
+              purge_vms_and_folders(provider.to_s)
             rescue StandardError => e
               $logger.log('s', "[!] failed while purging provider #{provider} VMs and folders with an error: #{e}")
             end
@@ -455,14 +455,13 @@ module Vmpooler
     end
 
     # Return a list of pool folders
-    def pool_folders(provider)
-      provider_name = provider.name
+    def pool_folders(provider_name)
       folders = {}
       $config[:pools].each do |pool|
         next unless pool['provider'] == provider_name
 
         folder_parts = pool['folder'].split('/')
-        datacenter = provider.get_target_datacenter_from_config(pool['name'])
+        datacenter = $providers[provider_name].get_target_datacenter_from_config(pool['name'])
         folders[folder_parts.pop] = "#{datacenter}/vm/#{folder_parts.join('/')}"
       end
       folders
@@ -479,8 +478,8 @@ module Vmpooler
     def purge_vms_and_folders(provider)
       configured_folders = pool_folders(provider)
       base_folders = get_base_folders(configured_folders)
-      whitelist = provider.provider_config['folder_whitelist']
-      provider.purge_unconfigured_folders(base_folders, configured_folders, whitelist)
+      whitelist = $providers[provider].provider_config['folder_whitelist']
+      $providers[provider].purge_unconfigured_folders(base_folders, configured_folders, whitelist)
     end
 
     def create_vm_disk(pool_name, vm, disk_size, provider)

data/lib/vmpooler/providers/vsphere.rb

@@ -118,11 +118,11 @@ module Vmpooler
 
             base_folders.each do |base_folder|
               folder_children = get_folder_children(base_folder, connection)
-              unless folder_children.empty?
-                folder_children.each do |folder_hash|
-                  folder_hash.each do |folder_title, folder_object|
-                    destroy_folder_and_children(folder_object) unless folder_configured?(folder_title, base_folder, configured_folders, whitelist)
-                  end
+              next if folder_children.empty?
+
+              folder_children.each do |folder_hash|
+                folder_hash.each do |folder_title, folder_object|
+                  destroy_folder_and_children(folder_object) unless folder_configured?(folder_title, base_folder, configured_folders, whitelist)
                 end
               end
             end

data/lib/vmpooler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vmpooler
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement