From 179bf23d9bdace13bf12bfd55e85d285c3de21e9 Mon Sep 17 00:00:00 2001
From: mcabrerizo <mcabrerizo@opennebula.org>
Date: Tue, 18 Apr 2017 10:21:58 +0200
Subject: [PATCH] F #4913: Pass tm action error message to the driver (ERROR
 attr) so you don't have to look for it in the log

---
 src/tm_mad/vcenter/clone   |  7 ++++---
 src/tm_mad/vcenter/cpds    |  5 +++--
 src/tm_mad/vcenter/delete  | 10 ++++++----
 src/tm_mad/vcenter/mkimage |  5 +++--
 src/tm_mad/vcenter/mvds    |  5 +++--
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/tm_mad/vcenter/clone b/src/tm_mad/vcenter/clone
index e0e7eb74ba..c081844242 100755
--- a/src/tm_mad/vcenter/clone
+++ b/src/tm_mad/vcenter/clone
@@ -115,9 +115,10 @@ begin
     end
 
 rescue Exception => e
-    STDERR.puts "Error clone virtual disk #{src_path} in "\
-                "datastore #{target_ds_name_vc}. "\
-                "Reason: #{e.message}\n#{e.backtrace}"
+    message = "Error clone virtual disk #{src_path} in "\
+              "datastore #{target_ds_name_vc}. "\
+              "Reason: #{e.message}\n#{e.backtrace}"
+    STDERR.puts error_message(message)
     exit -1
 ensure
     vi_client.close_connection if vi_client
diff --git a/src/tm_mad/vcenter/cpds b/src/tm_mad/vcenter/cpds
index c9254cefd7..4fe55697db 100755
--- a/src/tm_mad/vcenter/cpds
+++ b/src/tm_mad/vcenter/cpds
@@ -101,8 +101,9 @@ begin
     source_ds_vc.copy_virtual_disk(src_path, target_ds_vc, target_path)
 
 rescue Exception => e
-    STDERR.puts "Error copying img #{src_path} to #{target_ds_name_vc} "\
-                "Reason: #{e.message}\n#{e.backtrace}"
+    message = "Error copying img #{src_path} to #{target_ds_name_vc} "\
+              "Reason: #{e.message}\n#{e.backtrace}"
+    STDERR.puts error_message(message)
     exit -1
 ensure
     vi_client.close_connection if vi_client
diff --git a/src/tm_mad/vcenter/delete b/src/tm_mad/vcenter/delete
index 7408d5f8e6..40b4128edf 100755
--- a/src/tm_mad/vcenter/delete
+++ b/src/tm_mad/vcenter/delete
@@ -115,8 +115,9 @@ if path.match(/disk\.\d+$/)
         end
 
     rescue Exception => e
-        STDERR.puts "Error delete virtual disk #{img_path} in datastore #{dsid}."\
-                    " Reason: #{e.message}\n#{e.backtrace}"
+        message = "Error delete virtual disk #{img_path} in datastore #{dsid}."\
+                  " Reason: #{e.message}\n#{e.backtrace}"
+        STDERR.puts error_message(message)
         exit -1
     ensure
         vi_client.close_connection if vi_client
@@ -253,8 +254,9 @@ else
         # Destroy the VM unless the instantiate as persistent is used
         vm.destroy if !vm.instantiated_as_persistent?
     rescue Exception => e
-        STDERR.puts "Error unregistering vm #{vmid} (#{vm_ref})."\
-                    " Reason: #{e.message}\n#{e.backtrace}"
+        message = "Error unregistering vm #{vmid} (#{vm_ref})."\
+                  " Reason: #{e.message}\n#{e.backtrace}"
+        STDERR.puts error_message(message)
         exit -1
     ensure
         vi_client.close_connection if vi_client
diff --git a/src/tm_mad/vcenter/mkimage b/src/tm_mad/vcenter/mkimage
index 8107501b7f..7bfe5fefd6 100755
--- a/src/tm_mad/vcenter/mkimage
+++ b/src/tm_mad/vcenter/mkimage
@@ -86,8 +86,9 @@ begin
     end
 
 rescue Exception => e
-    STDERR.puts "Error creating virtual disk in #{ds_vc['name']}."\
-                " Reason: #{e.message}\n#{e.backtrace}"
+    message = "Error creating virtual disk in #{ds_vc['name']}."\
+              " Reason: #{e.message}\n#{e.backtrace}"
+    STDERR.puts error_message(message)
     exit -1
 ensure
     vi_client.close_connection if vi_client
diff --git a/src/tm_mad/vcenter/mvds b/src/tm_mad/vcenter/mvds
index aa7a12fd08..23281c69ec 100755
--- a/src/tm_mad/vcenter/mvds
+++ b/src/tm_mad/vcenter/mvds
@@ -69,8 +69,9 @@ begin
     vm.detach_disk(disk) if !vm.has_snapshots? && !vm.instantiated_as_persistent?
 
 rescue Exception => e
-    STDERR.puts "Error detaching virtual disk #{disk_id} from vm #{vmid}."\
-                " Reason: #{e.message}\n#{e.backtrace}"
+    message = "Error detaching virtual disk #{disk_id} from vm #{vmid}."\
+              " Reason: #{e.message}\n#{e.backtrace}"
+    STDERR.puts error_message(message)
     exit -1
 ensure
     vi_client.close_connection if vi_client