From d4066bfa0319234f16d8aefe7c6a25944412fcbe Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 20 Nov 2019 18:56:07 +0100 Subject: [PATCH] Revert "B #3844: refactoring some functions (#3958)" This reverts commit e1a6bf51cf94cad387b4ca35127f4a4ccd2a6cff Keeping changes to reboot and reset, unrelated to changes reverted in virtual_machine.rb --- .../lib/vcenter_driver/virtual_machine.rb | 32 ------------------- 1 file changed, 32 deletions(-) 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 1a641b9da1..dfb40471b5 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -930,34 +930,6 @@ module VCenterDriver {} end - def reference_disks_all(template_ref = nil, execute = true) - extraconfig = [] - spec = {} - - # Get unmanaged disks in OpenNebula's VM template - xpath = "TEMPLATE/DISK[OPENNEBULA_MANAGED=\"NO\" or OPENNEBULA_MANAGED=\"no\"]" - unmanaged_disks = one_item.retrieve_xmlelements(xpath) - - managed = false - extraconfig + reference_disks(template_ref, unmanaged_disks, managed) - - # Get managed disks in OpenNebula's VM template - xpath = "TEMPLATE/DISK[OPENNEBULA_MANAGED=\"YES\" or OPENNEBULA_MANAGED=\"yes\"]" - managed_disks = one_item.retrieve_xmlelements(xpath) - - managed = true - extraconfig + reference_disks(template_ref, managed_disks, managed) - - # Save in extraconfig the key for unmanaged disks - unless extraconfig.empty? - spec[:extraConfig] = extraconfig unless extraconfig.empty? - - return spec unless execute - - @item.ReconfigVM_Task(:spec => spec).wait_for_completion - end - end - # Build extraconfig section to reference disks # by key and avoid problems with changing paths # (mainly due to snapshots) @@ -2270,7 +2242,6 @@ module VCenterDriver def shutdown if !is_powered_off? - reference_disks_all begin if vm_tools? @item.ShutdownGuest @@ -2295,7 +2266,6 @@ module VCenterDriver end def reset - reference_disks_all @item.ResetVM_Task.wait_for_completion end @@ -2304,12 +2274,10 @@ module VCenterDriver end def reboot - reference_disks_all @item.RebootGuest end def poweron(set_running = false) - reference_disks_all begin @item.PowerOnVM_Task.wait_for_completion rescue RbVmomi::Fault => e