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"
+ "run sfi add (on Registry)"
sfi_command="add"
sfi_command += " --type slice"
- sfi_command += " --xrn %s"%self.qualified(self.slice_spec['name'])
+ sfi_command += " --xrn %s"%self.hrn()
for opt in self.slice_spec['add_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)
+ # 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")
"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