fix rspec formatting

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

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index 6896bbc..f3e6f80 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -8,10 +8,11 @@ from sfa.util.config import Config
 from sfa.util.faults import SfaNotImplemented, InvalidRSpec
 
 class RSpec:
-    xml = None
     header = '<?xml version="1.0"?>\n'
+    template = """<RSpec></RSpec>"""
     namespaces = {}
     config = Config()
+    xml = None
   
     def __init__(self, rspec="", namespaces={}):
         if rspec:
@@ -24,10 +25,10 @@ class RSpec:
         date_format = '%Y-%m-%dT%H:%M:%SZ'
         now = datetime.utcnow()
         generated_ts = now.strftime(date_format)
-        expires_ts = (now + timedelta(minutes=30)).strftime(date_format) 
-        self.xml = etree.Element("rspec", type = type, 
-                                 valid_until=expires_ts,   
-                                 generated=generated_ts)
+        expires_ts = (now + timedelta(hours=1)).strftime(date_format) 
+        self.parse_rspec(self.template, self.namespaces)
+        self.xml.set('valid_until', expires_ts)
+        self.xml.set('generated', generated_ts)
     
     def parse_rspec(self, rspec, namespaces={}):
         parser = etree.XMLParser(remove_blank_text=True)
@@ -44,21 +45,6 @@ class RSpec:
         if namespaces:
            self.namespaces = namespaces
 
-    def get_network(self):
-        raise SfaNotImplemented()
-
-    def get_nodes(self, nodes_with_slivers=False):
-        raise SfaNotImplemented()
-        
-    def add_nodes(self, nodes, check_for_dupes=False):
-        raise SfaNotImplemented()
-
-    def add_slivers(self, slivers, check_for_dupes=False): 
-        raise SfaNotImplemented()
-            
-    def add_links(self, links, check_for_dupes=False):
-        raise SfaNotImplemented()
-
     def add_attribute(self, elem, name, value):
         opt = etree.SubElement(elem, name)
         opt.text = value
@@ -71,6 +57,17 @@ class RSpec:
                     if opt.text == value:
                         elem.remove(opt)
 
+
+    def validate(self, schema):
+        relaxng_doc = etree.parse(schema)
+        relaxng = etree.RelaxNG(relaxng_doc)
+        if not relaxng(self.xml):
+            error = relaxng.error_log.last_error
+            message = "%s (line %s)" % (error.message, error.line)
+            raise InvalidRSpec(message)
+        return True
+        
+
     def __str__(self):
         return self.toxml()