X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=9a980f5997dd0fd7d5814676a021b0418597d04e;hb=5dbce60b765a3576751704b7d922651e18a4189d;hp=ceae7718b89cdd137d7d424501a05b1c1da35698;hpb=0a1a5d0802b341b20b4e4485be4cd2a845027a99;p=tests.git diff --git a/system/TestNode.py b/system/TestNode.py index ceae771..9a980f5 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -2,7 +2,6 @@ # Copyright (C) 2010 INRIA # import sys, os, os.path, time, base64 -import xmlrpclib import utils from TestUser import TestUser @@ -268,7 +267,7 @@ class TestNode: ### # assuming we've run testplc.fetch_keys() ### key = "keys/%(vservername)s.rsa"%locals() # fetch_keys doesn't grab the root key anymore - key = "keys/key1.rsa" + key = "keys/key_admin.rsa" return TestSsh(self.name(), buildname=self.buildname(), key=key) def check_hooks (self): @@ -299,7 +298,7 @@ class TestNode: test_ssh=self.create_test_ssh() return test_ssh.run ("rpm -q --quiet libvirt-client")==0 - def check_systemslice (self, slicename,dry_run=False): + def _check_system_slice (self, slicename,dry_run=False): sitename=self.test_plc.plc_spec['PLC_SLICE_PREFIX'] vservername="%s_%s"%(sitename,slicename) test_ssh=self.create_test_ssh()