diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb index 416c5a3516..dfb40471b5 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -936,7 +936,7 @@ module VCenterDriver # Uses VM Templte if ref available, or the vCenter VM if not # (latter case is if we are dealing with a Wild VM def reference_disks(template_ref, disks, managed) - return [] if unmanaged_disks.emty? || instantiated_as_persistent? + return [] if disks.empty? || instantiated_as_persistent? extraconfig = [] key_prefix = managed ? "opennebula.mdisk" : "opennebula.disk" @@ -967,10 +967,10 @@ module VCenterDriver vcenter_disk = vcenter_disks.select{|d| d[:key] == template_disk[:key]}.first end - raise "disk with path #{unmanaged_disk_source} not found in the vCenter VM" if !vcenter_disk + raise "disk with path #{disk_source} not found in the vCenter VM" if !vcenter_disk reference = {} - reference[:key] = "#{key_prefix}.#{unmanaged_disk["DISK_ID"]}" + reference[:key] = "#{key_prefix}.#{disk["DISK_ID"]}" reference[:value] = "#{vcenter_disk[:key]}" extraconfig << reference end diff --git a/src/vmm_mad/remotes/vcenter/shutdown b/src/vmm_mad/remotes/vcenter/shutdown index 885dca3ed6..4a7d38b2b3 100755 --- a/src/vmm_mad/remotes/vcenter/shutdown +++ b/src/vmm_mad/remotes/vcenter/shutdown @@ -63,6 +63,7 @@ begin if vm_ref.empty? one_vm = VCenterDriver::VIHelper.one_item(OpenNebula::VirtualMachine, vm_id) + host = OpenNebula::Host.new_with_id(host_id, OpenNebula::Client.new()) vcenter_vm = VCenterDriver::VIHelper.find_vcenter_vm_by_name(one_vm, host, vi_client) raise "Could not find the undeployed VM in vCenter's inventory using it's name" if !vcenter_vm vm_ref = vcenter_vm._ref