X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=c3acc6c875073c4e2ab14804dc3e56d93ccf5bfe;hb=0ecbbc54d1bef5ddc4b1bc0523fe1ed1b4b4bbf0;hp=85750c9ecc053a49c2cf4fbee0f6ee60e0cb8bd0;hpb=1ddd05ac07ac53ea71e47f6ea22ca17ac882c82c;p=tests.git diff --git a/system/TestPlc.py b/system/TestPlc.py index 85750c9..c3acc6c 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -20,7 +20,6 @@ from TestBoxQemu import TestBoxQemu from TestSsh import TestSsh from TestApiserver import TestApiserver from TestSliceSfa import TestSliceSfa -from TestUserSfa import TestUserSfa # step methods must take (self) and return a boolean (options is a member of the class) @@ -87,38 +86,37 @@ class TestPlc: default_steps = [ 'show', SEP, - 'vs_delete','vs_create','timestamp_vs', SEP, + 'vs_delete','timestamp_vs','vs_create', SEP, 'plc_install', 'plc_configure', 'plc_start', SEP, 'keys_fetch', 'keys_store', 'keys_clear_known_hosts', SEP, 'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP, 'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP, - 'qemu_export', 'qemu_kill_all', 'qemu_start', 'timestamp_qemu', SEP, - 'sfa_install', 'sfa_configure', 'cross_sfa_configure', 'sfa_import', 'sfa_start', SEPSFA, + 'qemu_export', 'qemu_kill_mine', 'qemu_start', 'timestamp_qemu', SEP, + 'sfa_install', 'sfa_tables_install', 'sfa_plc_install', 'sfa_client_install', SEPSFA, + 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA, 'sfi_configure@1', 'sfa_add_user@1', 'sfa_add_slice@1', 'sfa_discover@1', SEPSFA, 'sfa_create_slice@1', 'sfa_check_slice_plc@1', SEPSFA, 'sfa_update_user@1', 'sfa_update_slice@1', 'sfa_view@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.. - 'ssh_node_debug', 'plcsh_stress_test@1', SEP, - 'ssh_node_boot', 'ssh_slice', 'check_initscripts', SEP, + 'ssh_node_debug@1', 'plcsh_stress_test@1', SEP, + 'ssh_node_boot@1', 'ssh_slice', 'check_initscripts', SEP, 'ssh_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA, 'check_tcp', SEP, 'force_gather_logs', SEP, ] other_steps = [ - 'check_hooks', - 'free_all', - 'show_boxes', 'local_list','local_rel','local_rel_plc','local_rel_qemu',SEP, - 'plc_stop', 'vs_start', 'vs_stop', SEP, + 'export', 'show_boxes', SEP, + 'check_hooks', 'plc_stop', 'vs_start', 'vs_stop', SEP, 'delete_initscripts', 'delete_nodegroups','delete_all_sites', SEP, 'delete_sites', 'delete_nodes', 'delete_slices', 'keys_clean', SEP, 'delete_leases', 'list_leases', SEP, 'populate' , SEP, 'nodestate_show','nodestate_safeboot','nodestate_boot', SEP, - 'qemu_list_all', 'qemu_list_mine', 'qemu_kill_mine', SEP, + 'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP, 'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEP, 'plc_db_dump' , 'plc_db_restore', SEP, - 'standby_1 through 20',SEP, + 'standby_1_through_20',SEP, ] @staticmethod @@ -130,7 +128,7 @@ class TestPlc: return step != SEP and step != SEPSFA # turn off the sfa-related steps when build has skipped SFA - # this is originally for centos5 as recent SFAs won't build on this platformb + # this is originally for centos5 as recent SFAs won't build on this platform @staticmethod def check_whether_build_has_sfa (rpms_url): # warning, we're now building 'sface' so let's be a bit more picky @@ -200,6 +198,13 @@ class TestPlc: def run_in_guest_piped (self,local,remote): return utils.system(local+" | "+self.test_ssh.actual_command(self.host_to_guest(remote),keep_stdin=True)) + # does a yum install in the vs, ignore yum retcod, check with rpm + def yum_install (self, rpms): + if isinstance (rpms, list): + rpms=" ".join(rpms) + self.run_in_guest("yum -y install %s"%rpms) + return self.run_in_guest("rpm -q %s"%rpms)==0 + def auth_root (self): return {'Username':self.plc_spec['PLC_ROOT_USER'], 'AuthMethod':'password', @@ -340,6 +345,23 @@ class TestPlc: self.display_pass (2) return True + def export (self): + "print cut'n paste-able stuff to export env variables to your shell" + # these work but the shell prompt does not get displayed.. + command1="ssh %s vserver %s enter"%(self.plc_spec['host_box'],self.plc_spec['vservername']) + command2="ssh root@%s %s"%(socket.gethostname(),command1) + # guess local domain from hostname + domain=socket.gethostname().split('.',1)[1] + fqdn="%s.%s"%(self.plc_spec['host_box'],domain) + print "export BUILD=%s"%self.options.buildname + print "export PLCHOST=%s"%fqdn + print "export GUEST=%s"%self.plc_spec['vservername'] + # find hostname of first node + (hostname,qemubox) = self.all_node_infos()[0] + print "export KVMHOST=%s.%s"%(qemubox,domain) + print "export NODE=%s"%(hostname) + return True + # entry point always_display_keys=['PLC_WWW_HOST','nodes','sites',] def display_pass (self,passno): @@ -443,45 +465,46 @@ class TestPlc: print '+\tqemu box %s'%node_spec['host_box'] print '+\thostname=%s'%node_spec['node_fields']['hostname'] - # write a timestamp in /vservers/<>/ + # write a timestamp in /vservers/<>.timestamp + # cannot be inside the vserver, that causes vserver .. build to cough def timestamp_vs (self): now=int(time.time()) - utils.system(self.test_ssh.actual_command("mkdir -p /vservers/%s"%self.vservername)) - return utils.system(self.test_ssh.actual_command("echo %d > /vservers/%s/timestamp"%(now,self.vservername)))==0 + return utils.system(self.test_ssh.actual_command("echo %d > /vservers/%s.timestamp"%(now,self.vservername)))==0 - def local_pre (self): - "run site-dependant pre-test script as defined in LocalTestResources" - from LocalTestResources import local_resources - return local_resources.step_pre(self) - - def local_post (self): - "run site-dependant post-test script as defined in LocalTestResources" - from LocalTestResources import local_resources - return local_resources.step_post(self) - - def local_list (self): - "run site-dependant list script as defined in LocalTestResources" - from LocalTestResources import local_resources - return local_resources.step_list(self) - - def local_rel (self): - "run site-dependant release script as defined in LocalTestResources" - from LocalTestResources import local_resources - return local_resources.step_release(self) - - def local_rel_plc (self): - "run site-dependant release script as defined in LocalTestResources" - from LocalTestResources import local_resources - return local_resources.step_release_plc(self) - - def local_rel_qemu (self): - "run site-dependant release script as defined in LocalTestResources" - from LocalTestResources import local_resources - return local_resources.step_release_qemu(self) - +# def local_pre (self): +# "run site-dependant pre-test script as defined in LocalTestResources" +# from LocalTestResources import local_resources +# return local_resources.step_pre(self) +# +# def local_post (self): +# "run site-dependant post-test script as defined in LocalTestResources" +# from LocalTestResources import local_resources +# return local_resources.step_post(self) +# +# def local_list (self): +# "run site-dependant list script as defined in LocalTestResources" +# from LocalTestResources import local_resources +# return local_resources.step_list(self) +# +# def local_rel (self): +# "run site-dependant release script as defined in LocalTestResources" +# from LocalTestResources import local_resources +# return local_resources.step_release(self) +# +# def local_rel_plc (self): +# "run site-dependant release script as defined in LocalTestResources" +# from LocalTestResources import local_resources +# return local_resources.step_release_plc(self) +# +# def local_rel_qemu (self): +# "run site-dependant release script as defined in LocalTestResources" +# from LocalTestResources import local_resources +# return local_resources.step_release_qemu(self) +# def vs_delete(self): "vserver delete the test myplc" self.run_in_host("vserver --silent %s delete"%self.vservername) + self.run_in_host("rm -f /vservers/%s.timestamp"%self.vservername) return True ### install @@ -549,8 +572,7 @@ class TestPlc: pkgs_list.append ("noderepo-%s"%nodefamily) pkgs_list.append ("bootstrapfs-%s-plain"%nodefamily) pkgs_string=" ".join(pkgs_list) - self.run_in_guest("yum -y install %s"%pkgs_string) - return self.run_in_guest("rpm -q %s"%pkgs_string)==0 + return self.yum_install (pkgs_list) ### def plc_configure(self): @@ -1105,11 +1127,23 @@ class TestPlc: ### sfa_install_rpm def sfa_install(self): - "yum install sfa, sfa-plc and sfa-client" - # ignore yum retcod - self.run_in_guest("yum -y install sfa sfa-client sfa-plc sfa-sfatables") - return self.run_in_guest("rpm -q sfa sfa-client sfa-plc sfa-sfatables")==0 + "yum install sfa" + return self.yum_install ("sfa") + + ### sfa_install_rpm + def sfa_plc_install(self): + "yum install sfa-plc" + return self.yum_install("sfa-plc") + + ### sfa_install_rpm + def sfa_client_install(self): + "yum install sfa-client" + return self.yum_install("sfa-client") + ### sfa_install_rpm + def sfa_tables_install(self): + "yum install sfa-client" + return self.yum_install ("sfa-sfatables") def sfa_dbclean(self): "thoroughly wipes off the SFA database" @@ -1121,13 +1155,14 @@ class TestPlc: # ignore result sfa_spec=self.plc_spec['sfa'] - slicename='%s_%s'%(sfa_spec['login_base'],sfa_spec['slicename']) - try: self.apiserver.DeleteSlice(self.auth_root(),slicename) - except: print "Slice %s already absent from PLC db"%slicename + for sfa_slice_spec in sfa_spec['sfa_slice_specs']: + slicename='%s_%s'%(sfa_slice_spec['login_base'],sfa_slice_spec['slicename']) + try: self.apiserver.DeleteSlice(self.auth_root(),slicename) + except: print "Slice %s already absent from PLC db"%slicename - username="%s@%s"%(sfa_spec['regularuser'],sfa_spec['domain']) - try: self.apiserver.DeletePerson(self.auth_root(),username) - except: print "User %s already absent from PLC db"%username + username="%s@%s"%(sfa_slice_spec['regularuser'],sfa_slice_spec['domain']) + try: self.apiserver.DeletePerson(self.auth_root(),username) + except: print "User %s already absent from PLC db"%username print "REMEMBER TO RUN sfa_import AGAIN" return True @@ -1197,12 +1232,14 @@ class TestPlc: 'SFA_REGISTRY_HOST', 'SFA_AGGREGATE_HOST', 'SFA_SM_HOST', + 'SFA_PLC_URL', 'SFA_PLC_USER', 'SFA_PLC_PASSWORD', - 'SFA_PLC_DB_HOST', - 'SFA_PLC_DB_USER', - 'SFA_PLC_DB_PASSWORD', - 'SFA_PLC_URL', + 'SFA_DB_HOST', + 'SFA_DB_USER', + 'SFA_DB_PASSWORD', + # should be tmp + 'SFA_DB_NAME', ]: fileconf.write ('e %s\n%s\n'%(var,self.plc_spec['sfa'][var])) # the way plc_config handles booleans just sucks.. @@ -1257,81 +1294,40 @@ class TestPlc: return self.run_in_guest('service sfa start')==0 def sfi_configure(self): - "Create /root/.sfi on the plc side for sfi client configuration" + "Create /root/sfi on the plc side for sfi client configuration" + if self.options.dry_run: + utils.header("DRY RUN - skipping step") + return True sfa_spec=self.plc_spec['sfa'] - dir_name=self.confsubdir("dot-sfi",clean=True,dry_run=self.options.dry_run) - if self.options.dry_run: return True - file_name=dir_name + os.sep + sfa_spec['piuser'] + '.pkey' - fileconf=open(file_name,'w') - fileconf.write (self.plc_spec['keys'][0]['private']) - fileconf.close() - utils.header ("(Over)wrote %s"%file_name) - - file_name=dir_name + os.sep + 'sfi_config' - fileconf=open(file_name,'w') - SFI_AUTH="%s.%s"%(sfa_spec['SFA_REGISTRY_ROOT_AUTH'],sfa_spec['login_base']) - fileconf.write ("SFI_AUTH='%s'"%SFI_AUTH) - fileconf.write('\n') - SFI_USER=SFI_AUTH + '.' + sfa_spec['piuser'] - fileconf.write ("SFI_USER='%s'"%SFI_USER) - fileconf.write('\n') - SFI_REGISTRY='http://' + sfa_spec['SFA_PLC_DB_HOST'] + ':12345/' - fileconf.write ("SFI_REGISTRY='%s'"%SFI_REGISTRY) - fileconf.write('\n') - SFI_SM='http://' + sfa_spec['SFA_PLC_DB_HOST'] + ':12347/' - fileconf.write ("SFI_SM='%s'"%SFI_SM) - fileconf.write('\n') - fileconf.close() - utils.header ("(Over)wrote %s"%file_name) - - file_name=dir_name + os.sep + 'person.xml' - fileconf=open(file_name,'w') - for record in sfa_spec['sfa_person_xml']: - person_record=record - fileconf.write(person_record) - fileconf.write('\n') - fileconf.close() - utils.header ("(Over)wrote %s"%file_name) - - file_name=dir_name + os.sep + 'slice.xml' - fileconf=open(file_name,'w') - for record in sfa_spec['sfa_slice_xml']: - slice_record=record - #slice_record=sfa_spec['sfa_slice_xml'] - fileconf.write(slice_record) - fileconf.write('\n') - utils.header ("(Over)wrote %s"%file_name) - fileconf.close() - - file_name=dir_name + os.sep + 'slice.rspec' - fileconf=open(file_name,'w') - slice_rspec='' - for (key, value) in sfa_spec['sfa_slice_rspec'].items(): - slice_rspec +=value - fileconf.write(slice_rspec) - fileconf.write('\n') - fileconf.close() - utils.header ("(Over)wrote %s"%file_name) - - # push to the remote root's .sfi - location = "root/.sfi" - remote="/vservers/%s/%s"%(self.vservername,location) - self.test_ssh.copy_abs(dir_name, remote, recursive=True) + # cannot use sfa_slice_mapper to pass dir_name + for slice_spec in self.plc_spec['sfa']['sfa_slice_specs']: + site_spec = self.locate_site (slice_spec['sitename']) + test_site = TestSite(self,site_spec) + test_slice=TestSliceSfa(self,test_site,slice_spec) + dir_name=self.confsubdir("dot-sfi/%s"%slice_spec['slicename'],clean=True,dry_run=self.options.dry_run) + test_slice.sfi_config(dir_name) + # push into the remote /root/sfi area + location = test_slice.sfi_path() + remote="/vservers/%s/%s"%(self.vservername,location) + self.test_ssh.mkdir(remote,abs=True) + # need to strip last level or remote otherwise we get an extra dir level + self.test_ssh.copy_abs(dir_name, os.path.dirname(remote), recursive=True) return True def sfi_clean (self): - "clean up /root/.sfi on the plc side" - self.run_in_guest("rm -rf /root/.sfi") + "clean up /root/sfi on the plc side" + self.run_in_guest("rm -rf /root/sfi") return True + @slice_sfa_mapper def sfa_add_user(self): - "run sfi.py add using person.xml" - return TestUserSfa(self).add_user() + "run sfi.py add" + pass + @slice_sfa_mapper def sfa_update_user(self): - "run sfi.py update using person.xml" - return TestUserSfa(self).update_user() + "run sfi.py update" @slice_sfa_mapper def sfa_add_slice(self): @@ -1358,25 +1354,20 @@ class TestPlc: "run sfi.py create (on SM) on existing object" pass + @slice_sfa_mapper def sfa_view(self): - "run sfi.py list and sfi.py show (both on Registry) and sfi.py slices and sfi.py resources (both on SM)" - sfa_spec=self.plc_spec['sfa'] - auth=sfa_spec['SFA_REGISTRY_ROOT_AUTH'] - return \ - self.run_in_guest("sfi.py -d /root/.sfi/ list %s.%s"%(auth,sfa_spec['login_base']))==0 and \ - self.run_in_guest("sfi.py -d /root/.sfi/ show %s.%s"%(auth,sfa_spec['login_base']))==0 and \ - self.run_in_guest("sfi.py -d /root/.sfi/ slices")==0 and \ - self.run_in_guest("sfi.py -d /root/.sfi/ resources -o resources")==0 + "various registry-related calls" + pass @slice_sfa_mapper def ssh_slice_sfa(self): "tries to ssh-enter the SFA slice" pass + @slice_sfa_mapper def sfa_delete_user(self): - "run sfi.py delete (on SM) for user" - test_user_sfa=TestUserSfa(self) - return test_user_sfa.delete_user() + "run sfi.py delete" + pass @slice_sfa_mapper def sfa_delete_slice(self): @@ -1498,6 +1489,9 @@ class TestPlc: utils.header('Database restored from ' + dump) + def standby_1_through_20(self): + """convenience function to wait for a specified number of minutes""" + pass @standby_generic def standby_1(): pass @standby_generic