+# -*- python3 -*-
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
-# Copyright (C) 2010 INRIA
+# Copyright (C) 2015 INRIA
#
import utils
import os, os.path
class CompleterTaskSliceSsh (CompleterTask):
- def __init__ (self, test_plc, hostname, slicename, private_key,command, expected, dry_run):
+ def __init__ (self, test_plc, hostname, slicename, private_key, command, expected, dry_run):
self.test_plc = test_plc
self.hostname = hostname
self.slicename = slicename
self.expected = expected
def run (self, silent):
- (site_spec,node_spec) = self.test_plc.locate_hostname(self.hostname)
- test_ssh = TestSsh (self.hostname,key=self.private_key,username=self.slicename)
+ site_spec, node_spec = self.test_plc.locate_hostname(self.hostname)
+ test_ssh = TestSsh (self.hostname, key=self.private_key, username=self.slicename)
full_command = test_ssh.actual_command(self.command)
- retcod = utils.system (full_command, silent=silent)
- if self.dry_run: return True
- if self.expected: return retcod==0
- else: return retcod!=0
+ retcod = utils.system (full_command, silent=silent, timeout=10)
+ if self.dry_run: return True
+ if self.expected: return retcod == 0
+ else: return retcod != 0
def failure_epilogue (self):
if self.expected:
- print "Could not ssh into sliver {}@{}".format(self.slicename, self.hostname)
+ print("Could not ssh into sliver {}@{}".format(self.slicename, self.hostname))
else:
- print "Could still ssh into sliver{}@{} (that was expected to be down)"\
- .format(self.slicename, self.hostname)
+ print("Could still ssh into sliver{}@{} (that was expected to be down)"\
+ .format(self.slicename, self.hostname))
class TestSlice:
def __init__ (self, test_plc, test_site, slice_spec):
- self.test_plc = test_plc
+ self.test_plc = test_plc
self.test_site = test_site
- self.slice_spec = slice_spec
+ self.slice_spec = slice_spec
self.test_ssh = TestSsh(self.test_plc.test_ssh)
def name(self):
self.test_plc.apiserver.AddSlice(auth, slice_fields)
for username in self.slice_spec['usernames']:
user_spec = self.test_site.locate_user(username)
- test_user = TestUser(self,self.test_site,user_spec)
+ test_user = TestUser(self, self.test_site, user_spec)
self.test_plc.apiserver.AddPersonToSlice(auth, test_user.name(), slice_name)
# add initscript code or name as appropriate
- if self.slice_spec.has_key('initscriptcode'):
+ if 'initscriptcode' in self.slice_spec:
iscode = self.slice_spec['initscriptcode']
utils.header("Adding initscript code {} in {}".format(iscode, slice_name))
self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name,
'initscript_code', iscode)
- elif self.slice_spec.has_key('initscriptname'):
+ elif 'initscriptname' in self.slice_spec:
isname = self.slice_spec['initscriptname']
utils.header("Adding initscript name {} in {}".format(isname, slice_name))
self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name,
'initscript', isname)
- if 'omf-friendly' in self.slice_spec:
- utils.header("Making slice {} OMF-friendly".format(slice_name))
- self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name, 'vref', 'omf')
- self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name, 'omf_control', 'yes')
+# omf-friendly slices is a deprecated feature
+# if 'omf-friendly' in self.slice_spec:
+# utils.header("Making slice {} OMF-friendly".format(slice_name))
+# self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name, 'vref', 'omf')
+# self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name, 'omf_control', 'yes')
+#
# setting vref directly like this was useful for multi-arch tests long ago - see wifilab
# however this should rather use other tags by now, so we drop this for now
# if self.slice_spec.has_key ('vref'):
expected = self.test_plc.plc_spec['expected_vsys_tags']
result = set(values) == set(expected)
if not result:
- print 'Check vsys defaults with slice {}'.format(slice_name)
- print 'Expected {}'.format(expected)
- print 'Got {}'.format(values)
+ print('Check vsys defaults with slice {}'.format(slice_name))
+ print('Expected {}'.format(expected))
+ print('Got {}'.format(values))
return result
# just add the nodes and handle tags
hostnames=[]
for nodename in self.slice_spec['nodenames']:
node_spec=self.test_site.locate_node(nodename)
- test_node=TestNode(self.test_plc,self.test_site,node_spec)
+ test_node=TestNode(self.test_plc, self.test_site, node_spec)
hostnames += [test_node.name()]
utils.header("Adding {} in {}".format(hostnames, slice_name))
self.test_plc.apiserver.AddSliceToNodes(auth, slice_name, hostnames)
auth = self.owner_auth()
slice_name = self.slice_name()
utils.header("Deleting slice {}".format(slice_name))
- self.test_plc.apiserver.DeleteSlice(auth,slice_name)
+ self.test_plc.apiserver.DeleteSlice(auth, slice_name)
# keep the slice alive and just delete nodes
def delete_nodes (self):
auth = self.owner_auth()
slice_name = self.slice_name()
- print 'retrieving slice {}'.format(slice_name)
- slice=self.test_plc.apiserver.GetSlices(auth,slice_name)[0]
+ print('retrieving slice {}'.format(slice_name))
+ slice=self.test_plc.apiserver.GetSlices(auth, slice_name)[0]
node_ids=slice['node_ids']
utils.header ("Deleting {} nodes from slice {}"\
.format(len(node_ids), slice_name))
- self.test_plc.apiserver.DeleteSliceFromNodes (auth,slice_name, node_ids)
+ self.test_plc.apiserver.DeleteSliceFromNodes (auth, slice_name, node_ids)
def locate_private_key(self):
key_names=[]
return self.ssh_tasks(options, expected=False, *args, **kwds)
def ssh_tasks(self,options, expected=True, command=None):
-# timeout_minutes=20,silent_minutes=10,period_seconds=15):
+# timeout_minutes=20, silent_minutes=10, period_seconds=15):
# timeout = timedelta(minutes=timeout_minutes)
# graceout = timedelta(minutes=silent_minutes)
# period = timedelta(seconds=period_seconds)
tasks=[]
slicename=self.name()
- dry_run = getattr(options,'dry_run',False)
+ dry_run = getattr(options, 'dry_run', False)
for nodename in self.slice_spec['nodenames']:
- (site_spec,node_spec) = self.test_plc.locate_node(nodename)
- tasks.append( CompleterTaskSliceSsh(self.test_plc,node_spec['node_fields']['hostname'],
- slicename,private_key,command,expected,dry_run))
+ site_spec, node_spec = self.test_plc.locate_node(nodename)
+ tasks.append( CompleterTaskSliceSsh(self.test_plc, node_spec['node_fields']['hostname'],
+ slicename, private_key, command, expected, dry_run))
return tasks
def ssh_slice_basics (self, options, *args, **kwds):
"the slice is expected to be UP and we just check a few simple sanity commands, including 'ps' to check for /proc"
- overall=True
- if not self.do_ssh_slice_once(options,expected=True, command='true'): overall=False
- if not self.do_ssh_slice_once(options,expected=False, command='false'): overall=False
- if not self.do_ssh_slice_once(options,expected=False, command='someimprobablecommandname'): overall=False
- if not self.do_ssh_slice_once(options,expected=True, command='ps'): overall=False
- if not self.do_ssh_slice_once(options,expected=False, command='ls /vservers'): overall=False
+ overall = True
+ if not self.do_ssh_slice_once(options, expected=True, command='true'): overall=False
+ if not self.do_ssh_slice_once(options, expected=False, command='false'): overall=False
+ if not self.do_ssh_slice_once(options, expected=False, command='someimprobablecommandname'): overall=False
+ if not self.do_ssh_slice_once(options, expected=True, command='ps'): overall=False
+ if not self.do_ssh_slice_once(options, expected=False, command='ls /vservers'): overall=False
return overall
# pick just one nodename and runs the ssh command once
- def do_ssh_slice_once(self,options,command,expected):
+ def do_ssh_slice_once(self, options, command, expected):
# locate a key
private_key=self.locate_private_key()
if not private_key :
# convert nodenames to real hostnames
slice_spec = self.slice_spec
nodename=slice_spec['nodenames'][0]
- (site_spec,node_spec) = self.test_plc.locate_node(nodename)
+ site_spec, node_spec = self.test_plc.locate_node(nodename)
hostname=node_spec['node_fields']['hostname']
if expected:
msg="{} to return FALSE from ssh".format(command)
utils.header("checking {} -- slice {} on node {}".format(msg, self.name(), hostname))
- (site_spec,node_spec) = self.test_plc.locate_hostname(hostname)
- test_ssh = TestSsh (hostname,key=private_key,username=self.name())
+ site_spec, node_spec = self.test_plc.locate_hostname(hostname)
+ test_ssh = TestSsh (hostname, key=private_key, username=self.name())
full_command = test_ssh.actual_command(command)
- retcod = utils.system (full_command,silent=True)
- if getattr(options,'dry_run',None):
+ retcod = utils.system (full_command, silent=True, timeout=10)
+ if getattr(options, 'dry_run', None):
return True
if expected:
success = retcod==0
# check that /vservers/<> is present/deleted
def slice_fs_present__tasks (self, options):
"checks that /vservers/<slicename> exists on the filesystem"
- return self.check_rootfs_tasks(options,expected=True)
+ return self.check_rootfs_tasks(options, expected=True)
def slice_fs_deleted__tasks (self, options):
"checks that /vservers/<slicename> has been properly wiped off"
- return self.check_rootfs_tasks (options,expected=False)
+ return self.check_rootfs_tasks (options, expected=False)
def check_rootfs_tasks (self, options, expected):
# use constant admin key
rootfs="/vservers/{}".format(self.name())
class CompleterTaskRootfs (CompleterTaskNodeSsh):
def __init__ (self, nodename, qemuname):
- CompleterTaskNodeSsh.__init__(self,nodename, qemuname, local_key, expected=expected,
+ CompleterTaskNodeSsh.__init__(self, nodename, qemuname, local_key, expected=expected,
command="ls -d {}".format(rootfs))
def failure_epilogue (self):
if expected:
- print "Could not stat {} - was expected to be present".format(rootfs)
+ print("Could not stat {} - was expected to be present".format(rootfs))
else:
- print "Sliver rootfs {} still present - this is unexpected".format(rootfs)
+ print("Sliver rootfs {} still present - this is unexpected".format(rootfs))
utils.system(self.test_ssh.actual_command("ls -l {rootfs}; du -hs {rootfs}".format(**locals()),
- dry_run=self.dry_run))
+ dry_run=self.dry_run, timeout=20))
return [ CompleterTaskRootfs (nodename, qemuname) for (nodename,qemuname) in node_infos ]
git://git.onelab.eu / tests.git / blobdiff