From e0f6f13e9ecf84ec143b0e956a56f34e6ad446ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Thu, 7 Feb 2013 17:15:46 +0100
Subject: [PATCH] Feature #1483: Minor fixes

---
 src/cli/one_helper/onevm_helper.rb          | 2 +-
 src/scheduler/include/VirtualMachineXML.h   | 2 +-
 src/scheduler/src/pool/VirtualMachineXML.cc | 4 ++--
 src/scheduler/src/sched/Scheduler.cc        | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index 5ad3cd9481..507a9fca03 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -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
diff --git a/src/scheduler/include/VirtualMachineXML.h b/src/scheduler/include/VirtualMachineXML.h
index 75fa29950a..29e714e085 100644
--- a/src/scheduler/include/VirtualMachineXML.h
+++ b/src/scheduler/include/VirtualMachineXML.h
@@ -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
      */
diff --git a/src/scheduler/src/pool/VirtualMachineXML.cc b/src/scheduler/src/pool/VirtualMachineXML.cc
index 142d4b9020..08c45314b0 100644
--- a/src/scheduler/src/pool/VirtualMachineXML.cc
+++ b/src/scheduler/src/pool/VirtualMachineXML.cc
@@ -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")
diff --git a/src/scheduler/src/sched/Scheduler.cc b/src/scheduler/src/sched/Scheduler.cc
index 2d2133b355..7fed182466 100644
--- a/src/scheduler/src/sched/Scheduler.cc
+++ b/src/scheduler/src/sched/Scheduler.cc
@@ -661,6 +661,8 @@ int Scheduler::do_scheduled_actions()
 
             if (vatt == 0)
             {
+                delete *it;
+
                 continue;
             }