vmpooler 0.16.3 → 1.0.0

data/lib/vmpooler/providers/vsphere.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'vmpooler/providers/base'
+require 'bigdecimal'
+require 'bigdecimal/util'
 
 module Vmpooler
   class PoolManager
@@ -49,9 +51,7 @@ module Vmpooler
         end
 
         def folder_configured?(folder_title, base_folder, configured_folders, whitelist)
-          if whitelist
-            return true if whitelist.include?(folder_title)
-          end
+          return true if whitelist&.include?(folder_title)
           return false unless configured_folders.keys.include?(folder_title)
           return false unless configured_folders[folder_title] == base_folder
 
@@ -68,7 +68,7 @@ module Vmpooler
             redis.hset("vmpooler__vm__#{vm_name}", 'destroy', Time.now)
 
             # Auto-expire metadata key
-            redis.expire('vmpooler__vm__' + vm_name, (data_ttl * 60 * 60))
+            redis.expire("vmpooler__vm__#{vm_name}", (data_ttl * 60 * 60))
             redis.exec
           end
 
@@ -203,9 +203,7 @@ module Vmpooler
             return
           end
           wait_for_host_selection(dc, target, loop_delay, max_age) if target[dc].key?('checking')
-          if target[dc].key?('check_time_finished')
-            select_target_hosts(target, cluster, datacenter) if now - target[dc]['check_time_finished'] > max_age
-          end
+          select_target_hosts(target, cluster, datacenter) if target[dc].key?('check_time_finished') && now - target[dc]['check_time_finished'] > max_age
         end
 
         def wait_for_host_selection(dc, target, maxloop = 0, loop_delay = 1, max_age = 60)
@@ -306,19 +304,26 @@ module Vmpooler
 
             template_vm_object = find_template_vm(pool, connection)
 
+            extra_config = [
+              { key: 'guestinfo.hostname', value: new_vmname }
+            ]
+
+            if pool.key?('snapshot_mainMem_ioBlockPages')
+              ioblockpages = pool['snapshot_mainMem_ioBlockPages']
+              extra_config.push(
+                { key: 'mainMem.ioBlockPages', value: ioblockpages }
+              )
+            end
+            if pool.key?('snapshot_mainMem_iowait')
+              iowait = pool['snapshot_mainMem_iowait']
+              extra_config.push(
+                { key: 'mainMem.iowait', value: iowait }
+              )
+            end
+
             # Annotate with creation time, origin template, etc.
             # Add extraconfig options that can be queried by vmtools
-            config_spec = RbVmomi::VIM.VirtualMachineConfigSpec(
-              annotation: JSON.pretty_generate(
-                name: new_vmname,
-                created_by: provider_config['username'],
-                base_template: template_path,
-                creation_timestamp: Time.now.utc
-              ),
-              extraConfig: [
-                { key: 'guestinfo.hostname', value: new_vmname }
-              ]
-            )
+            config_spec = create_config_spec(new_vmname, template_path, extra_config)
 
             # Check if alternate network configuration is specified and add configuration
             if pool.key?('network')
@@ -358,6 +363,18 @@ module Vmpooler
           vm_hash
         end
 
+        def create_config_spec(vm_name, template_name, extra_config)
+          RbVmomi::VIM.VirtualMachineConfigSpec(
+            annotation: JSON.pretty_generate(
+              name: vm_name,
+              created_by: provider_config['username'],
+              base_template: template_name,
+              creation_timestamp: Time.now.utc
+            ),
+            extraConfig: extra_config
+          )
+        end
+
         def create_relocate_spec(target_datastore, target_datacenter_name, pool_name, connection)
           pool = pool_config(pool_name)
           target_cluster_name = get_target_cluster_from_config(pool_name)
@@ -399,15 +416,15 @@ module Vmpooler
           # Determine network device type
           # All possible device type options here: https://vdc-download.vmware.com/vmwb-repository/dcr-public/98d63b35-d822-47fe-a87a-ddefd469df06/2e3c7b58-f2bd-486e-8bb1-a75eb0640bee/doc/vim.vm.device.VirtualEthernetCard.html
           network_device =
-            if template_vm_network_device.is_a? RbVmomi::VIM::VirtualVmxnet2
+            if template_vm_network_device.instance_of? RbVmomi::VIM::VirtualVmxnet2
               RbVmomi::VIM.VirtualVmxnet2
-            elsif template_vm_network_device.is_a? RbVmomi::VIM::VirtualVmxnet3
+            elsif template_vm_network_device.instance_of? RbVmomi::VIM::VirtualVmxnet3
               RbVmomi::VIM.VirtualVmxnet3
-            elsif template_vm_network_device.is_a? RbVmomi::VIM::VirtualE1000
+            elsif template_vm_network_device.instance_of? RbVmomi::VIM::VirtualE1000
               RbVmomi::VIM.VirtualE1000
-            elsif template_vm_network_device.is_a? RbVmomi::VIM::VirtualE1000e
+            elsif template_vm_network_device.instance_of? RbVmomi::VIM::VirtualE1000e
               RbVmomi::VIM.VirtualE1000e
-            elsif template_vm_network_device.is_a? RbVmomi::VIM::VirtualSriovEthernetCard
+            elsif template_vm_network_device.instance_of? RbVmomi::VIM::VirtualSriovEthernetCard
               RbVmomi::VIM.VirtualSriovEthernetCard
             else
               RbVmomi::VIM.VirtualPCNet32
@@ -541,7 +558,7 @@ module Vmpooler
           boottime = vm_object.runtime.bootTime if vm_object.runtime&.bootTime
           powerstate = vm_object.runtime.powerState if vm_object.runtime&.powerState
 
-          hash = {
+          {
             'name' => vm_object.name,
             'hostname' => hostname,
             'template' => pool_configuration['template'],
@@ -549,8 +566,6 @@ module Vmpooler
             'boottime' => boottime,
             'powerstate' => powerstate
           }
-
-          hash
         end
 
         # vSphere helper methods
@@ -775,7 +790,7 @@ module Vmpooler
           }
 
           folder_object = connection.searchIndex.FindByInventoryPath(propSpecs) # rubocop:disable Naming/VariableName
-          return nil unless folder_object.class == RbVmomi::VIM::Folder
+          return nil unless folder_object.instance_of? RbVmomi::VIM::Folder
 
           folder_object
         end
@@ -791,9 +806,7 @@ module Vmpooler
         #    the cpu or memory utilization is bigger than the limit param
         def get_host_utilization(host, model = nil, limit = 90)
           limit = @config[:config]['utilization_limit'] if @config[:config].key?('utilization_limit')
-          if model
-            return nil unless host_has_cpu_model?(host, model)
-          end
+          return nil if model && !host_has_cpu_model?(host, model)
           return nil if host.runtime.inMaintenanceMode
           return nil unless host.overallStatus == 'green'
           return nil unless host.configIssue.empty?
@@ -802,9 +815,9 @@ module Vmpooler
           memory_utilization = memory_utilization_for host
 
           return nil if cpu_utilization.nil?
-          return nil if cpu_utilization == 0.0
+          return nil if cpu_utilization.to_d == 0.0.to_d
           return nil if memory_utilization.nil?
-          return nil if memory_utilization == 0.0
+          return nil if memory_utilization.to_d == 0.0.to_d
 
           return nil if cpu_utilization > limit
           return nil if memory_utilization > limit
@@ -819,8 +832,7 @@ module Vmpooler
         def get_host_cpu_arch_version(host)
           cpu_model = host.hardware.cpuPkg[0].description
           cpu_model_parts = cpu_model.split
-          arch_version = cpu_model_parts[4]
-          arch_version
+          cpu_model_parts[4]
         end
 
         def cpu_utilization_for(host)
@@ -912,8 +924,7 @@ module Vmpooler
           target_hosts = get_cluster_host_utilization(cluster_object)
           raise("There is no host candidate in vcenter that meets all the required conditions, check that the cluster has available hosts in a 'green' status, not in maintenance mode and not overloaded CPU and memory'") if target_hosts.empty?
 
-          least_used_host = target_hosts.min[1]
-          least_used_host
+          target_hosts.min[1]
         end
 
         def find_cluster(cluster, connection, datacentername)
@@ -960,11 +971,10 @@ module Vmpooler
         end
 
         def build_propSpecs(datacenter, folder, vmname) # rubocop:disable Naming/MethodName
-          propSpecs = { # rubocop:disable Naming/VariableName
+          {
             entity => self,
             :inventoryPath => "#{datacenter}/vm/#{folder}/#{vmname}"
           }
-          propSpecs # rubocop:disable Naming/VariableName
         end
 
         def find_vm(pool_name, vmname, connection)

data/lib/vmpooler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -66,104 +66,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: opentelemetry-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-jaeger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-concurrent_ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-resource_detectors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: pickup
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +184,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -384,16 +376,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement