X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fmacros.py;h=5c80c91a7ea4de10b25b48ea289040a13f428c1a;hb=bdb8fb36df8b66c237bbccf96692517c81c0856d;hp=04a0af68d9eb5eb0a9b53b17a4ca58ea5b7ff5a8;hpb=3dfbfb8e94682f8e7b453bb959d38421cc92928b;p=tests.git

diff --git a/system/macros.py b/system/macros.py
index 04a0af6..5c80c91 100644
--- a/system/macros.py
+++ b/system/macros.py
@@ -189,8 +189,17 @@ qemu_kill_mine nodestate_reinstall qemu_local_init bootcd qemu_local_config
 qemu_clean_mine qemu_export qemu_start qemu_timestamp qemu_nodefamily
 """.split()
 
-sequences['reset_node'] = "qemu-kill-mine qemu-start".split()
-
+# turn node off and back on 
+sequences['reset_node'] = "qemu-cleanlog qemu-kill-mine qemu-start".split()
+# wait for the node to come back up all the way to boot mode
+sequences['wait_node'] = 'ping_node ssh_node_debug ssh_node_boot'.split()
+# set boot_state, reset and wait for the right state
+sequences['debug_mode'] = "nodestate-safeboot reset-node ssh-node-debug".split()
+sequences['boot_mode'] = "nodestate-boot reset-node wait-node".split()
+sequences['reinstall'] = "nodestate-reinstall reset-node wait-node".split()
+sequences['upgrade'] = "nodestate-upgrade reset-node wait-node".split()
+sequences['reboot'] = "nodestate-boot reset-node wait-node".split()
+
+# maybe not too clear..
 sequences['bonding_node'] = 'node start-node'.split()
 
-sequences['wait_node'] = 'ping_node ssh_node_debug ssh_node_boot'.split()