diff --git a/src/cli/onevm b/src/cli/onevm index 4b3ea234f6..6af60e4941 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -327,12 +327,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do EOT command :poweroff, poweroff_desc, [:range,:vmid_list], - :options => [OneVMHelper::SCHEDULE] do + :options => [OneVMHelper::SCHEDULE, OneVMHelper::HARD] do + + command_name='poweroff' + command_name<<'-hard' if options[:hard] + if (!options[:schedule].nil?) helper.schedule_actions(args[0], options, @comm_name) else helper.perform_actions(args[0],options,"shutting down") do |vm| - vm.poweroff + vm.poweroff(options[:hard]==true) end end end diff --git a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java index 6d6021ef58..aeca891f7e 100644 --- a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java +++ b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java @@ -838,7 +838,20 @@ public class VirtualMachine extends PoolElement{ */ public OneResponse poweroff() { - return action("poweroff"); + return poweroff(false); + } + + /** + * Powers off a running VM. + * @param hard True to perform a hard (no acpi) shutdown, false for a + * graceful shutdown + * @return If an error occurs the error message contains the reason. + */ + public OneResponse poweroff(boolean hard) + { + String actionSt = hard ? "poweroff-hard" : "poweroff"; + + return action(actionSt); } /** diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb index 2c16ecbca9..9185afc389 100644 --- a/src/oca/ruby/opennebula/virtual_machine.rb +++ b/src/oca/ruby/opennebula/virtual_machine.rb @@ -211,8 +211,8 @@ module OpenNebula end # Powers off a running VM - def poweroff - action('poweroff') + def poweroff(hard=false) + action(hard ? 'poweroff-hard' : 'poweroff') end # Reboots an already deployed VM