B #3189: Fixed container hard reboot

OpenNebula · Oct 2, 2019 · 62fbafd · 62fbafd
1 parent fd4a5db
commit 62fbafd
Showing 1 changed file with 42 additions and 43 deletions.
diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb
@@ -601,55 +601,14 @@ def poll(id, drv_message)
 
     # REBOOT action, reboots a running VM
     def reboot(id, drv_message)
-        action = VmmAction.new(self, id, :reboot, drv_message)
-
-        reboot_step = {
-            :driver => :vmm,
-                :action       => :reboot,
-                :parameters   => [:deploy_id, :host]
-        }
-
-        steps = [reboot_step]
-
-        if @hypervisor == 'lxd'
-            steps += [
-                {
-                    :driver   => :vnm,
-                    :action   => :clean
-                },
-                {
-                    :driver   => :vnm,
-                    :action   => :pre
-                },
-                reboot_step,
-                {
-                    :driver       => :vnm,
-                    :action       => :post,
-                    :parameters   => [:deploy_info],
-                    :fail_actions => [
-                        {
-                            :driver     => :vmm,
-                            :action     => :cancel,
-                            :parameters => [:deploy_info, :host]
-                        }
-                    ]
-                }
-            ]
-        end
-
-        action.run(steps)
+        restart(id, drv_message, :reboot)
     end
 
     #
     # RESET action, resets a running VM
     #
     def reset(id, drv_message)
-        data      = decode(drv_message)
-        host      = data.elements['HOST'].text
-        deploy_id = data.elements['DEPLOY_ID'].text
-
-        do_action("#{deploy_id} #{host}", id, host, ACTION[:reset],
-                  :stdin => data)
+        restart(id, drv_message, :reset)
     end
 
     #
@@ -1236,6 +1195,46 @@ def ensure_xpath(xml_data, id, action, xpath)
         nil
     end
 
+    def restart(id, drv_message, signal)
+        action = VmmAction.new(self, id, signal, drv_message)
+
+        reboot_step = {
+            :driver => :vmm,
+                :action       => signal,
+                :parameters   => [:deploy_id, :host]
+        }
+
+        steps = [reboot_step]
+
+        if @hypervisor == 'lxd'
+            steps += [
+                {
+                    :driver   => :vnm,
+                    :action   => :clean
+                },
+                {
+                    :driver   => :vnm,
+                    :action   => :pre
+                },
+                reboot_step,
+                {
+                    :driver       => :vnm,
+                    :action       => :post,
+                    :parameters   => [:deploy_info],
+                    :fail_actions => [
+                        {
+                            :driver     => :vmm,
+                            :action     => :cancel,
+                            :parameters => [:deploy_info, :host]
+                        }
+                    ]
+                }
+            ]
+        end
+
+        action.run(steps)
+    end
+
     def destroy(id, drv_message, signal)
         action = VmmAction.new(self, id, signal, drv_message)