shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Feature #1483: Minor fixes

Browse Source
This commit is contained in:
Carlos Martín 2013-02-07 17:15:46 +01:00
parent 2391713df0
commit e0f6f13e9e
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/one_helper/onevm_helper.rb
View File

@ -261,7 +261,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
column :"MESSAGE", "", :left, :donottruncate, :size=>43 do |d|
d["MESSAGE"] if !d.nil?
end
end.show(vm.to_hash['VM']['USER_TEMPLATE']['SCHED_ACTION'], {})
end.show([vm.to_hash['VM']['USER_TEMPLATE']['SCHED_ACTION']].flatten, {})
puts
end

2
src/scheduler/include/VirtualMachineXML.h
View File

@ -125,7 +125,7 @@ public:
}
/**
* Returns the scheduled actions of the VM
* Removes (but does not delete) the scheduled actions of the VM
*
* @param attributes to hold the VM actions
*/

4
src/scheduler/src/pool/VirtualMachineXML.cc
View File

@ -268,7 +268,7 @@ void VirtualMachineXML::log(const string &st)
}
ostringstream oss;
oss << one_util::log_time(time(0)) << " : " << st;
oss << one_util::log_time() << " : " << st;
vm_template->replace("SCHED_MESSAGE", oss.str());
}
@ -278,7 +278,7 @@ void VirtualMachineXML::log(const string &st)
int VirtualMachineXML::parse_action_name(string& action_st)
{
one_util::tolower(action_st);
one_util::tolower(action_st);
// onevm delete command uses the xml-rpc finalize action
if (action_st == "delete")

2
src/scheduler/src/sched/Scheduler.cc
View File

@ -661,6 +661,8 @@ int Scheduler::do_scheduled_actions()
if (vatt == 0)
{
delete *it;
continue;
}