X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=1ccdc80f5542888aa97c924e7879a4121dfcd909;hb=079fcad2d535401d0f078c2b52c928ecec7a2799;hp=6662d3b7c98229a33c8ecb554ac438cd148d6c13;hpb=1183630c15054c346e875fd8b71fe12278a09e95;p=tests.git diff --git a/system/TestPlc.py b/system/TestPlc.py index 6662d3b..1ccdc80 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -16,7 +16,7 @@ from TestUser import TestUser from TestKey import TestKey from TestSlice import TestSlice from TestSliver import TestSliver -from TestBox import TestBox +from TestBoxQemu import TestBoxQemu from TestSsh import TestSsh from TestApiserver import TestApiserver from TestSliceSfa import TestSliceSfa @@ -86,31 +86,36 @@ SEPSFA='' class TestPlc: default_steps = [ - 'display', 'resources_pre', SEP, - 'delete_vs','create_vs','install', 'configure', 'start', SEP, - 'fetch_keys', 'store_keys', 'clear_known_hosts', SEP, + 'show', 'local_pre', SEP, + 'vs_delete','vs_create','plc_install', 'plc_configure', 'plc_start', SEP, + 'keys_fetch', 'keys_store', 'keys_clear_known_hosts', SEP, 'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP, - 'reinstall_node', 'init_node','bootcd', 'configure_qemu', 'export_qemu', 'kill_all_qemus', 'start_node', SEP, - 'install_sfa', 'configure_sfa', 'cross_configure_sfa', 'import_sfa', 'start_sfa', SEPSFA, - 'configure_sfi@1', 'add_sfa_user@1', 'add_sfa@1', 'create_sfa@1', SEPSFA, - 'update_sfa_user@1', 'update_sfa@1', 'view_sfa@1', SEPSFA, - # better use of time: do this now that the nodes are taking off - 'plcsh_stress_test', SEP, - 'nodes_ssh_debug', 'nodes_ssh_boot', 'check_slice', 'check_initscripts', SEPSFA, - 'check_slice_sfa@1', 'delete_sfa_user@1', 'delete_sfa_slices@1', SEPSFA, - 'check_tcp', 'check_hooks', SEP, - 'force_gather_logs', 'force_resources_post', SEP, + 'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', 'qemu_export', 'qemu_kill_all', 'qemu_start', SEP, + 'sfa_install', 'sfa_configure', 'cross_sfa_configure', 'sfa_import', 'sfa_start', 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_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA, + 'check_tcp', SEP, + 'force_gather_logs', 'force_local_post', SEP, ] other_steps = [ - 'show_boxes', 'resources_list','resources_release','resources_release_plc','resources_release_qemu',SEP, - 'stop', 'vs_start', SEP, - 'clean_initscripts', 'clean_nodegroups','clean_all_sites', SEP, - 'clean_sites', 'clean_nodes', 'clean_slices', 'clean_keys', SEP, - 'clean_leases', 'list_leases', SEP, + 'check_hooks', + 'free_all', + 'show_boxes', 'local_list','local_rel','local_rel_plc','local_rel_qemu',SEP, + '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, - 'list_all_qemus', 'list_qemus', 'kill_qemus', SEP, - 'plcclean_sfa', 'dbclean_sfa', 'stop_sfa','uninstall_sfa', 'clean_sfi', SEP, - 'db_dump' , 'db_restore', SEP, + 'nodestate_show','nodestate_safeboot','nodestate_boot', SEP, + 'qemu_list_all', 'qemu_list_mine', 'qemu_kill_mine', SEP, + 'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEP, + 'plc_db_dump' , 'plc_db_restore', SEP, 'standby_1 through 20',SEP, ] @@ -169,6 +174,9 @@ class TestPlc: def start_guest (self): return utils.system(self.test_ssh.actual_command(self.start_guest_in_host())) + def stop_guest (self): + return utils.system(self.test_ssh.actual_command(self.stop_guest_in_host())) + def run_in_guest (self,command): return utils.system(self.actual_command_in_guest(command)) @@ -179,10 +187,13 @@ class TestPlc: def host_to_guest(self,command): return "vserver %s exec %s"%(self.vservername,command) - #command gets run in the vserver + #start/stop the vserver def start_guest_in_host(self): return "vserver %s start"%(self.vservername) + def stop_guest_in_host(self): + return "vserver %s stop"%(self.vservername) + # xxx quick n dirty 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)) @@ -285,25 +296,25 @@ class TestPlc: return True # make this a valid step - def kill_all_qemus(self): + def qemu_kill_all(self): 'kill all qemu instances on the qemu boxes involved by this setup' # this is the brute force version, kill all qemus on that host box for (box,nodes) in self.gather_hostBoxes().iteritems(): # pass the first nodename, as we don't push template-qemu on testboxes nodedir=nodes[0].nodedir() - TestBox(box,self.options.buildname).kill_all_qemus(nodedir) + TestBoxQemu(box,self.options.buildname).qemu_kill_all(nodedir) return True # make this a valid step - def list_all_qemus(self): + def qemu_list_all(self): 'list all qemu instances on the qemu boxes involved by this setup' for (box,nodes) in self.gather_hostBoxes().iteritems(): # this is the brute force version, kill all qemus on that host box - TestBox(box,self.options.buildname).list_all_qemus() + TestBoxQemu(box,self.options.buildname).qemu_list_all() return True # kill only the right qemus - def list_qemus(self): + def qemu_list_mine(self): 'list qemu instances for our nodes' for (box,nodes) in self.gather_hostBoxes().iteritems(): # the fine-grain version @@ -312,7 +323,7 @@ class TestPlc: return True # kill only the right qemus - def kill_qemus(self): + def qemu_kill_mine(self): 'kill the qemu instances for our nodes' for (box,nodes) in self.gather_hostBoxes().iteritems(): # the fine-grain version @@ -321,7 +332,7 @@ class TestPlc: return True #################### display config - def display (self): + def show (self): "show test configuration after localization" self.display_pass (1) self.display_pass (2) @@ -430,37 +441,37 @@ class TestPlc: print '+\tqemu box %s'%node_spec['host_box'] print '+\thostname=%s'%node_spec['node_fields']['hostname'] - def resources_pre (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 resources_post (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 resources_list (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 resources_release (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 resources_release_plc (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 resources_release_qemu (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 delete_vs(self): + def vs_delete(self): "vserver delete the test myplc" self.run_in_host("vserver --silent %s delete"%self.vservername) return True @@ -469,7 +480,7 @@ class TestPlc: # historically the build was being fetched by the tests # now the build pushes itself as a subdir of the tests workdir # so that the tests do not have to worry about extracting the build (svn, git, or whatever) - def create_vs (self): + def vs_create (self): "vserver creation (no install done)" # push the local build/ dir to the testplc box if self.is_local(): @@ -508,7 +519,7 @@ class TestPlc: return self.run_in_host(create_vserver) == 0 ### install_rpm - def install(self): + def plc_install(self): "yum install myplc, noderepo, and the plain bootstrapfs" # workaround for getting pgsql8.2 on centos5 @@ -534,7 +545,7 @@ class TestPlc: return self.run_in_guest("rpm -q %s"%pkgs_string)==0 ### - def configure(self): + def plc_configure(self): "run plc-config-tty" tmpname='%s.plc-config-tty'%(self.name()) fileconf=open(tmpname,'w') @@ -554,6 +565,7 @@ class TestPlc: 'PLC_NET_DNS2', 'PLC_RESERVATION_GRANULARITY', 'PLC_OMF_ENABLED', + 'PLC_OMF_XMPP_SERVER', ]: fileconf.write ('e %s\n%s\n'%(var,self.plc_spec[var])) fileconf.write('w\n') @@ -564,12 +576,12 @@ class TestPlc: utils.system('rm %s'%tmpname) return True - def start(self): + def plc_start(self): "service plc start" self.run_in_guest('service plc start') return True - def stop(self): + def plc_stop(self): "service plc stop" self.run_in_guest('service plc stop') return True @@ -579,20 +591,26 @@ class TestPlc: self.start_guest() return True + def vs_stop (self): + "stop the PLC vserver" + self.stop_guest() + return True + # stores the keys from the config for further use - def store_keys(self): + def keys_store(self): "stores test users ssh keys in keys/" for key_spec in self.plc_spec['keys']: TestKey(self,key_spec).store_key() return True - def clean_keys(self): + def keys_clean(self): "removes keys cached in keys/" - utils.system("rm -rf %s/keys/"%os.path(sys.argv[0])) + utils.system("rm -rf ./keys") + return True # fetches the ssh keys in the plc's /etc/planetlab and stores them in keys/ # for later direct access to the nodes - def fetch_keys(self): + def keys_fetch(self): "gets ssh keys in /etc/planetlab/ and stores them locally in keys/" dir="./keys" if not os.path.isdir(dir): @@ -610,7 +628,7 @@ class TestPlc: "create sites with PLCAPI" return self.do_sites() - def clean_sites (self): + def delete_sites (self): "delete sites with PLCAPI" return self.do_sites(action="delete") @@ -629,18 +647,19 @@ class TestPlc: test_site.create_users() return True - def clean_all_sites (self): + def delete_all_sites (self): "Delete all sites in PLC, and related objects" print 'auth_root',self.auth_root() site_ids = [s['site_id'] for s in self.apiserver.GetSites(self.auth_root(), {}, ['site_id'])] for site_id in site_ids: print 'Deleting site_id',site_id self.apiserver.DeleteSite(self.auth_root(),site_id) + return True def nodes (self): "create nodes with PLCAPI" return self.do_nodes() - def clean_nodes (self): + def delete_nodes (self): "delete nodes with PLCAPI" return self.do_nodes(action="delete") @@ -664,7 +683,7 @@ class TestPlc: def nodegroups (self): "create nodegroups with PLCAPI" return self.do_nodegroups("add") - def clean_nodegroups (self): + def delete_nodegroups (self): "delete nodegroups with PLCAPI" return self.do_nodegroups("delete") @@ -711,7 +730,7 @@ class TestPlc: return ok - def clean_leases (self): + def delete_leases (self): "remove all leases in the myplc side" lease_ids= [ l['lease_id'] for l in self.apiserver.GetLeases(self.auth_root())] utils.header("Cleaning leases %r"%lease_ids) @@ -759,8 +778,7 @@ class TestPlc: tag_type_id = self.apiserver.AddTagType(auth, {'tagname':nodegroupname, 'description': 'for nodegroup %s'%nodegroupname, - 'category':'test', - 'min_role_id':10}) + 'category':'test'}) print 'located tag (type)',nodegroupname,'as',tag_type_id # create nodegroup nodegroups = self.apiserver.GetNodeGroups (auth, {'groupname':nodegroupname}) @@ -908,16 +926,16 @@ class TestPlc: # only useful in empty plcs return True - def nodes_ssh_debug(self): + def ssh_node_debug(self): "Tries to ssh into nodes in debug mode with the debug ssh key" return self.check_nodes_ssh(debug=True,timeout_minutes=10,silent_minutes=5) - def nodes_ssh_boot(self): + def ssh_node_boot(self): "Tries to ssh into nodes in production mode with the root ssh key" return self.check_nodes_ssh(debug=False,timeout_minutes=40,silent_minutes=15) @node_mapper - def init_node (self): + def qemu_local_init (self): "all nodes : init a clean local directory for holding node-dep stuff like iso image..." pass @node_mapper @@ -925,15 +943,27 @@ class TestPlc: "all nodes: invoke GetBootMedium and store result locally" pass @node_mapper - def configure_qemu (self): + def qemu_local_config (self): "all nodes: compute qemu config qemu.conf and store it locally" pass @node_mapper - def reinstall_node (self): + def nodestate_reinstall (self): "all nodes: mark PLCAPI boot_state as reinstall" pass @node_mapper - def export_qemu (self): + def nodestate_safeboot (self): + "all nodes: mark PLCAPI boot_state as safeboot" + pass + @node_mapper + def nodestate_boot (self): + "all nodes: mark PLCAPI boot_state as boot" + pass + @node_mapper + def nodestate_show (self): + "all nodes: show PLCAPI boot_state" + pass + @node_mapper + def qemu_export (self): "all nodes: push local node-dep directory on the qemu box" pass @@ -951,9 +981,9 @@ class TestPlc: def do_check_initscripts(self): overall = True for slice_spec in self.plc_spec['slices']: - if not slice_spec.has_key('initscriptname'): + if not slice_spec.has_key('initscriptstamp'): continue - initscript=slice_spec['initscriptname'] + stamp=slice_spec['initscriptstamp'] for nodename in slice_spec['nodenames']: (site,node) = self.locate_node (nodename) # xxx - passing the wrong site - probably harmless @@ -961,7 +991,7 @@ class TestPlc: test_slice = TestSlice (self,test_site,slice_spec) test_node = TestNode (self,test_site,node) test_sliver = TestSliver (self, test_node, test_slice) - if not test_sliver.check_initscript(initscript): + if not test_sliver.check_initscript_stamp(stamp): overall = False return overall @@ -976,7 +1006,7 @@ class TestPlc: self.apiserver.AddInitScript(self.auth_root(),initscript['initscript_fields']) return True - def clean_initscripts (self): + def delete_initscripts (self): "delete initscripts with PLCAPI" for initscript in self.plc_spec['initscripts']: initscript_name = initscript['initscript_fields']['name'] @@ -993,7 +1023,7 @@ class TestPlc: "create slices with PLCAPI" return self.do_slices() - def clean_slices (self): + def delete_slices (self): "delete slices with PLCAPI" return self.do_slices("delete") @@ -1012,17 +1042,17 @@ class TestPlc: return True @slice_mapper - def check_slice(self): + def ssh_slice(self): "tries to ssh-enter the slice with the user key, to ensure slice creation" pass @node_mapper - def clear_known_hosts (self): + def keys_clear_known_hosts (self): "remove test nodes entries from the local known_hosts file" pass @node_mapper - def start_node (self) : + def qemu_start (self) : "all nodes: start the qemu instance (also runs qemu-bridge-init start)" pass @@ -1060,20 +1090,20 @@ class TestPlc: # in particular runs with --preserve (dont cleanup) and without --check # also it gets run twice, once with the --foreign option for creating fake foreign entries - ### install_sfa_rpm - def install_sfa(self): + ### 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 - def dbclean_sfa(self): + def sfa_dbclean(self): "thoroughly wipes off the SFA database" self.run_in_guest("sfa-nuke-plc.py")==0 return True - def plcclean_sfa(self): + def sfa_plcclean(self): "cleans the PLC entries that were created as a side effect of running the script" # ignore result sfa_spec=self.plc_spec['sfa'] @@ -1086,10 +1116,10 @@ class TestPlc: try: self.apiserver.DeletePerson(self.auth_root(),username) except: print "User %s already absent from PLC db"%username - print "REMEMBER TO RUN import_sfa AGAIN" + print "REMEMBER TO RUN sfa_import AGAIN" return True - def uninstall_sfa(self): + def sfa_uninstall(self): "uses rpm to uninstall sfa - ignore result" self.run_in_guest("rpm -e sfa sfa-sfatables sfa-client sfa-plc") self.run_in_guest("rm -rf /var/lib/sfa") @@ -1099,6 +1129,25 @@ class TestPlc: self.run_in_guest("rpm -e --noscripts sfa-plc") return True + ### run unit tests for SFA + # NOTE: for some reason on f14/i386, yum install sfa-tests fails for no reason + # Running Transaction + # Transaction couldn't start: + # installing package sfa-tests-1.0-21.onelab.i686 needs 204KB on the / filesystem + # [('installing package sfa-tests-1.0-21.onelab.i686 needs 204KB on the / filesystem', (9, '/', 208896L))] + # no matter how many Gbs are available on the testplc + # could not figure out what's wrong, so... + # if the yum install phase fails, consider the test is successful + # other combinations will eventually run it hopefully + def sfa_utest(self): + "yum install sfa-tests and run SFA unittests" + self.run_in_guest("yum -y install sfa-tests") + # failed to install - forget it + if self.run_in_guest("rpm -q sfa-tests")!=0: + utils.header("WARNING: SFA unit tests failed to install, ignoring") + return True + return self.run_in_guest("/usr/share/sfa/tests/testAll.py")==0 + ### def confdir(self): dirname="conf.%s"%self.plc_spec['name'] @@ -1110,13 +1159,13 @@ class TestPlc: def conffile(self,filename): return "%s/%s"%(self.confdir(),filename) - def confsubdir(self,dirname,clean): + def confsubdir(self,dirname,clean,dry_run=False): subdirname="%s/%s"%(self.confdir(),dirname) if clean: utils.system("rm -rf %s"%subdirname) if not os.path.isdir(subdirname): utils.system("mkdir -p %s"%subdirname) - if not os.path.isdir(subdirname): + if not dry_run and not os.path.isdir(subdirname): raise "Cannot create config subdir %s for plc %s"%(dirname,self.name()) return subdirname @@ -1125,7 +1174,7 @@ class TestPlc: return utils.system("rm -rf %s"%filename)==0 ### - def configure_sfa(self): + def sfa_configure(self): "run sfa-config-tty" tmpname=self.conffile("sfa-config-tty") fileconf=open(tmpname,'w') @@ -1157,8 +1206,9 @@ class TestPlc: return True def aggregate_xml_line(self): - return '' % \ - (self.vserverip,self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']) + port=self.plc_spec['sfa']['neighbours-port'] + return '' % \ + (self.vserverip,self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'],port) def registry_xml_line(self): return '' % \ @@ -1166,7 +1216,8 @@ class TestPlc: # a cross step that takes all other plcs in argument - def cross_configure_sfa(self, other_plcs): + def cross_sfa_configure(self, other_plcs): + "writes aggregates.xml and registries.xml that point to all other PLCs in the test" # of course with a single plc, other_plcs is an empty list if not other_plcs: return True @@ -1181,21 +1232,22 @@ class TestPlc: return self.test_ssh.copy_abs(agg_fname,'/vservers/%s/etc/sfa/aggregates.xml'%self.vservername)==0 \ and self.test_ssh.copy_abs(reg_fname,'/vservers/%s/etc/sfa/registries.xml'%self.vservername)==0 - def import_sfa(self): + def sfa_import(self): "sfa-import-plc" auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'] return self.run_in_guest('sfa-import-plc.py')==0 # not needed anymore # self.run_in_guest('cp /etc/sfa/authorities/%s/%s.pkey /etc/sfa/authorities/server.key'%(auth,auth)) - def start_sfa(self): + def sfa_start(self): "service sfa start" return self.run_in_guest('service sfa start')==0 - def configure_sfi(self): + def sfi_configure(self): + "Create /root/.sfi on the plc side for sfi client configuration" sfa_spec=self.plc_spec['sfa'] - "sfi client configuration" - dir_name=self.confsubdir("dot-sfi",clean=True) + 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']) @@ -1255,32 +1307,45 @@ class TestPlc: return True - def clean_sfi (self): + def sfi_clean (self): + "clean up /root/.sfi on the plc side" self.run_in_guest("rm -rf /root/.sfi") return True - def add_sfa_user(self): + def sfa_add_user(self): + "run sfi.py add using person.xml" return TestUserSfa(self).add_user() + def sfa_update_user(self): + "run sfi.py update using person.xml" + return TestUserSfa(self).update_user() + @slice_sfa_mapper - def add_sfa(self): - "run sfi.py add (on Registry)" + def sfa_add_slice(self): + "run sfi.py add (on Registry) from slice.xml" pass @slice_sfa_mapper - def create_sfa(self): - "run sfi.py create (on SM) for 1st-time creation" + def sfa_discover(self): + "discover resources into resouces_in.rspec" pass - def update_sfa_user(self): - return TestUserSfa(self).update_user() + @slice_sfa_mapper + def sfa_create_slice(self): + "run sfi.py create (on SM) - 1st time" + pass + + @slice_sfa_mapper + def sfa_check_slice_plc(self): + "check sfa_create_slice at the plcs - all local nodes should be in slice" + pass @slice_sfa_mapper - def update_sfa(self): + def sfa_update_slice(self): "run sfi.py create (on SM) on existing object" pass - def view_sfa(self): + 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'] @@ -1291,21 +1356,21 @@ class TestPlc: self.run_in_guest("sfi.py -d /root/.sfi/ resources -o resources")==0 @slice_sfa_mapper - def check_slice_sfa(self): + def ssh_slice_sfa(self): "tries to ssh-enter the SFA slice" pass - def delete_sfa_user(self): + def sfa_delete_user(self): "run sfi.py delete (on SM) for user" test_user_sfa=TestUserSfa(self) return test_user_sfa.delete_user() @slice_sfa_mapper - def delete_sfa_slices(self): + def sfa_delete_slice(self): "run sfi.py delete (on SM), sfi.py remove (on Registry) to clean slices" pass - def stop_sfa(self): + def sfa_stop(self): "service sfa stop" self.run_in_guest('service sfa stop')==0 return True @@ -1399,14 +1464,14 @@ class TestPlc: name=str(d) return "/root/%s-%s.sql"%(database,name) - def db_dump(self): + def plc_db_dump(self): 'dump the planetlab5 DB in /root in the PLC - filename has time' dump=self.dbfile("planetab5") self.run_in_guest('pg_dump -U pgsqluser planetlab5 -f '+ dump) utils.header('Dumped planetlab5 database in %s'%dump) return True - def db_restore(self): + def plc_db_restore(self): 'restore the planetlab5 DB - looks broken, but run -n might help' dump=self.dbfile("planetab5") ##stop httpd service