new step sfa_get_expires is able to retrieve the actual expires timeout in a slice

needs to be welded in sfa_renew_slice so we really check renew does what is expected

diff --git a/system/TestAuthSfa.py b/system/TestAuthSfa.py
index 857a7ac..4ec2dbf 100644 (file)
--- a/system/TestAuthSfa.py
+++ b/system/TestAuthSfa.py
@@ -186,6 +186,8 @@ class TestAuthSfa:
     @slice_sfa_mapper
     def sfa_renew_slice (self, *args, **kwds): pass
     @slice_sfa_mapper
+    def sfa_get_expires (self, *args, **kwds): pass
+    @slice_sfa_mapper
     def sfa_discover (self, *args, **kwds): pass
     @slice_sfa_mapper
     def sfa_create_slice (self, *args, **kwds): pass

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 5d6268b..88b7feb 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -179,6 +179,7 @@ class TestPlc:
         'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP,
        'sfa_install_core', 'sfa_install_sfatables', 'sfa_install_plc', 'sfa_install_client', SEPSFA,
         'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA,
+        'sfa_get_expires', SEPSFA,
         'plc_db_dump' , 'plc_db_restore', SEP,
         'check_netflow','check_drl', SEP,
         'debug_nodemanager', 'slice_fs_present', SEP,
@@ -1589,6 +1590,8 @@ class TestPlc:
     @auth_sfa_mapper
     def sfa_renew_slice(self): pass
     @auth_sfa_mapper
+    def sfa_get_expires(self): pass
+    @auth_sfa_mapper
     def sfa_discover(self): pass
     @auth_sfa_mapper
     def sfa_create_slice(self): pass

diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index a652d3c..5f1b266 100644 (file)
--- a/system/TestSliceSfa.py
+++ b/system/TestSliceSfa.py
@@ -2,8 +2,11 @@
 # Copyright (C) 2010 INRIA 
 #
 
+import os.path
 import time
 from datetime import datetime, timedelta
+import json
+import traceback
 
 import utils
 from TestNode import TestNode
@@ -28,6 +31,7 @@ class TestSliceSfa:
         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)
@@ -50,24 +54,50 @@ class TestSliceSfa:
 
     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")