B #3134 Fix check poweroff status (#3262)

OpenNebula · Apr 25, 2019 · fb11877 · fb11877
1 parent 2aa4710
commit fb11877
Showing 1 changed file with 11 additions and 9 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
@@ -2526,17 +2526,19 @@ def migrate(config = {})
     ############################################################################
 
     def shutdown
-        begin
-            if vm_tools?
-                @item.ShutdownGuest
-            else
-                poweroff_hard
+        if !is_powered_off?
+            begin
+                if vm_tools?
+                    @item.ShutdownGuest
+                else
+                    poweroff_hard
+                end
+            rescue RbVmomi::Fault => e
+                error = e.message.split(':').first
+                raise e.message if error != 'InvalidPowerState'
             end
-        rescue RbVmomi::Fault => e
-            error = e.message.split(':').first
-            raise e.message if error != 'InvalidPowerState'
+            wait_timeout(:is_powered_off?)
         end
-        wait_timeout(:is_powered_off?)
     end
 
     def destroy