X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=686a38d3970382d64e01e9c4bdfb5eb6b02f4d72;hb=7fbe1127baeeb1b5b5f8d790dd8b439d3abf5248;hp=d3ac3ed1e5f1d1b500937471d7d3ca227d83b4ce;hpb=d9a55ada6d0eeb7732863fc50a7564294d57ac70;p=tests.git diff --git a/system/TestNode.py b/system/TestNode.py index d3ac3ed..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): @@ -237,7 +237,7 @@ class TestNode: 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") @@ -410,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 = \