From 762a0fa9e1b4316e87d3cc0d8ff5d0cfaf297b0b Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 25 Mar 2019 16:24:34 +0100 Subject: [PATCH] B #3125: Add wait_for_completion To vCenter async Tasks that were missing it. --- src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb | 4 ++-- src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb index 21aff209bb..17f734b06e 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb @@ -804,13 +804,13 @@ class Datacenter case nr[:action] when :update_dpg begin - nr[:dpg].ReconfigureDVPortgroup_Task(:spec => nr[:spec]) + nr[:dpg].ReconfigureDVPortgroup_Task(:spec => nr[:spec]).wait_for_completion rescue Exception => e raise "A rollback operation for distributed port group #{nr[:name]} could not be performed. Reason: #{e.message}" end when :update_dvs begin - nr[:dvs].ReconfigureDvs_Task(:spec => nr[:spec]) + nr[:dvs].ReconfigureDvs_Task(:spec => nr[:spec]).wait_for_completion rescue Exception => e raise "A rollback operation for distributed standard switch #{nr[:name]} could not be performed. Reason: #{e.message}" end diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb b/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb index bf33fded7b..32e1647cf2 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb @@ -371,7 +371,7 @@ class Datastore < Storage end else copy_params[:destinationName] = "[#{target_ds_name}] #{target_path}" - get_fm.CopyDatastoreFile_Task(copy_params) + get_fm.CopyDatastoreFile_Task(copy_params).wait_for_completion end target_path