new target qemu-cleanlog so that log.txt can contain only the last boot

diff --git a/system/TestNode.py b/system/TestNode.py
index 8f8954c..ab614ef 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -307,6 +307,13 @@ class TestNode:
                      .format(self.name(), self.host_box()))
         return self.test_box().copy(self.nodedir(), recursive=True, dry_run=dry_run) == 0
             
+    def qemu_cleanlog(self):
+        "rename log.txt into log.txt.bak in the qemu dir"
+        test_box = self.test_box()
+        test_box.run_in_buildname("cd {}; mv -f log.txt log.txt.bak".
+                                  format(self.nodedir()), dry_run=self.dry_run())
+        return True
+
     def qemu_start(self):
         "all nodes: start the qemu instance (also runs qemu-bridge-init start)"
         model = self.node_spec['node_fields']['model']

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 65d05de..9c2165a 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -162,7 +162,8 @@ class TestPlc:
         'check_vsys_defaults_ignore', SEP,
 # run this first off so it's easier to re-run on another qemu box        
         'qemu_kill_mine', 'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP,
-        'qemu_clean_mine', 'qemu_export', 'qemu_start', 'qemu_timestamp', 'qemu_nodefamily', SEP,
+        'qemu_clean_mine', 'qemu_export', 'qemu_cleanlog', SEP,
+        'qemu_start', 'qemu_timestamp', 'qemu_nodefamily', SEP,
         'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA,
         'sfi_configure@1', 'sfa_register_site@1','sfa_register_pi@1', SEPSFA,
         'sfa_register_user@1', 'sfa_update_user@1', 'sfa_register_slice@1', 'sfa_renew_slice@1', SEPSFA,
@@ -1195,6 +1196,8 @@ class TestPlc:
     @node_mapper
     def qemu_export(self): pass
     @node_mapper
+    def qemu_cleanlog(self): pass
+    @node_mapper
     def nodestate_reinstall(self): pass
     @node_mapper
     def nodestate_upgrade(self): pass

diff --git a/system/macros.py b/system/macros.py
index 04a0af6..ae0c0f0 100644 (file)
--- a/system/macros.py
+++ b/system/macros.py
@@ -189,7 +189,7 @@ 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()
+sequences['reset_node'] = "qemu-cleanlog qemu-kill-mine qemu-start".split()
 
 sequences['bonding_node'] = 'node start-node'.split()