towards testing sfa federation

[tests.git] / system / TestPlc.py

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 1246fa1..8671fca 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -1,4 +1,6 @@
-# $Id$
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
 import os, os.path
 import datetime
 import time
@@ -535,8 +537,9 @@ class TestPlc:
         tmpname='%s.plc-config-tty'%(self.name())
         fileconf=open(tmpname,'w')
         for var in [ 'PLC_NAME',
-                     'PLC_ROOT_PASSWORD',
                      'PLC_ROOT_USER',
+                     'PLC_ROOT_PASSWORD',
+                     'PLC_SLICE_PREFIX',
                      'PLC_MAIL_ENABLED',
                      'PLC_MAIL_SUPPORT_ADDRESS',
                      'PLC_DB_HOST',
@@ -665,8 +668,8 @@ class TestPlc:
 
     YEAR = 365*24*3600
     @staticmethod
-    def translate_timestamp (start,timestamp):
-        if timestamp < TestPlc.YEAR:    return start+timestamp
+    def translate_timestamp (start,grain,timestamp):
+        if timestamp < TestPlc.YEAR:    return start+timestamp*grain
         else:                           return timestamp
 
     @staticmethod
@@ -677,8 +680,9 @@ class TestPlc:
         "create leases (on reservable nodes only, use e.g. run -c default -c resa)"
         now=int(time.time())
         grain=self.apiserver.GetLeaseGranularity(self.auth_root())
-        round_time=(now/grain)*grain
-        start=round_time+grain
+        print 'API answered grain=',grain
+        start=(now/grain)*grain
+        start += grain
         # find out all nodes that are reservable
         nodes=self.all_reservable_nodenames()
         if not nodes: 
@@ -690,8 +694,8 @@ class TestPlc:
         for lease_spec in self.plc_spec['leases']:
             # skip the ones that come with a null slice id
             if not lease_spec['slice']: continue
-            lease_spec['t_from']=TestPlc.translate_timestamp(start,lease_spec['t_from'])
-            lease_spec['t_until']=TestPlc.translate_timestamp(start,lease_spec['t_until'])
+            lease_spec['t_from']=TestPlc.translate_timestamp(start,grain,lease_spec['t_from'])
+            lease_spec['t_until']=TestPlc.translate_timestamp(start,grain,lease_spec['t_until'])
             lease_addition=self.apiserver.AddLeases(self.auth_root(),nodes,
                                                     lease_spec['slice'],lease_spec['t_from'],lease_spec['t_until'])
             if lease_addition['errors']:
@@ -1071,7 +1075,7 @@ class TestPlc:
         tmpname='%s.sfa-config-tty'%(self.name())
         fileconf=open(tmpname,'w')
         for var in [ 'SFA_REGISTRY_ROOT_AUTH',
-                     'SFA_REGISTRY_LEVEL1_AUTH',
+#                     'SFA_REGISTRY_LEVEL1_AUTH',
                     'SFA_REGISTRY_HOST',
                     'SFA_AGGREGATE_HOST',
                      'SFA_SM_HOST',
@@ -1080,7 +1084,8 @@ class TestPlc:
                      'SFA_PLC_DB_HOST',
                      'SFA_PLC_DB_USER',
                      'SFA_PLC_DB_PASSWORD',
-                    'SFA_PLC_URL']:
+                    'SFA_PLC_URL',
+                     ]:
             fileconf.write ('e %s\n%s\n'%(var,self.plc_spec['sfa'][var]))
         fileconf.write('w\n')
         fileconf.write('R\n')