Author: dimach
Date: Mon Sep 9 16:56:29 2013
New Revision: 1521187
URL: http://svn.apache.org/r1521187
Log:
VCL-722: fix for sub power_off()
Modified:
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/one.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/one.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/one.pm?rev=1521187&r1=1521186&r2=1521187&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/one.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/one.pm Mon Sep 9
16:56:29 2013
@@ -625,10 +625,12 @@ sub power_off {
my $action = shift;
my $computer_name = $self->data->get_computer_hostname();
my $vmid = $self->one_get_object_id("computer",$computer_name);
- my @poweroff = $one{'server'}->call('one.vm.action',
$one{'auth'},'shutdown',$vmid);
+ my @poweroff;
if (defined($action) and $action eq 'hard') {
@poweroff = $one{'server'}->call('one.vm.action',
$one{'auth'},'shutdown-hard',$vmid);
+ } else {
+ @poweroff = $one{'server'}->call('one.vm.action',
$one{'auth'},'shutdown',$vmid);
}
if ( $poweroff[0][0]->value() ) {
