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

[tests.git] / system / TestSliceSfa.py

diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index 7731f86..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
@@ -12,7 +15,7 @@ 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 +25,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,35 +43,61 @@ 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")
@@ -142,6 +173,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)