from TestSlice import TestSlice
from TestSliver import TestSliver
from TestBox import TestBox
+from TestSsh import TestSsh
# step methods must take (self, options) and return a boolean
def __init__ (self,plc_spec):
self.plc_spec=plc_spec
self.path=os.path.dirname(sys.argv[0])
+ self.test_ssh=TestSsh(self.plc_spec['hostname'],self.path)
try:
self.vserverip=plc_spec['vserverip']
self.vservername=plc_spec['vservername']
except:
self.vserver=False
self.url="https://%s:443/PLCAPI/"%plc_spec['hostname']
- utils.header('Using API url %s'%self.url)
+# utils.header('Using API url %s'%self.url)
self.server=xmlrpclib.Server(self.url,allow_none=True)
def name(self):
return self.plc_spec['hostname']
def is_local (self):
- return utils.is_local(self.hostname())
+ return self.test_ssh.is_local()
# define the API methods on this object through xmlrpc
# would help, but not strictly necessary
def connect (self):
pass
-
- # command gets run in the chroot/vserver
- def host_to_guest(self,command):
- if self.vserver:
- return "vserver %s exec %s"%(self.vservername,command)
- else:
- return "chroot /plc/root %s"%utils.backslash_shell_specials(command)
-
- # command gets run on the right box
- def to_host(self,command):
- if self.is_local():
- return command
- else:
- return "ssh %s %s"%(self.hostname(),utils.backslash_shell_specials(command))
def full_command(self,command):
- return self.to_host(self.host_to_guest(command))
+ return self.test_ssh.to_host(self.host_to_guest(command))
def run_in_guest (self,command):
return utils.system(self.full_command(command))
+
def run_in_host (self,command):
- return utils.system(self.to_host(command))
-
- # xxx quick n dirty
- def run_in_guest_piped (self,local,remote):
- return utils.system(local+" | "+self.full_command(remote))
+ return utils.system(self.test_ssh.to_host(command))
+ #command gets run in the chroot/vserver
+ def host_to_guest(self,command):
+ if self.vserver:
+ return "vserver %s exec %s"%(self.vservername,command)
+ else:
+ return "chroot /plc/root %s"%TestSsh.backslash_shell_specials(command)
+
# copy a file to the myplc root image - pass in_data=True if the file must go in /plc/data
def copy_in_guest (self, localfile, remotefile, in_data=False):
if in_data:
else:
utils.system("scp %s %s@/vservers/%s/%s"%(localfile,self.hostname(),self.vservername,remotefile))
+
+ # xxx quick n dirty
+ def run_in_guest_piped (self,local,remote):
+ return utils.system(local+" | "+self.full_command(remote))
+
+
def auth_root (self):
return {'Username':self.plc_spec['PLC_ROOT_USER'],
'AuthMethod':'password',
# make this a valid step
def list_all_qemus(self,options):
for (box,nodes) in self.gather_hostBoxes().iteritems():
- # push the script
- TestBox(box,options.buildname).copy("qemu_kill.sh")
# this is the brute force version, kill all qemus on that host box
- TestBox(box,options.buildname).run_in_buildname("qemu_kill.sh -l")
+ TestBox(box,options.buildname).run_in_buildname("qemu-%s/kill-qemu-node -l %s"%(node.name(),node.name()))
+ return True
+
+ # kill only the right qemus
+ def list_qemus(self,options):
+ for (box,nodes) in self.gather_hostBoxes().iteritems():
+ # the fine-grain version
+ for node in nodes:
+ node.list_qemu()
return True
# kill only the right qemus
def kill_qemus(self,options):
for (box,nodes) in self.gather_hostBoxes().iteritems():
- # push the script
- TestBox(box,options.buildname).copy("qemu_kill.sh")
# the fine-grain version
for node in nodes:
node.kill_qemu()
# nothing to do
return True
- # xxx this would not work with hostname != localhost as mylc-init-vserver was extracted locally
def install_vserver(self,options):
# we need build dir for vtest-init-vserver
if self.is_local():
build_dir=self.path+"/build"
else:
# use a standard name - will be relative to HOME
- build_dir="tests-system-build"
+ build_dir="options.buildname"
+ # run checkout in any case - would do an update if already exists
build_checkout = "svn checkout %s %s"%(options.build_url,build_dir)
if self.run_in_host(build_checkout) != 0:
raise Exception,"Cannot checkout build dir"
# the repo url is taken from myplc-url
# with the last two steps (i386/myplc...) removed
repo_url = options.myplc_url
- repo_url = os.path.dirname(repo_url)
- repo_url = os.path.dirname(repo_url)
+ for level in [ 'rpmname','arch' ]:
+ repo_url = os.path.dirname(repo_url)
create_vserver="%s/vtest-init-vserver.sh %s %s -- --interface eth0:%s"%\
(build_dir,self.vservername,repo_url,self.vserverip)
if self.run_in_host(create_vserver) != 0:
###
def configure(self,options):
- tmpname='/root/%s/%s.plc-config-tty'%(options.path,self.name())
+ tmpname='%s.plc-config-tty'%(self.name())
fileconf=open(tmpname,'w')
for var in [ 'PLC_NAME',
'PLC_ROOT_PASSWORD',
# could use a TestKey class
def store_keys(self, options):
for key_spec in self.plc_spec['keys']:
- TestKey(self,key_spec).store_key()
+ TestKey(self,key_spec).store_key()
return True
def clean_keys(self, options):
git://git.onelab.eu / tests.git / blobdiff