X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSliceSfa.py;h=5de9f780694442069282ce6df3869f722d5a3184;hb=5d45fc9b92d7ea2645986c91ef7d068a6ee55729;hp=c9fd2ab5de7bfb54befea17bc9c1c9190fa7cbd4;hpb=bf0b0ce91c7ea3881139b1d8221a03beae4dabd5;p=tests.git diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py index c9fd2ab..5de9f78 100644 --- a/system/TestSliceSfa.py +++ b/system/TestSliceSfa.py @@ -2,13 +2,17 @@ # Copyright (C) 2010 INRIA # -import datetime +import time +from datetime import datetime, timedelta import utils +from TestNode import TestNode from TestUser import TestUser from TestBoxQemu import TestBoxQemu from TestSsh import TestSsh +from Completer import Completer, CompleterTask +from TestSlice import CompleterTaskSshSlice class TestSliceSfa: @@ -18,9 +22,10 @@ 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 rspec_style (self): return self.test_auth_sfa.rspec_style() @@ -28,21 +33,41 @@ class TestSliceSfa: 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) from slice.xml" - 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.qualified(self.slice_spec['name']) - for opt in self.slice_spec['sfi_options']: + sfi_command += " --xrn %s"%self.hrn() + 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.now() + timedelta(weeks=52) + one_month = datetime.now() + timedelta(weeks=4) + # 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") + 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: + sfi_command="show -k hrn -k expires %s"%self.hrn() + self.test_plc.run_in_guest(self.sfi_user(sfi_command)) + return overall + # 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") @@ -62,18 +87,20 @@ class TestSliceSfa: "sfiListNodes.py -i %s/%s -o %s/%s"%(self.sfi_path(),self.adfile(),self.sfi_path(),self.nodefile()), "sfiAddSliver.py -i %s/%s -n %s/%s -o %s/%s"%\ (self.sfi_path(),self.adfile(),self.sfi_path(),self.nodefile(),self.sfi_path(),self.reqfile()), - self.sfi_user("create %s %s"%(self.hrn(),self.reqfile())), + self.sfi_user("allocate %s %s"%(self.hrn(),self.reqfile())), + self.sfi_user("provision %s"%(self.hrn())), ] for command in commands: if self.test_plc.run_in_guest(command)!=0: return False return True + def plc_name (self): + return "%s_%s"%(self.test_auth_sfa.login_base,self.slice_spec['name']) + # all local nodes in slice ? def sfa_check_slice_plc (self,options): "check sfa_create_slice at the plcs - all local nodes should be in slice" - login_base=self.test_auth_sfa.login_base - slice_name = "%s_%s"%(login_base,self.slice_spec['name']) - slice=self.test_plc.apiserver.GetSlices(self.test_plc.auth_root(), slice_name)[0] + slice=self.test_plc.apiserver.GetSlices(self.test_plc.auth_root(), self.plc_name())[0] nodes=self.test_plc.apiserver.GetNodes(self.test_plc.auth_root(), {'peer_id':None}) result=True for node in nodes: @@ -95,61 +122,27 @@ class TestSliceSfa: self.test_plc.run_in_guest(self.sfi_pi("delete %s"%(self.hrn(),))) return self.test_plc.run_in_guest(self.sfi_pi("remove -t slice %s"%(self.hrn(),)))==0 + def locate_private_key(self): + 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 - (found,remote_privatekey)=self.locate_key() - if not found : - utils.header("WARNING: Cannot find a valid key for slice %s"%self.plc_name()) + 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=[] - for nodename in self.auth_sfa_spec['nodenames']: + 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=remote_privatekey,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( CompleterTaskSshSlice(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)