From 444e729f03ca6d70f0a8de33bf2968e835cb4a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 25 Nov 2013 16:08:37 +0100
Subject: [PATCH] Bug #2471: Update log messages that refer to deprecated
 actions

---
 src/dm/DispatchManagerActions.cc       | 6 +++---
 src/rm/RequestManagerVirtualMachine.cc | 2 +-
 src/vmm/VirtualMachineManagerDriver.cc | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
index cc2131fb32..bede7a8d80 100644
--- a/src/dm/DispatchManagerActions.cc
+++ b/src/dm/DispatchManagerActions.cc
@@ -926,13 +926,13 @@ int DispatchManager::resubmit(int vid)
     {
         case VirtualMachine::POWEROFF:
             NebulaLog::log("DiM",Log::ERROR,
-                "Cannot resubmit a powered off VM. Resume it first");
+                "Cannot delete-recreate a powered off VM. Resume it first");
             rc = -2;
         break;
 
         case VirtualMachine::SUSPENDED:
             NebulaLog::log("DiM",Log::ERROR,
-                "Cannot resubmit a suspended VM. Resume it first");
+                "Cannot delete-recreate a suspended VM. Resume it first");
             rc = -2;
         break;
 
@@ -968,7 +968,7 @@ int DispatchManager::resubmit(int vid)
 
         case VirtualMachine::DONE:
             NebulaLog::log("DiM",Log::ERROR,
-                "Cannot resubmit a VM already in DONE state");
+                "Cannot delete-recreate a VM already in DONE state");
             rc = -2;
         break;
     }
diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index 9af3de0300..aa234774c9 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -1085,7 +1085,7 @@ void VirtualMachineSaveDisk::request_execute(xmlrpc_c::paramList const& paramLis
 
         failure_response(INTERNAL,
                          request_error("VM has to be RUNNING, POWEROFF or"
-                         " SUSPENDED to saveas disks.",""), att);
+                         " SUSPENDED to snapshot disks.",""), att);
         return;
     }
 
diff --git a/src/vmm/VirtualMachineManagerDriver.cc b/src/vmm/VirtualMachineManagerDriver.cc
index 357d52aca9..dab8ffb177 100644
--- a/src/vmm/VirtualMachineManagerDriver.cc
+++ b/src/vmm/VirtualMachineManagerDriver.cc
@@ -372,11 +372,11 @@ void VirtualMachineManagerDriver::protocol(const string& message) const
     {
         if (result == "SUCCESS")
         {
-            vm->log("VMM",Log::INFO,"VM successfully reset.");
+            vm->log("VMM",Log::INFO,"VM successfully rebooted-hard.");
         }
         else
         {
-            log_error(vm,os,is,"Error resetting VM, assume it's still running");
+            log_error(vm,os,is,"Error rebooting-hard VM, assume it's still running");
             vmpool->update(vm);
         }
     }
@@ -681,7 +681,7 @@ void VirtualMachineManagerDriver::process_poll(
 
         case 'd': //The VM was not found
             vm->log("VMM", Log::INFO, "VM running but it was not found."
-                    " Restart and delete actions available or try to"
+                    " Boot and delete actions available or try to"
                     " recover it manually");
 
             lcm->trigger(LifeCycleManager::MONITOR_DONE, vm->get_oid());