X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSliceSfa.py;h=5f1b266f1dc268f7baba91f74f6df4438c1931ac;hb=a6052cf6c6ab46ef415ad488cd95f9807c9edf54;hp=2d270c6f3a1e0e1255c30799c440af8fdd5ff8c2;hpb=221ca28d2f1f2cc5667ed54cf7ffa5b86f59e3fc;p=tests.git diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py index 2d270c6..5f1b266 100644 --- a/system/TestSliceSfa.py +++ b/system/TestSliceSfa.py @@ -2,8 +2,11 @@ # Copyright (C) 2010 INRIA # +import os.path import time -import datetime +from datetime import datetime, timedelta +import json +import traceback import utils from TestNode import TestNode @@ -11,6 +14,8 @@ from TestUser import TestUser from TestBoxQemu import TestBoxQemu from TestSsh import TestSsh +from Completer import Completer, CompleterTask +from TestSlice import CompleterTaskSliceSsh class TestSliceSfa: @@ -20,51 +25,79 @@ class TestSliceSfa: # shortcuts self.test_plc=self.test_auth_sfa.test_plc - def qualified(self,name): return self.test_auth_sfa.qualified(name) - def hrn (self): return self.qualified(self.slice_spec['name']) - def sfi_path (self): return self.test_auth_sfa.sfi_path() + def hrn (self): + return self.test_auth_sfa.obj_hrn(self.slice_spec['name']) + def sfi_path (self): + return self.test_auth_sfa.sfi_path() # send back up to the TestAuthSfa + def sfi_path (self): return self.test_auth_sfa.sfi_path() def rspec_style (self): return self.test_auth_sfa.rspec_style() def sfi_pi(self,*args,**kwds): return self.test_auth_sfa.sfi_pi(*args, **kwds) def sfi_user(self,*args,**kwds): return self.test_auth_sfa.sfi_user(*args, **kwds) def discover_option(self): - if self.rspec_style()=='pg': return "-r protogeni" + if self.rspec_style()=='pg': return "-r GENI" else: return "-r sfa" # those are step names exposed as methods of TestPlc, hence the _sfa # needs to be run as pi - def sfa_add_slice(self,options): - "run sfi add (on Registry)" - sfi_command="add" + def sfa_register_slice(self,options): + "run sfi register (on Registry)" + sfi_command="register" sfi_command += " --type slice" sfi_command += " --xrn %s"%self.hrn() - for opt in self.slice_spec['add_options']: + for opt in self.slice_spec['register_options']: sfi_command += " %s"%(opt) return self.test_plc.run_in_guest(self.sfi_pi(sfi_command))==0 def sfa_renew_slice(self, options): "run sfi renew (on Aggregates)" - too_late = datetime.datetime.now()+datetime.timedelta(weeks=52) - one_month = datetime.datetime.now()+datetime.timedelta(weeks=4) +# too_late = (datetime.now() + timedelta(weeks=52)).strftime("%Y-%m-%d") + one_month = (datetime.now() + timedelta(weeks=4)).strftime("%Y-%m-%d") + too_late = "+12m" +# one_month = "+4w" # we expect this to fail on too long term attemps, but to succeed otherwise overall=True for ( renew_until, expected) in [ (too_late, False), (one_month, True) ] : sfi_command="renew" sfi_command += " %s"%self.hrn() - sfi_command += " %s"%renew_until.strftime("%Y-%m-%d") + sfi_command += " %s"%renew_until succeeded = self.test_plc.run_in_guest(self.sfi_user(sfi_command))==0 if succeeded!=expected: utils.header ("Expecting success=%s, got %s"%(expected,succeeded)) # however it turns out sfi renew always returns fine.... #overall=False # so for helping manual checks: + # xxx this should use sfa_get_expires below and actually check the expected result sfi_command="show -k hrn -k expires %s"%self.hrn() self.test_plc.run_in_guest(self.sfi_user(sfi_command)) return overall + def sfa_get_expires (self, options): + filename="%s.json"%self.hrn() + # /root/sfi/pg/<> + inplc_filename=os.path.join(self.sfi_path(),filename) + # /vservers/<>/root/sfi/... - cannot use os.path + inbox_filename="%s%s"%(self.test_plc.vm_root_in_host(),inplc_filename) + sfi_command ="" + sfi_command += "-R %s --rawformat json"%inplc_filename + sfi_command += " status" + sfi_command += " %s"%self.hrn() + # cannot find it if sfi status returns an error + if self.test_plc.run_in_guest (self.sfi_user(sfi_command)) !=0: return + if self.test_plc.test_ssh.fetch(inbox_filename,filename)!=0: return + try: + with file(filename) as f: status = json.loads(f.read()) + value=status['value'] + sliver=value['geni_slivers'][0] + expires=sliver['geni_expires'] + print " * expiration for %s (first sliver) -> %s"%(self.hrn(),expires) + return expires + except: + traceback.print_exc() + # helper - filename to store a given result def _resname (self,name,ext): return "%s.%s"%(name,ext) def adfile (self): return self._resname("ad","rspec") @@ -123,60 +156,23 @@ class TestSliceSfa: return self.test_plc.locate_private_key_from_key_names ( [ self.slice_spec['key_name'] ] ) # check the resulting sliver - def ssh_slice_sfa(self,options,timeout_minutes=40,silent_minutes=30,period=15): + def ssh_slice_sfa(self,options,timeout_minutes=40,silent_minutes=0,period_seconds=15): "tries to ssh-enter the SFA slice" - timeout = datetime.datetime.now()+datetime.timedelta(minutes=timeout_minutes) - graceout = datetime.datetime.now()+datetime.timedelta(minutes=silent_minutes) + timeout = timedelta(minutes=timeout_minutes) + graceout = timedelta(minutes=silent_minutes) + period = timedelta(seconds=period_seconds) # 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()) return False - - # convert nodenames to real hostnames - restarted=[] - tocheck=[] + command="echo hostname ; hostname; echo id; id; echo uname -a ; uname -a" + + tasks=[] + slicename=self.plc_name() + dry_run = getattr(options,'dry_run',False) for nodename in self.slice_spec['nodenames']: (site_spec,node_spec) = self.test_plc.locate_node(nodename) - tocheck.append(node_spec['node_fields']['hostname']) - - utils.header("checking ssh access into slice %s on nodes %r"%(self.plc_name(),tocheck)) - utils.header("max timeout is %d minutes, silent for %d minutes (period is %s)"%\ - (timeout_minutes,silent_minutes,period)) - while tocheck: - for hostname in tocheck: - (site_spec,node_spec) = self.test_plc.locate_hostname(hostname) - date_test_ssh = TestSsh (hostname,key=private_key,username=self.plc_name()) - command = date_test_ssh.actual_command("echo hostname ; hostname; echo id; id; echo uname -a ; uname -a") - date = utils.system (command, silent=datetime.datetime.now() < graceout) - if date==0: - utils.header("Successfuly entered slice %s on %s"%(self.plc_name(),hostname)) - tocheck.remove(hostname) - else: - # real nodes will have been checked once in case they're up - skip if not - if TestNode.is_real_model(node_spec['node_fields']['model']): - utils.header("WARNING : Checking slice %s on real node %s skipped"%(self.plc_name(),hostname)) - tocheck.remove(hostname) - # nm restart after first failure, if requested - if options.forcenm and hostname not in restarted: - utils.header ("forcenm option : restarting nm on %s"%hostname) - restart_test_ssh=TestSsh(hostname,key="keys/key_admin.rsa") - access=restart_test_ssh.actual_command('service nm restart') - if (access==0): - utils.header('nm restarted on %s'%hostname) - else: - utils.header('Failed to restart nm on %s'%(hostname)) - restarted.append(hostname) - if not tocheck: - # we're done - return True - if datetime.datetime.now() > timeout: - for hostname in tocheck: - utils.header("FAILURE to ssh into %s@%s"%(self.plc_name(),hostname)) - return False - # wait for the period - time.sleep (period) - # for an empty slice - return True - - + tasks.append( CompleterTaskSliceSsh(self.test_plc,node_spec['node_fields']['hostname'], + slicename,private_key,command,expected=True,dry_run=dry_run)) + return Completer (tasks).run (timeout, graceout, period)