class CompleterTaskSliceSsh (CompleterTask):
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.private_key=private_key
- self.command=command
- self.dry_run=dry_run
- self.expected=expected
+ self.test_plc = test_plc
+ self.hostname = hostname
+ self.slicename = slicename
+ self.private_key = private_key
+ self.command = command
+ self.dry_run = dry_run
+ 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)
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 %s@%s"%(self.slicename,self.hostname)
+ print "Could not ssh into sliver {}@{}".format(self.slicename, self.hostname)
else:
- print "Could still ssh into sliver%s@%s (that was expected to be down)"%(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_site=test_site
- self.slice_spec=slice_spec
- self.test_ssh=TestSsh(self.test_plc.test_ssh)
+ def __init__ (self, test_plc, test_site, slice_spec):
+ self.test_plc = test_plc
+ self.test_site = test_site
+ self.slice_spec = slice_spec
+ self.test_ssh = TestSsh(self.test_plc.test_ssh)
def name(self):
return self.slice_spec['slice_fields']['name']
- def get_slice(self,slice_name):
+ def get_slice(self, slice_name):
for slice_spec in self.test_plc.plc_spec['slices']:
- if(slice_spec['slice_fields']['name']== slice_name):
+ if slice_spec['slice_fields']['name'] == slice_name:
return slice_spec
def owner_auth(self):
owner_spec = self.test_site.locate_user(self.slice_spec['owner'])
- return TestUser(self,self.test_site,owner_spec).auth()
+ return TestUser(self, self.test_site, owner_spec).auth()
def slice_name (self):
return self.slice_spec['slice_fields']['name']
auth = self.owner_auth()
slice_fields = self.slice_spec['slice_fields']
slice_name = slice_fields['name']
- utils.header("Creating slice %s"%slice_name)
- self.test_plc.apiserver.AddSlice(auth,slice_fields)
+ utils.header("Creating slice {}".format(slice_name))
+ 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)
+ user_spec = self.test_site.locate_user(username)
+ 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'):
- iscode=self.slice_spec['initscriptcode']
- utils.header("Adding initscript code %s in %s"%(iscode,slice_name))
- self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name,'initscript_code',iscode)
+ 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'):
- isname=self.slice_spec['initscriptname']
- utils.header("Adding initscript name %s in %s"%(isname,slice_name))
- self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name,'initscript',isname)
+ 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 %s OMF-friendly"%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')
+ 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'):
-# vref_value=self.slice_spec['vref']
+# vref_value = self.slice_spec['vref']
# self.test_plc.apiserver.AddSliceTag(self.test_plc.auth_root(), slice_name,'vref',vref_value)
# epilogue
self.add_nodes()
auth = self.owner_auth()
slice_fields = self.slice_spec['slice_fields']
slice_name = slice_fields['name']
- vsys_tags = self.test_plc.apiserver.GetSliceTags (auth,{'tagname':'vsys','name':slice_name})
- values=[ st['value'] for st in vsys_tags ]
- expected=self.test_plc.plc_spec['expected_vsys_tags']
+ vsys_tags = self.test_plc.apiserver.GetSliceTags (auth, {'tagname' : 'vsys', 'name' : slice_name})
+ values = [st['value'] for st in vsys_tags]
+ expected = self.test_plc.plc_spec['expected_vsys_tags']
result = set(values) == set(expected)
if not result:
- print 'Check vsys defaults with slice %s'%slice_name
- print 'Expected %s'%expected
- print 'Got %s'%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
node_spec=self.test_site.locate_node(nodename)
test_node=TestNode(self.test_plc,self.test_site,node_spec)
hostnames += [test_node.name()]
- utils.header("Adding %r in %s"%(hostnames,slice_name))
+ utils.header("Adding {} in {}".format(hostnames, slice_name))
self.test_plc.apiserver.AddSliceToNodes(auth, slice_name, hostnames)
# trash the slice altogether
def delete_slice(self):
auth = self.owner_auth()
slice_name = self.slice_name()
- utils.header("Deleting slice %s"%slice_name)
+ utils.header("Deleting slice {}".format(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 %s'%slice_name
+ print 'retrieving slice {}'.format(slice_name)
slice=self.test_plc.apiserver.GetSlices(auth,slice_name)[0]
node_ids=slice['node_ids']
- utils.header ("Deleting %d nodes from slice %s"%\
- (len(node_ids),slice_name))
+ utils.header ("Deleting {} nodes from slice {}"\
+ .format(len(node_ids), slice_name))
self.test_plc.apiserver.DeleteSliceFromNodes (auth,slice_name, node_ids)
def locate_private_key(self):
# graceout = timedelta(minutes=silent_minutes)
# period = timedelta(seconds=period_seconds)
if not command:
- command="echo hostname ; hostname; echo id; id; echo uname -a ; uname -a"
+ command = "echo hostname ; hostname; echo id; id; echo uname -a ; uname -a"
# locate a key
- private_key=self.locate_private_key()
+ private_key = self.locate_private_key()
if not private_key :
- utils.header("WARNING: Cannot find a valid key for slice %s"%self.name())
+ utils.header("WARNING: Cannot find a valid key for slice {}".format(self.name()))
return False
# convert nodenames to real hostnames
if expected: msg="ssh slice access enabled"
else: msg="ssh slice access disabled"
- utils.header("checking for %s -- slice %s"%(msg,self.name()))
+ utils.header("checking for {} -- slice {}".format(msg, self.name()))
tasks=[]
slicename=self.name()
# locate a key
private_key=self.locate_private_key()
if not private_key :
- utils.header("WARNING: Cannot find a valid key for slice %s"%self.name())
+ utils.header("WARNING: Cannot find a valid key for slice {}".format(self.name()))
return False
# convert nodenames to real hostnames
(site_spec,node_spec) = self.test_plc.locate_node(nodename)
hostname=node_spec['node_fields']['hostname']
- if expected: msg="%s to return TRUE from ssh"%command
- else: msg="%s to return FALSE from ssh"%command
+ if expected:
+ msg="{} to return TRUE from ssh".format(command)
+ else:
+ msg="{} to return FALSE from ssh".format(command)
- utils.header("checking %s -- slice %s on node %s"%(msg,self.name(),hostname))
+ 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())
full_command = test_ssh.actual_command(command)
retcod = utils.system (full_command,silent=True)
- if getattr(options,'dry_run',None): return True
- if expected: success = retcod==0
- else: success = retcod!=0
- if not success: utils.header ("WRONG RESULT for %s"%msg)
+ if getattr(options,'dry_run',None):
+ return True
+ if expected:
+ success = retcod==0
+ else:
+ success = retcod!=0
+ if not success:
+ utils.header ("WRONG RESULT for {}".format(msg))
return success
# for TestPlc.slice_mapper__tasks
# use constant admin key
local_key = "keys/key_admin.rsa"
node_infos = self.test_plc.all_node_infos()
- rootfs="/vservers/%s"%self.name()
+ rootfs="/vservers/{}".format(self.name())
class CompleterTaskRootfs (CompleterTaskNodeSsh):
def __init__ (self, nodename, qemuname):
CompleterTaskNodeSsh.__init__(self,nodename, qemuname, local_key, expected=expected,
- command="ls -d %s"%rootfs)
+ command="ls -d {}".format(rootfs))
def failure_epilogue (self):
if expected:
- print "Could not stat %s - was expected to be present"%rootfs
+ print "Could not stat {} - was expected to be present".format(rootfs)
else:
- print "Sliver rootfs %s still present - this is unexpected"%rootfs
- utils.system(self.test_ssh.actual_command("ls -l %s; du -hs %s"%(rootfs,rootfs),dry_run=self.dry_run))
+ 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))
return [ CompleterTaskRootfs (nodename, qemuname) for (nodename,qemuname) in node_infos ]
git://git.onelab.eu / tests.git / blobdiff