X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=686a38d3970382d64e01e9c4bdfb5eb6b02f4d72;hb=7fbe1127baeeb1b5b5f8d790dd8b439d3abf5248;hp=f3f5d21668d6aa8cb9e82da70a707acbccf8a8df;hpb=3dfbfb8e94682f8e7b453bb959d38421cc92928b;p=tests.git

diff --git a/system/TestNode.py b/system/TestNode.py
index f3f5d21..686a38d 100644
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -182,9 +182,9 @@ class TestNode:
             print("Dry_run: skipped writing of iso image")
             return True
         else:
-            # with python3 we need to call decodestring here
+            # with python3 we need to call decodebytes here
             with open(filename,'wb') as storage:
-                storage.write(base64.decodestring(bencoded))
+                storage.write(base64.decodebytes(bencoded))
             return True
 
     def nodestate_reinstall(self):
@@ -221,21 +221,23 @@ class TestNode:
         return True
     
     def nodedistro_f14(self):
-        return self.nodedistro_set('f14')
+        return self.nodedistro_set('f14', 'onelab')
     def nodedistro_f18(self):
-        return self.nodedistro_set('f18')
+        return self.nodedistro_set('f18', 'lxc')
     def nodedistro_f20(self):
-        return self.nodedistro_set('f20')
+        return self.nodedistro_set('f20', 'lxc')
     def nodedistro_f21(self):
-        return self.nodedistro_set('f21')
+        return self.nodedistro_set('f21', 'lxc')
     def nodedistro_f22(self):
-        return self.nodedistro_set('f22')
-    def nodedistro_set(self, distro):
+        return self.nodedistro_set('f22', 'lxc')
+    def nodedistro_set(self, fcdistro, pldistro):
         "set the fcdistro tag to distro, passed in arg"
         self.test_plc.apiserver.SetNodeFcdistro(self.test_plc.auth_root(),
-                                                self.name(), distro)
+                                                self.name(), fcdistro)
+        self.test_plc.apiserver.SetNodePldistro(self.test_plc.auth_root(),
+                                                self.name(), pldistro)
         return True
-    def nodeflavour_show(self):
+    def nodedistro_show(self):
         "display the fcdistro tag - or flavour actually - of node"
         if self.dry_run():
             print("Dry_run: would fetch node flavour")
@@ -245,25 +247,6 @@ class TestNode:
         print("Flavour for {} : {}".format(self.name(), flavour))
         return True
 
-    def nodeplain_set(self, plain):
-        " set bootstrapfs-plain tag on nodes"
-        self.test_plc.apiserver.SetNodePlainBootstrapfs(self.test_plc.auth_root(),
-                                                        self.name(), plain)
-        return True
-    def nodeplain_on(self):
-        return self.nodeplain_set("True")
-    def nodeplain_off(self):
-        return self.nodeplain_set("")
-    def nodeplain_show(self):
-        "display bootstrapfs-plain tag"
-        if self.dry_run():
-            print("Dry_run: would fetch node plain-bootstrapfs tag")
-            return True
-        plain = self.test_plc.apiserver.GetNodePlainBootstrapfs(self.test_plc.auth_root(),
-                                                                  self.name())
-        print("Plain bootstrapfs for {} is {}".format(self.name(), plain))
-        return True
-
     def qemu_local_config(self):
         "all nodes: compute qemu config qemu.conf and store it locally"
         if not self.is_qemu():
@@ -305,6 +288,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']
@@ -420,7 +410,7 @@ class TestNode:
         test_ssh = self.create_test_ssh()
         if self.has_libvirt():
             utils.header("Checking system slice {} using virsh".format(slicename))
-            return test_ssh.run("virsh --connect lxc:// list | grep -q ' {} '".format(vservername),
+            return test_ssh.run("virsh --connect lxc:/// list | grep -q ' {} '".format(vservername),
                                 dry_run = dry_run) == 0
         else:
             retcod, output = \