decodebytes, not decodestring
[tests.git] / system / TestNode.py
index b236643..686a38d 100644 (file)
@@ -97,11 +97,8 @@ class TestNode:
         node_id = server.AddNode(userauth,
                                  self.test_site.site_spec['site_fields']['login_base'],
                                  self.node_spec['node_fields'])
-        server.SetNodePlainBootstrapfs(userauth,
-                                       self.node_spec['node_fields']['hostname'],
-                                       'YES')
         # create as reinstall to avoid user confirmation
-        server.UpdateNode(userauth, self.name(), {'boot_state':'reinstall'})
+        server.UpdateNode(userauth, self.name(), { 'boot_state' : 'reinstall' })
 
         # you are supposed to make sure the tags exist
         for tagname, tagvalue in self.node_spec['tags'].items():
@@ -110,7 +107,7 @@ class TestNode:
         if not self.test_plc.has_addresses_api():
 #            print 'USING OLD INTERFACE'
             # populate network interfaces - primary
-            server.AddInterface(userauth,self.name(),
+            server.AddInterface(userauth, self.name(),
                                 self.node_spec['interface_fields'])
         else:
 #            print 'USING NEW INTERFACE with separate ip addresses'
@@ -125,31 +122,32 @@ class TestNode:
         # populate network interfaces - others
         if 'extra_interfaces' in self.node_spec:
             for interface in self.node_spec['extra_interfaces']:
-                server.AddInterface(userauth,self.name(), interface['interface_fields'])
+                server.AddInterface(userauth, self.name(), interface['interface_fields'])
                 if 'settings' in interface:
                     for attribute, value in interface['settings'].items():
                         # locate node network
-                        interface = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0]
+                        interface = server.GetInterfaces( userauth,
+                                                          {'ip' : interface['interface_fields']['ip']})[0]
                         interface_id = interface['interface_id']
                         # locate or create node network attribute type
                         try:
-                            interface_tagtype = server.GetTagTypes(userauth,{'name':attribute})[0]
+                            interface_tagtype = server.GetTagTypes(userauth, {'name' : attribute})[0]
                         except:
-                            interface_tagtype = server.AddTagType(rootauth,{'category':'test',
-                                                                            'tagname':attribute})
+                            interface_tagtype = server.AddTagType(rootauth,{'category' : 'test',
+                                                                            'tagname' : attribute})
                         # attach value
-                        server.AddInterfaceTag(userauth,interface_id,attribute,value)
+                        server.AddInterfaceTag(userauth, interface_id, attribute, value)
 
     def delete_node(self):
         # uses the right auth as far as poss.
         try:
             ownername = self.node_spec['owner']
             user_spec = self.test_site.locate_user(ownername)
-            test_user = TestUser(self.test_plc,self.test_site,user_spec)
+            test_user = TestUser(self.test_plc, self.test_site, user_spec)
             auth = test_user.auth()
         except:
             auth = self.test_plc.auth_root()
-        self.test_plc.apiserver.DeleteNode(auth,self.name())
+        self.test_plc.apiserver.DeleteNode(auth, self.name())
 
     # Do most of the stuff locally - will be pushed on host_box - *not* the plc - later if needed
     def qemu_local_init(self):
@@ -184,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):
@@ -195,6 +193,12 @@ class TestNode:
                                            self.name(),{'boot_state':'reinstall'})
         return True
     
+    def nodestate_upgrade(self):
+        "all nodes: mark PLCAPI boot_state as upgrade"
+        self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(),
+                                           self.name(),{'boot_state':'upgrade'})
+        return True
+    
     def nodestate_safeboot(self):
         "all nodes: mark PLCAPI boot_state as safeboot"
         self.test_plc.apiserver.UpdateNode(self.test_plc.auth_root(),
@@ -213,9 +217,36 @@ class TestNode:
             print("Dry_run: skipped getting current node state")
             return True
         state = self.test_plc.apiserver.GetNodes(self.test_plc.auth_root(), self.name(), ['boot_state'])[0]['boot_state']
-        print(self.name(),':',state)
+        print("boot_state for {} : {}".format(self.name(), state))
         return True
     
+    def nodedistro_f14(self):
+        return self.nodedistro_set('f14', 'onelab')
+    def nodedistro_f18(self):
+        return self.nodedistro_set('f18', 'lxc')
+    def nodedistro_f20(self):
+        return self.nodedistro_set('f20', 'lxc')
+    def nodedistro_f21(self):
+        return self.nodedistro_set('f21', 'lxc')
+    def nodedistro_f22(self):
+        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(), fcdistro)
+        self.test_plc.apiserver.SetNodePldistro(self.test_plc.auth_root(),
+                                                self.name(), pldistro)
+        return True
+    def nodedistro_show(self):
+        "display the fcdistro tag - or flavour actually - of node"
+        if self.dry_run():
+            print("Dry_run: would fetch node flavour")
+            return True
+        flavour = self.test_plc.apiserver.GetNodeFlavour(self.test_plc.auth_root(),
+                                                         self.name())
+        print("Flavour for {} : {}".format(self.name(), flavour))
+        return True
+
     def qemu_local_config(self):
         "all nodes: compute qemu config qemu.conf and store it locally"
         if not self.is_qemu():
@@ -257,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']
@@ -276,6 +314,18 @@ class TestNode:
         return test_box.run_in_buildname("echo {:d} > {}/timestamp"\
                                          .format(now, self.nodedir()), dry_run=self.dry_run()) == 0
 
+    def qemu_nodefamily(self):
+        "write nodefamily stamp in qemu working dir"
+        auth = self.test_plc.auth_root()
+        hostname = self.node_spec['node_fields']['hostname']
+        nodeflavour = self.test_plc.apiserver.GetNodeFlavour(auth, hostname)
+        if self.dry_run():
+            return True
+        nodedir = self.nodedir()
+        nodefamily = nodeflavour['nodefamily']
+        self.test_box().run_in_buildname("echo {nodefamily} > {nodedir}/nodefamily".format(**locals()))
+        return True
+
     def start_qemu(self):
         test_box = self.test_box()
         utils.header("Starting qemu node {} on {}".format(self.name(), test_box.hostname()))
@@ -360,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 = \