X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSliceSfa.py;h=e063e64570994509872303f70b864de80f54a958;hb=a6066ab7e04f4f473370b5fc3fbbba0d9b1b292e;hp=112aaec18e090ddae7c4abbd7a26cf732df67fe6;hpb=12d5d34e42cbabd96f2104e9a98eeebffb521a3d;p=tests.git

diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index 112aaec..e063e64 100644
--- a/system/TestSliceSfa.py
+++ b/system/TestSliceSfa.py
@@ -37,14 +37,34 @@ class TestSliceSfa:
 
     # 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")
@@ -71,7 +91,7 @@ class TestSliceSfa:
         return True
 
     def plc_name (self):
-        return "%s_%s"%(self.test_auth_sfa.login_base,self.slice_spec['name'])
+        return "%s_%s"%(self.test_auth_sfa.login_base,self.hrn())
 
     # all local nodes in slice ?
     def sfa_check_slice_plc (self,options):