X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=9473c8d761f00f1456b015cf2015fc08c88295f3;hb=127cb9ef78ef452eddd84541b0f6a7cf2c11c262;hp=d0d04d20280848cc4ce3e54b12208aa8bc7c01c6;hpb=55177a1292ca841809a3194015d32f76f1f0420c;p=tests.git diff --git a/system/TestPlc.py b/system/TestPlc.py index d0d04d2..9473c8d 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -153,7 +153,9 @@ class TestPlc: 'sfa_register_user@1', 'sfa_update_user@1', 'sfa_register_slice@1', 'sfa_renew_slice@1', SEPSFA, 'sfa_remove_user_from_slice@1','sfi_show_slice_researchers@1', 'sfa_insert_user_in_slice@1','sfi_show_slice_researchers@1', SEPSFA, - 'sfa_discover@1', 'sfa_create_slice@1', 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA, + 'sfa_discover@1', 'sfa_rspec@1', 'sfa_allocate@1', 'sfa_provision@1', SEPSFA, + 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA, + 'sfa_rspec_empty@1','sfa_allocate_empty@1', 'sfa_provision_empty@1','sfa_check_slice_plc_empty@1', SEPSFA, 'sfi_list@1', 'sfi_show_site@1', 'sfa_utest@1', SEPSFA, # we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot # but as the stress test might take a while, we sometimes missed the debug mode.. @@ -165,11 +167,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, @@ -179,6 +181,7 @@ class TestPlc: 'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP, 'sfa_install_core', 'sfa_install_sfatables', 'sfa_install_plc', 'sfa_install_client', SEPSFA, 'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA, + 'sfa_get_expires', SEPSFA, 'plc_db_dump' , 'plc_db_restore', SEP, 'check_netflow','check_drl', SEP, 'debug_nodemanager', 'slice_fs_present', SEP, @@ -273,11 +276,14 @@ class TestPlc: # see e.g. plc_start esp. the version for f14 #command gets run in the plc's vm def host_to_guest(self,command): + vservername=self.vservername + personality=self.options.personality + raw="%(personality)s virsh -c lxc:/// lxc-enter-namespace %(vservername)s"%locals() # f14 still needs some extra help if self.options.fcdistro == 'f14': - raw="virsh -c lxc:/// lxc-enter-namespace %s -- /usr/bin/env PATH=/bin:/sbin:/usr/bin:/usr/sbin %s" %(self.vservername,command) + raw +=" -- /usr/bin/env PATH=/bin:/sbin:/usr/bin:/usr/sbin %(command)s" %locals() else: - raw="virsh -c lxc:/// lxc-enter-namespace %s -- /usr/bin/env %s" %(self.vservername,command) + raw +=" -- /usr/bin/env %(command)s"%locals() return raw # this /vservers thing is legacy... @@ -1021,8 +1027,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) @@ -1049,8 +1055,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) @@ -1134,8 +1140,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']: @@ -1235,20 +1241,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): @@ -1327,8 +1341,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) @@ -1530,7 +1544,7 @@ class TestPlc: " ".join([ plc.registry_xml_line() for plc in other_plcs ])) utils.header ("(Over)wrote %s"%reg_fname) return self.test_ssh.copy_abs(agg_fname,'/%s/etc/sfa/aggregates.xml'%self.vm_root_in_host())==0 \ - and self.test_ssh.copy_abs(reg_fname,'/%s/etc/sfa/registries.xml'%self.vm_root_in_host())==0 + and self.test_ssh.copy_abs(reg_fname,'/%s/etc/sfa/registries.xml'%self.vm_root_in_host())==0 def sfa_import(self): "use sfaadmin to import from plc" @@ -1568,6 +1582,17 @@ class TestPlc: self.run_in_guest("rm -rf /root/sfi") return True + def sfa_rspec_empty(self): + "expose a static empty rspec (ships with the tests module) in the sfi directory" + filename="empty-rspec.xml" + overall=True + for slice_spec in self.plc_spec['sfa']['auth_sfa_specs']: + test_slice=TestAuthSfa(self,slice_spec) + in_vm = test_slice.sfi_path() + remote="%s/%s"%(self.vm_root_in_host(),in_vm) + if self.test_ssh.copy_abs (filename, remote) !=0: overall=False + return overall + @auth_sfa_mapper def sfa_register_site (self): pass @auth_sfa_mapper @@ -1581,12 +1606,24 @@ class TestPlc: @auth_sfa_mapper def sfa_renew_slice(self): pass @auth_sfa_mapper + def sfa_get_expires(self): pass + @auth_sfa_mapper def sfa_discover(self): pass @auth_sfa_mapper - def sfa_create_slice(self): pass + def sfa_rspec(self): pass + @auth_sfa_mapper + def sfa_allocate(self): pass + @auth_sfa_mapper + def sfa_allocate_empty(self): pass + @auth_sfa_mapper + def sfa_provision(self): pass + @auth_sfa_mapper + def sfa_provision_empty(self): pass @auth_sfa_mapper def sfa_check_slice_plc(self): pass @auth_sfa_mapper + def sfa_check_slice_plc_empty(self): pass + @auth_sfa_mapper def sfa_update_slice(self): pass @auth_sfa_mapper def sfa_remove_user_from_slice(self): pass