vmpooler-provider-vsphere 2.1.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7facc5944e6f5a919f916566cd3399a762381f3b046dcd46739ceab2ef72b37
-  data.tar.gz: d8afc51cbd6aa0bfdc195d17403c4908f93733b9998d2ed4663c7243d8bc32b9
+  metadata.gz: fa975e899d87bb13db4a666994ba9aab6795b90f77e4fa82fc1ab2f593ff9df4
+  data.tar.gz: b71765cf7c70a82ab6a170661c00783f5c140cd72e2d42587e37431a902479c8
 SHA512:
-  metadata.gz: 8ee5e106fe90c9e26068af66a1456fda16ffd0932f1f132ff08927fb7efe5a3e0c0af62c212a2b5945605791cedb2d54b3130115ff1190740bb8c1d0547da650
-  data.tar.gz: 789357d7be7a20a7974c365c86564fc53721c67e4e86cfbc111f9c3c8f1e6f6b9c9650b8f974a747d50e92cb2338868fa4d78e787b32c1d7a0eab5e909c2329e
+  metadata.gz: 3c3b57116ad877e205f601ee52b239b3ab7bec57da02ee29272b54dee8b3604bbe653165279f37182337b637b0d5746145fe7dba27a20f7f0f5328e9b986c8f6
+  data.tar.gz: 4943b690045a60941b7b9cdf760fb702cb0b78e44c2e4cd3ca2b984d6a568c83b872b97abe2b0162c6518b7c34dd92a58dbd28d4afe629c5df7f50d49b48d32d

data/lib/vmpooler/providers/vsphere.rb

@@ -51,6 +51,11 @@ module Vmpooler
           'vsphere'
         end
 
+        def domain(pool_name)
+          dns_plugin_name = pool_config(pool_name)['dns_plugin']
+          dns_config(dns_plugin_name)
+        end
+
         def folder_configured?(folder_title, base_folder, configured_folders, allowlist)
           return true if allowlist&.include?(folder_title)
           return false unless configured_folders.keys.include?(folder_title)
@@ -387,6 +392,16 @@ module Vmpooler
           vm_hash
         end
 
+        # The inner method requires vmware tools running in the guest os
+        def get_vm_ip_address(vm_name, pool_name)
+          @connection_pool.with_metrics do |pool_object|
+            connection = ensured_vsphere_connection(pool_object)
+            vm_object = find_vm(pool_name, vm_name, connection)
+            vm_hash = generate_vm_hash(vm_object, pool_name)
+            return vm_hash['ip']
+          end
+        end
+
         def create_config_spec(vm_name, template_name, extra_config)
           RbVmomi::VIM.VirtualMachineConfigSpec(
             annotation: JSON.pretty_generate(
@@ -540,9 +555,10 @@ module Vmpooler
           true
         end
 
-        def vm_ready?(_pool_name, vm_name)
+        def vm_ready?(pool_name, vm_name)
           begin
-            open_socket(vm_name, global_config[:config]['domain'])
+            domain = domain(pool_name)
+            open_socket(vm_name, domain)
           rescue StandardError => _e
             return false
           end
@@ -582,13 +598,28 @@ module Vmpooler
           boottime = vm_object.runtime.bootTime if vm_object.runtime&.bootTime
           powerstate = vm_object.runtime.powerState if vm_object.runtime&.powerState
 
+          ip_maxloop = 60
+          ip_loop_delay = 1
+          ip_loop_count = 1
+          ip = nil
+          while ip.nil?
+            sleep(ip_loop_delay)
+            ip = vm_object.guest_ip
+            unless ip_maxloop == 0
+              break if ip_loop_count >= ip_maxloop
+
+              ip_loop_count += 1
+            end
+          end
+
           {
             'name' => vm_object.name,
             'hostname' => hostname,
             'template' => pool_configuration['template'],
             'poolname' => pool_name,
             'boottime' => boottime,
-            'powerstate' => powerstate
+            'powerstate' => powerstate,
+            'ip' => ip
           }
         end
 

data/lib/vmpooler-provider-vsphere/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VmpoolerProviderVsphere
-  VERSION = '2.1.0'
+  VERSION = '3.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler-provider-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Puppet
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   name: vmpooler
   prerelease: false
   type: :runtime
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: