X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=5d6268bc9882beb41bf1f47b5882e11f6b6d6c99;hb=29add6ace27b5debf81984cb9df0c1e4ced7942f;hp=9bb5f362b4bd99d59e509c10eff9e6b95c7de689;hpb=4d1e9c36b4a05066d00628ed2a9e9d6d391d149a;p=tests.git
diff --git a/system/TestPlc.py b/system/TestPlc.py
index 9bb5f36..5d6268b 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -109,6 +109,7 @@ class slice_mapper__tasks (object):
tasks += slice_method (test_slice, self.options)
return Completer (tasks).run (decorator_self.timeout, decorator_self.silent, decorator_self.period)
# restore the doc text from the TestSlice method even if a bit odd
+ wrappee.__name__ = method.__name__
wrappee.__doc__ = slice_method.__doc__
return wrappee
@@ -164,11 +165,11 @@ class TestPlc:
# check slices are turned off properly
'empty_slices', 'ssh_slice_off', 'slice_fs_deleted_ignore', SEP,
# check they are properly re-created with the same name
- 'fill_slices', 'ssh_slice_again_ignore', SEP,
+ 'fill_slices', 'ssh_slice_again', SEP,
'gather_logs_force', SEP,
]
other_steps = [
- 'export', 'show_boxes', SEP,
+ 'export', 'show_boxes', 'super_speed_up_slices', SEP,
'check_hooks', 'plc_stop', 'plcvm_start', 'plcvm_stop', SEP,
'delete_initscripts', 'delete_nodegroups','delete_all_sites', SEP,
'delete_sites', 'delete_nodes', 'delete_slices', 'keys_clean', SEP,
@@ -312,9 +313,9 @@ class TestPlc:
return self.yum_check_installed (rpms)
def auth_root (self):
- return {'Username':self.plc_spec['PLC_ROOT_USER'],
+ return {'Username':self.plc_spec['settings']['PLC_ROOT_USER'],
'AuthMethod':'password',
- 'AuthString':self.plc_spec['PLC_ROOT_PASSWORD'],
+ 'AuthString':self.plc_spec['settings']['PLC_ROOT_PASSWORD'],
'Role' : self.plc_spec['role']
}
def locate_site (self,sitename):
@@ -589,7 +590,7 @@ class TestPlc:
print '+ MyPLC',plc_spec['name']
# WARNING this would not be right for lxc-based PLC's - should be harmless though
print '+\tvserver address = root@%s:/vservers/%s'%(plc_spec['host_box'],plc_spec['vservername'])
- print '+\tIP = %s/%s'%(plc_spec['PLC_API_HOST'],plc_spec['vserverip'])
+ print '+\tIP = %s/%s'%(plc_spec['settings']['PLC_API_HOST'],plc_spec['vserverip'])
for site_spec in plc_spec['sites']:
for node_spec in site_spec['nodes']:
TestPlc.display_mapping_node(node_spec)
@@ -702,26 +703,8 @@ class TestPlc:
"run plc-config-tty"
tmpname='%s.plc-config-tty'%(self.name())
fileconf=open(tmpname,'w')
- for var in [ 'PLC_NAME',
- 'PLC_ROOT_USER',
- 'PLC_ROOT_PASSWORD',
- 'PLC_SLICE_PREFIX',
- 'PLC_MAIL_ENABLED',
- 'PLC_MAIL_SUPPORT_ADDRESS',
- 'PLC_DB_HOST',
-# 'PLC_DB_PASSWORD',
- # Above line was added for integrating SFA Testing
- 'PLC_API_HOST',
- 'PLC_WWW_HOST',
- 'PLC_BOOT_HOST',
- 'PLC_NET_DNS1',
- 'PLC_NET_DNS2',
- 'PLC_RESERVATION_GRANULARITY',
- 'PLC_OMF_ENABLED',
- 'PLC_OMF_XMPP_SERVER',
- 'PLC_VSYS_DEFAULTS',
- ]:
- fileconf.write ('e %s\n%s\n'%(var,self.plc_spec[var]))
+ for (var,value) in self.plc_spec['settings'].iteritems():
+ fileconf.write ('e %s\n%s\n'%(var,value))
fileconf.write('w\n')
fileconf.write('q\n')
fileconf.close()
@@ -826,7 +809,7 @@ class TestPlc:
sites = self.apiserver.GetSites(self.auth_root(), {}, ['site_id','login_base'])
for site in sites:
# keep automatic site - otherwise we shoot in our own foot, root_auth is not valid anymore
- if site['login_base']==self.plc_spec['PLC_SLICE_PREFIX']: continue
+ if site['login_base']==self.plc_spec['settings']['PLC_SLICE_PREFIX']: continue
site_id=site['site_id']
print 'Deleting site_id',site_id
self.apiserver.DeleteSite(self.auth_root(),site_id)
@@ -1038,8 +1021,8 @@ class TestPlc:
return False
def message (self):
return "CompleterTaskBootState with node %s"%self.hostname
- def failure_message (self):
- return "node %s in state %s - expected %s"%(self.hostname,self.last_boot_state,target_boot_state)
+ def failure_epilogue (self):
+ print "node %s in state %s - expected %s"%(self.hostname,self.last_boot_state,target_boot_state)
timeout = timedelta(minutes=timeout_minutes)
graceout = timedelta(minutes=silent_minutes)
@@ -1066,8 +1049,8 @@ class TestPlc:
def run(self,silent):
command="ping -c 1 -w 1 %s >& /dev/null"%self.hostname
return utils.system (command, silent=silent)==0
- def failure_message (self):
- return "Cannot ping node with name %s"%self.hostname
+ def failure_epilogue (self):
+ print "Cannot ping node with name %s"%self.hostname
timeout=timedelta (seconds=timeout_seconds)
graceout=timeout
period=timedelta (seconds=period_seconds)
@@ -1151,8 +1134,8 @@ class TestPlc:
return self.test_sliver.check_initscript_stamp (self.stamp)
def message (self):
return "initscript checker for %s"%self.test_sliver.name()
- def failure_message (self):
- return "initscript stamp %s not found in sliver %s"%(self.stamp,self.test_sliver.name())
+ def failure_epilogue (self):
+ print "initscript stamp %s not found in sliver %s"%(self.stamp,self.test_sliver.name())
tasks=[]
for slice_spec in self.plc_spec['slices']:
@@ -1230,14 +1213,14 @@ class TestPlc:
def ssh_slice(self): pass
@slice_mapper__tasks(20,19,15)
def ssh_slice_off (self): pass
- @slice_mapper__tasks(2,1,15)
+ @slice_mapper__tasks(1,1,15)
def slice_fs_present(self): pass
- @slice_mapper__tasks(2,1,15)
+ @slice_mapper__tasks(1,1,15)
def slice_fs_deleted(self): pass
# use another name so we can exclude/ignore it from the tests on the nightly command line
def ssh_slice_again(self): return self.ssh_slice()
- # note that simply doing ssh_slice_again=ssh_slice would kind od work too
+ # note that simply doing ssh_slice_again=ssh_slice would kind of work too
# but for some reason the ignore-wrapping thing would not
@slice_mapper
@@ -1252,20 +1235,28 @@ class TestPlc:
return PlcapiUrlScanner (self.auth_root(),ip=self.vserverip).scan()
def speed_up_slices (self):
- "tweak nodemanager settings on all nodes using a conf file"
+ "tweak nodemanager cycle (wait time) to 30+/-10 s"
+ return self._speed_up_slices (30,10)
+ def super_speed_up_slices (self):
+ "dev mode: tweak nodemanager cycle (wait time) to 5+/-1 s"
+ return self._speed_up_slices (5,1)
+
+ def _speed_up_slices (self, p, r):
# create the template on the server-side
template="%s.nodemanager"%self.name()
template_file = open (template,"w")
- template_file.write('OPTIONS="-p 30 -r 11 -d"\n')
+ template_file.write('OPTIONS="-p %s -r %s -d"\n'%(p,r))
template_file.close()
in_vm="/var/www/html/PlanetLabConf/nodemanager"
remote="%s/%s"%(self.vm_root_in_host(),in_vm)
self.test_ssh.copy_abs(template,remote)
# Add a conf file
- self.apiserver.AddConfFile (self.auth_root(),
- {'dest':'/etc/sysconfig/nodemanager',
- 'source':'PlanetLabConf/nodemanager',
- 'postinstall_cmd':'service nm restart',})
+ if not self.apiserver.GetConfFiles (self.auth_root(),
+ {'dest':'/etc/sysconfig/nodemanager'}):
+ self.apiserver.AddConfFile (self.auth_root(),
+ {'dest':'/etc/sysconfig/nodemanager',
+ 'source':'PlanetLabConf/nodemanager',
+ 'postinstall_cmd':'service nm restart',})
return True
def debug_nodemanager (self):
@@ -1344,8 +1335,8 @@ class TestPlc:
return self.test_node._check_system_slice (slicename, dry_run=self.dry_run)
def message (self):
return "System slice %s @ %s"%(slicename, self.test_node.name())
- def failure_message (self):
- return "COULD not find system slice %s @ %s"%(slicename, self.test_node.name())
+ def failure_epilogue (self):
+ print "COULD not find system slice %s @ %s"%(slicename, self.test_node.name())
timeout = timedelta(minutes=timeout_minutes)
silent = timedelta (0)
period = timedelta (seconds=period_seconds)
@@ -1507,30 +1498,13 @@ class TestPlc:
"run sfa-config-tty"
tmpname=self.conffile("sfa-config-tty")
fileconf=open(tmpname,'w')
- for var in [ 'SFA_REGISTRY_ROOT_AUTH',
- 'SFA_INTERFACE_HRN',
- 'SFA_REGISTRY_LEVEL1_AUTH',
- 'SFA_REGISTRY_HOST',
- 'SFA_AGGREGATE_HOST',
- 'SFA_SM_HOST',
- 'SFA_PLC_URL',
- 'SFA_PLC_USER',
- 'SFA_PLC_PASSWORD',
- 'SFA_DB_HOST',
- 'SFA_DB_USER',
- 'SFA_DB_PASSWORD',
- 'SFA_DB_NAME',
- 'SFA_API_LOGLEVEL',
- 'SFA_GENERIC_FLAVOUR',
- 'SFA_AGGREGATE_ENABLED',
- ]:
- if self.plc_spec['sfa'].has_key(var):
- fileconf.write ('e %s\n%s\n'%(var,self.plc_spec['sfa'][var]))
- # the way plc_config handles booleans just sucks..
- for var in []:
- val='false'
- if self.plc_spec['sfa'][var]: val='true'
- fileconf.write ('e %s\n%s\n'%(var,val))
+ for (var,value) in self.plc_spec['sfa']['settings'].iteritems():
+ fileconf.write ('e %s\n%s\n'%(var,value))
+# # the way plc_config handles booleans just sucks..
+# for var in []:
+# val='false'
+# if self.plc_spec['sfa'][var]: val='true'
+# fileconf.write ('e %s\n%s\n'%(var,val))
fileconf.write('w\n')
fileconf.write('R\n')
fileconf.write('q\n')
@@ -1542,11 +1516,11 @@ class TestPlc:
def aggregate_xml_line(self):
port=self.plc_spec['sfa']['neighbours-port']
return '' % \
- (self.vserverip,self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'],port)
+ (self.vserverip,self.plc_spec['sfa']['settings']['SFA_REGISTRY_ROOT_AUTH'],port)
def registry_xml_line(self):
return '' % \
- (self.vserverip,self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'])
+ (self.vserverip,self.plc_spec['sfa']['settings']['SFA_REGISTRY_ROOT_AUTH'])
# a cross step that takes all other plcs in argument
@@ -1568,7 +1542,7 @@ class TestPlc:
def sfa_import(self):
"use sfaadmin to import from plc"
- auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
+ auth=self.plc_spec['sfa']['settings']['SFA_REGISTRY_ROOT_AUTH']
return self.run_in_guest('sfaadmin reg import_registry')==0
def sfa_start(self):