From e832d7fd7a6c729f887392e2196b7661491857e6 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Tue, 23 Sep 2014 17:03:51 +0200 Subject: [PATCH] feature #2911: Fix polling for vCenter VMs --- src/vmm_mad/remotes/vcenter/poll | 7 +++++-- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/vcenter/poll b/src/vmm_mad/remotes/vcenter/poll index 4136cee0e6..7de142fe69 100644 --- a/src/vmm_mad/remotes/vcenter/poll +++ b/src/vmm_mad/remotes/vcenter/poll @@ -33,8 +33,11 @@ require 'vcenter_driver' deploy_id = ARGV[0] host = ARGV[1] -host_id = VCenterDriver::VCenterVm.translate_hostname(host) +host_id = VCenterDriver::VIClient.translate_hostname(host) vi_client = VCenterDriver::VIClient.new host_id -vm = connection.find_vm_template(deploy_id) +vm = vi_client.find_vm_template(deploy_id) +vm = VCenterDriver::VCenterVm.new(vi_client, vm) + +vm.monitor puts vm.info diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 2252f4d926..6d5edfe6f2 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -401,6 +401,7 @@ class VCenterVm ############################################################################ # Creates a new VIVm using a RbVmomi::VirtualMachine object + # @param client [VCenterClient] client to connect to vCenter # @param vm_vi [RbVmomi::VirtualMachine] it will be used if not nil ######################################################################## def initialize(client, vm_vi )