Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3

Conflicts:
	sfa/rspecs/rspec.py

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index 0f61e90..ce16a1d 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -10,7 +10,7 @@ from sfa.rspecs.version_manager import VersionManager
 
 class RSpec:
  
-    def __init__(self, rspec="", version=None, user_options=None):
+    def __init__(self, rspec="", version=None, user_options=None, ttl=60):
         if user_options is None: user_options={}
         self.header = '<?xml version="1.0"?>\n'
         self.template = """<RSpec></RSpec>"""
@@ -18,6 +18,7 @@ class RSpec:
         self.xml = XML()
         self.version_manager = VersionManager()
         self.user_options = user_options
+        self.ttl = ttl
         self.elements = {}
         if rspec:
             if version:
@@ -30,16 +31,17 @@ class RSpec:
         else:
             raise InvalidRSpec("No RSpec or version specified. Must specify a valid rspec string or a valid version") 
 
-    def create(self, version=None):
+    def create(self, version=None, ttl=60):
         """
         Create root element
+        ttl: time to live in minutes, this will determine the expires tag of the RSpec
         """
         self.version = self.version_manager.get_version(version)
         self.namespaces = self.version.namespaces
         self.parse_xml(self.version.template, self.version) 
         now = datetime.utcnow()
         generated_ts = now.strftime(SFATIME_FORMAT)
-        expires_ts = (now + timedelta(hours=1)).strftime(SFATIME_FORMAT) 
+        expires_ts = (now + timedelta(minutes=self.ttl)).strftime(SFATIME_FORMAT) 
         self.xml.set('expires', expires_ts)
         self.xml.set('generated', generated_ts)
 

diff --git a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec
index dd58205..72b1e80 100644 (file)
--- a/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec
+++ b/testbeds/iotlab/tests/tests_rspecs/iotlab_avakian_slice_iotlab.rspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<RSpec type="SFA" expires="2013-02-27T15:14:10Z" generated="2013-02-27T14:14:10Z">
+<RSpec type="SFA" expires="2014-52-27T15:14:10Z" generated="2013-05-19T14:14:10Z">
   <network name="iotlab">
     <node component_manager_id="urn:publicid:IDN+iotlab+authority+sa" component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info" boot_state="Alive" component_name="wsn430-12.devlille.iot-lab.info" site_id="urn:publicid:IDN+senslab+authority+sa">
       <hostname>wsn430-12.devlille.iot-lab.info</hostname>
@@ -16,7 +16,7 @@
       <sliver/>
     </node>
   </network>
- <lease slice_id="urn:publicid:IDN+iotlab+slice+sandrine_slice" start_time="1405078836" duration="20">
+ <lease slice_id="urn:publicid:IDN+ple:upmc+slice+myslicedemo" start_time="1400604923" duration="20">
        <node component_id="urn:publicid:IDN+iotlab+node+a8-11.devgrenoble.iot-lab.info"/>
        <node component_id="urn:publicid:IDN+iotlab+node+wsn430-12.devlille.iot-lab.info"/>
  </lease>