RSpec: added a ttl parameter, this duration will set the expires tag in request rspec...

[sfa.git] / sfa / rspecs / rspec.py

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index e58096a..7d7d007 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -9,13 +9,14 @@ from sfa.rspecs.version_manager import VersionManager
 
 class RSpec:
  
-    def __init__(self, rspec="", version=None, user_options={}):
+    def __init__(self, rspec="", version=None, user_options={}, ttl=60):
         self.header = '<?xml version="1.0"?>\n'
         self.template = """<RSpec></RSpec>"""
         self.version = None
         self.xml = XML()
         self.version_manager = VersionManager()
         self.user_options = user_options
+        self.ttl = ttl
         self.elements = {}
         if rspec:
             if version:
@@ -27,9 +28,11 @@ class RSpec:
             self.create(version)
         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
@@ -38,11 +41,10 @@ class RSpec:
         date_format = '%Y-%m-%dT%H:%M:%SZ'
         now = datetime.utcnow()
         generated_ts = now.strftime(date_format)
-        expires_ts = (now + timedelta(hours=1)).strftime(date_format) 
+        expires_ts = (now + timedelta(minutes=self.ttl)).strftime(date_format) 
         self.xml.set('expires', expires_ts)
         self.xml.set('generated', generated_ts)
 
-
     def parse_xml(self, xml, version=None):
         self.xml.parse_xml(xml)
         if not version:
@@ -95,12 +97,12 @@ class RSpec:
 
     def filter(self, filter):
         if 'component_manager_id' in filter:    
-            nodes = self.version.get_node_elements()
+            nodes = self.version.get_nodes()
             for node in nodes:
                 if 'component_manager_id' not in node.attrib or \
                   node.attrib['component_manager_id'] != filter['component_manager_id']:
                     parent = node.getparent()
-                    parent.remove(node) 
+                    parent.remove(node.element) 
         
 
     def toxml(self, header=True):