vmpooler 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9ca5e041d051fc1f66b4de635492388443b35ec4
-  data.tar.gz: 0389293f134e875f3a7f74da8cfcb6f72bd94601
+SHA256:
+  metadata.gz: 5ed26a71aa47a1ec841f9ed0cc2e7ad6b0ddbc3c29474829133a3f344acacb1d
+  data.tar.gz: b8858d6c730532458d9b6dd9bff125e6aaeca7fa33eb30f2cfbf1d9ffe7b9875
 SHA512:
-  metadata.gz: 3cadcac1a60a44662720f498ce83af5506e8c13ab39c9029fa53c030936d22d942529a41873d7ae7489d64487388f195d99f944f831e51cbb172e96c111a0052
-  data.tar.gz: f1ff4a6f52c8a8981f4ce126add76eee6d1ae863ba078053d48fa537e78ebc249989192abbe728482385de65208e7180a6e77c9c7c6849de35eafaec39fb194d
+  metadata.gz: 1f0daff36d86b1bfcc4b6afcf4e1a6303d10bcb92316a0880d57a9ba6697fbaa234d35dae0a1afc2e960f1def86b4f6ec4a66180487f13ffcefc80ba0aec51c3
+  data.tar.gz: 518fedee319ca02be46f81f25fc477c2eb488a81d8841997c41ccedceccc57f3043564bc706c7f84b3a5b4028780a5f0dd9140d0d6e8190c3dd1a99f2226f523

data/lib/vmpooler/api/v1.rb

@@ -875,7 +875,7 @@ module Vmpooler
       status 404
       result = { 'ok' => false }
 
-      failure = false
+      failure = []
 
       params[:hostname] = hostname_shorten(params[:hostname], config['domain'])
 
@@ -892,24 +892,42 @@ module Vmpooler
             when 'lifetime'
               need_token! if Vmpooler::API.settings.config[:auth]
 
+              # in hours, defaults to one week
+              max_lifetime_upper_limit = config['max_lifetime_upper_limit']
+              if max_lifetime_upper_limit
+                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
+
+              # validate lifetime is within boundaries
               unless arg.to_i > 0
-                failure = true
+                failure.push("You provided a lifetime (#{arg}) but you must provide a positive number.")
               end
             when 'tags'
               unless arg.is_a?(Hash)
-                failure = true
+                failure.push("You provided tags (#{arg}) as something other than a hash.")
               end
 
               if config['allowed_tags']
-                failure = true if not (arg.keys - config['allowed_tags']).empty?
+                failure.push("You provided unsuppored tags (#{arg}).") if not (arg.keys - config['allowed_tags']).empty?
               end
             else
-              failure = true
+              failure.push("Unknown argument #{arg}.")
           end
         end
 
-        if failure
+        if failure.size > 0
           status 400
+          result['failure'] = failure
         else
           jdata.each do |param, arg|
             case param

data/lib/vmpooler/pool_manager.rb

@@ -104,6 +104,7 @@ module Vmpooler
       if time_since_clone > timeout
         if exists
           $redis.smove('vmpooler__pending__' + pool, 'vmpooler__completed__' + pool, vm)
+          $metrics.increment("errors.markedasfailed.#{pool}")
           $logger.log('d', "[!] [#{pool}] '#{vm}' marked as 'failed' after #{timeout} minutes")
         else
           remove_nonexistent_vm(vm, pool)

data/lib/vmpooler/providers/vsphere.rb

@@ -839,7 +839,20 @@ module Vmpooler
         def find_cluster(cluster, connection, datacentername)
           datacenter = connection.serviceInstance.find_datacenter(datacentername)
           raise("Datacenter #{datacentername} does not exist") if datacenter.nil?
-          datacenter.hostFolder.children.find { |cluster_object| cluster_object.name == cluster }
+
+          # In the event the cluster is not a direct descendent of the
+          # datacenter, we use a ContainerView to leverage its recursive
+          # search. This will find clusters which are, for example, in
+          # folders under the datacenter. This will also find standalone
+          # hosts which are not part of a cluster.
+          cv = connection.serviceContent.viewManager.CreateContainerView(
+            container: datacenter.hostFolder,
+            type: ['ComputeResource', 'ClusterComputeResource'],
+            recursive: true,
+          )
+          cluster = cv.view.find { |cluster_object| cluster_object.name == cluster }
+          cv.DestroyView
+          cluster
         end
 
         def get_cluster_host_utilization(cluster, model = nil)

data/lib/vmpooler/version.rb

@@ -1,3 +1,3 @@
 module Vmpooler
-  VERSION = '0.8.2'.freeze
+  VERSION = '0.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup
@@ -237,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: vmpooler provides configurable pools of instantly-available (running) virtual