From 4fcabf8f4241b3e7e70e77edad3d9fc04a5d807a Mon Sep 17 00:00:00 2001
From: Daniel Clavijo Coca <dclavijo@opennebula.systems>
Date: Thu, 2 Sep 2021 10:45:07 -0500
Subject: [PATCH] B OpenNebula/one#5521: Fix lxd reboot arguments (#1424)

(cherry picked from commit 9efe7cdd2ce507197528d851d66634bcca996a83)
---
 src/vmm_mad/exec/one_vmm_exec.rb | 4 ++--
 src/vnm_mad/remotes/lib/nic.rb   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb
index 3de233bb4c..90317f6c30 100755
--- a/src/vmm_mad/exec/one_vmm_exec.rb
+++ b/src/vmm_mad/exec/one_vmm_exec.rb
@@ -1240,12 +1240,12 @@ class ExecDriver < VirtualMachineDriver
                 {
                     :driver       => :vnm,
                     :action       => :post,
-                    :parameters   => [:deploy_info],
+                    :parameters   => [:deploy_id],
                     :fail_actions => [
                         {
                             :driver     => :vmm,
                             :action     => :cancel,
-                            :parameters => [:deploy_info, :host]
+                            :parameters => [:deploy_id, :host]
                         }
                     ]
                 }
diff --git a/src/vnm_mad/remotes/lib/nic.rb b/src/vnm_mad/remotes/lib/nic.rb
index d651883c71..93665e9a5d 100644
--- a/src/vnm_mad/remotes/lib/nic.rb
+++ b/src/vnm_mad/remotes/lib/nic.rb
@@ -118,10 +118,12 @@ module VNMMAD
                     deploy_id = vm['DEPLOY_ID']
                 end
 
-                return if !deploy_id || !vm.vm_info[:dumpxml].nil?
+                return if !deploy_id || !vm.vm_info[:dumpxml].nil? || deploy_id.empty?
 
                 cmd = "#{@lxc_cmd} config show #{deploy_id}"
-                config, _e, _s = Open3.capture3(cmd)
+                config, _e, s = Open3.capture3(cmd)
+
+                return unless s.exitstatus.zero?
 
                 vm.vm_info[:dumpxml] = YAML.safe_load(config)