X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSliceSfa.py;h=eba256d432bd9d23ed27347d2ad547b807b50a2e;hb=127cb9ef78ef452eddd84541b0f6a7cf2c11c262;hp=7731f869637d4f3a23b1c843be3dd28f91b08916;hpb=07d6d9c2d137dcdc88b789b137d751501469d623;p=tests.git diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py index 7731f86..eba256d 100644 --- a/system/TestSliceSfa.py +++ b/system/TestSliceSfa.py @@ -2,17 +2,19 @@ # Copyright (C) 2010 INRIA # +import os.path import time from datetime import datetime, timedelta +import json +import traceback 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 +from TestSlice import CompleterTaskSliceSsh class TestSliceSfa: @@ -22,11 +24,13 @@ 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) @@ -38,39 +42,66 @@ class TestSliceSfa: # 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.now() + timedelta(weeks=52) - one_month = datetime.now() + 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") def reqfile (self): return self._resname("req","rspec") + def empty_reqfile (self): return "empty-rspec.xml" def nodefile (self): return self._resname("nodes","txt") # run as user @@ -79,26 +110,41 @@ class TestSliceSfa: return self.test_plc.run_in_guest(self.sfi_user(\ "resources %s -o %s/%s"% (self.discover_option(),self.sfi_path(),self.adfile())))==0 - # run sfi create as a regular user - def sfa_create_slice(self,options): - "run sfi create (on SM) - 1st time" + def sfa_rspec(self,options): + "invoke sfiListNodes and sfiAddSlivers to prepare a rspec" commands=[ "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("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 _sfa_allocate(self,file,options): + command=self.sfi_user("allocate %s %s"%(self.hrn(),file)) + return self.test_plc.run_in_guest(command)==0 + + def sfa_allocate(self,options): + "invoke run sfi allocate (on SM)" + return self._sfa_allocate(self.reqfile(),options) + def sfa_allocate_empty(self,options): + "invoke run sfi allocate (on SM) with an empty rspec" + return self._sfa_allocate(self.empty_reqfile(),options) + + def sfa_provision(self,options): + "invoke run sfi provision (on SM)" + command=self.sfi_user("provision %s"%(self.hrn())) + return self.test_plc.run_in_guest(command)==0 + # just a synonym + sfa_provision_empty = sfa_provision + 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" + "check the slice has been created at the plc - all local nodes should be in slice" 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 @@ -110,10 +156,20 @@ class TestSliceSfa: result=False return result - # actually the same for now + # no node left in slice ? + def sfa_check_slice_plc_empty (self,options): + "check the slice have been emptied at the plcs - no node should be in slice" + slices=self.test_plc.apiserver.GetSlices(self.test_plc.auth_root(), + self.plc_name(), + ['node_ids']) + return not slices[0]['node_ids'] + + # xxx historically this used to do the same as sfa-create-slice + # which was later on split into 3 distinct steps, + # and we can ignore the first that is about setting up the rspec def sfa_update_slice(self,options): - "run sfi create (on SM) on existing object" - return self.sfa_create_slice(options) + "re-run sfi allocate and provision (on SM) on existing object" + return self.sfa_allocate(options) and self.sfa_provision(options) # run as pi def sfa_delete_slice(self,options): @@ -142,6 +198,6 @@ class TestSliceSfa: dry_run = getattr(options,'dry_run',False) for nodename in self.slice_spec['nodenames']: (site_spec,node_spec) = self.test_plc.locate_node(nodename) - tasks.append( CompleterTaskSshSlice(self.test_plc,node_spec['node_fields']['hostname'], + 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)