X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fmacros.py;h=5c80c91a7ea4de10b25b48ea289040a13f428c1a;hb=510d4f034ed4bd4f8abb00cf04abcfbe53ab3ccd;hp=85a570bdb822a09f5c383c2fc4bd4d4c05462044;hpb=c3fff6c23d45a25e889a1dc8af7bd8fb1e03bd4c;p=tests.git

diff --git a/system/macros.py b/system/macros.py
index 85a570b..5c80c91 100644
--- a/system/macros.py
+++ b/system/macros.py
@@ -182,12 +182,24 @@ sequences['slice_up_down']=[
 # useful also. for bonding
 # alias nodes to node since we mostly have one node
 sequences['node'] = [ 'nodes' ]
+sequences['delete_node'] = [ 'delete_nodes' ]
 
 sequences['restart_node'] = sequences['start_node'] = """
 qemu_kill_mine nodestate_reinstall qemu_local_init bootcd qemu_local_config 
-qemu_clean_mine qemu_export qemu_start qemu_timestamp
+qemu_clean_mine qemu_export qemu_start qemu_timestamp qemu_nodefamily
 """.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()