X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fmacros.py;h=680b022547e70d97ced29ee16719a3da58aac784;hb=9b733a4719b75382285799e42b245108f986aaa1;hp=ff7b492a5e919c95d26a0d5deb8fb989ac1dd37f;hpb=5d45fc9b92d7ea2645986c91ef7d068a6ee55729;p=tests.git

diff --git a/system/macros.py b/system/macros.py
index ff7b492..680b022 100644
--- a/system/macros.py
+++ b/system/macros.py
@@ -18,6 +18,12 @@ sequences['sfa_restart'] = [
     'sfi_configure',
     ]
 
+sequences ['sfa_create_slice'] = [
+    'sfa_rspec',
+    'sfa_allocate',
+    'sfa_provision',
+]
+
 "re-run a complete sfa cycle from a nightly test"
 sequences['sfa_populate'] = [ 
     'sfa_register_site',
@@ -39,7 +45,7 @@ sequences['sfa_populate'] = [
     'sfa_utest', 
     ]
 
-sequences['sfa-delete'] = [
+sequences['sfa_delete'] = [
     'sfa_delete_slice', 
     'sfa_delete_user',
 ]
@@ -72,8 +78,8 @@ sequences['sfa_user_slice'] = [
 ]
 
 sequences['sfa_provision'] = [ 
-    'sfa-discover',
-    'sfa-create_slice',
+    'sfa_discover',
+    'sfa_create_slice',
     'sfa_check_slice_plc',
     'sfi_view_all',
 ]
@@ -140,11 +146,11 @@ sequences['sfa_standalone'] = [
 # run qemu-again2
 
 sequences['qemu_again1'] = [
-    'qemu-kill-mine',
+    'qemu_kill_mine',
 ]
 
 sequences['qemu_again2']=[
-    'qemu-clean-mine',
+    'qemu_clean_mine',
     'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', 
     'qemu_clean_mine', 'qemu_export', 'qemu_start', 'qemu_timestamp', 
     'ping_node', 'ssh_node_debug',
@@ -153,9 +159,47 @@ sequences['qemu_again2']=[
 
 # same but only up to ping 
 sequences['qemu_again2_ping']=[
-    'qemu-clean-mine',
+    'qemu_clean_mine',
     'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', 
     'qemu_clean_mine', 'qemu_export', 'qemu_start', 'qemu_timestamp', 
     'ping_node',
 ]
     
+sequences['slice_up']=[
+    'fill_slices',
+    'ssh_slice',
+]
+sequences['slice_down']=[
+    'empty_slices',
+    'ssh_slice_off',
+]
+sequences['slice_up_down']=[
+    'slice_up',
+    'slice_down',
+]
+    
+## dealing with nodes
+# 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_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()
+
+
+# maybe not too clear..
+sequences['bonding_node'] = 'node start-node'.split()
+