From 62f3ae32728a0f4fabcd7328a821519589ed2daf Mon Sep 17 00:00:00 2001
From: Tino Vazquez <cvazquez@opennebula.io>
Date: Fri, 10 Sep 2021 13:56:02 +0200
Subject: [PATCH] F #5422: Improve error handling in onevcenter

for better FireEdge integration
---
 src/cli/onevcenter                             | 18 +++++++++++++-----
 .../lib/vcenter_driver/vcenter_importer.rb     |  4 +++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/cli/onevcenter b/src/cli/onevcenter
index 1e53899384..f49c01bf3d 100755
--- a/src/cli/onevcenter
+++ b/src/cli/onevcenter
@@ -178,7 +178,8 @@ CommandParser::CmdParser.new(ARGV) do
 
             helper.list_object(options, list)
         rescue StandardError => e
-            puts e.message
+            STDERR.puts e.message
+            exit 1
         end
 
         exit 0
@@ -209,7 +210,8 @@ CommandParser::CmdParser.new(ARGV) do
 
             helper.list_object(options, list)
         rescue StandardError => e
-            puts e.message
+            STDERR.puts e.message
+            exit 1
         end
 
         exit 0
@@ -256,7 +258,8 @@ CommandParser::CmdParser.new(ARGV) do
 
             importer.stdout
         rescue StandardError => e
-            puts e.message
+            STDERR.puts e.message
+            exit 1
         end
 
         exit 0
@@ -283,7 +286,8 @@ CommandParser::CmdParser.new(ARGV) do
 
             importer.stdout
         rescue StandardError => e
-            puts e.message
+            STDERR.puts e.message
+            exit 1
         end
 
         exit 0
@@ -305,7 +309,11 @@ CommandParser::CmdParser.new(ARGV) do
             :options => [VCENTER, USER, PASS, USE_DEFAULTS, PORT] do
         con_ops = helper.connection_options('Hosts', options)
 
-        VCenterDriver::VcImporter.import_clusters(con_ops, options)
+        begin
+            VCenterDriver::VcImporter.import_clusters(con_ops, options)
+        rescue StandardError => e
+            exit 1
+        end
 
         exit 0
     end
diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb
index d128a57f0a..fae0f1d874 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb
@@ -369,9 +369,11 @@ module VCenterDriver
                 error_msg = "\nError: #{e.message}\n"
                 error_msg << "#{e.backtrace}\n" \
                               if VCenterDriver::CONFIG[:debug_information]
-                STDOUT.puts error_msg
+                STDERR.puts error_msg
+                raise_error = true
             ensure
                 vi_client.close_connection if vi_client
+                raise if raise_error
             end
         end