fix rspec formatting

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

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index 92be729..f3e6f80 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -5,13 +5,14 @@ from datetime import datetime, timedelta
 from sfa.util.xrn import *
 from sfa.util.plxrn import hostname_to_urn
 from sfa.util.config import Config  
-from sfa.util.faults import SfaNotImplemented
+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,39 +25,48 @@ 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)
         try:
-            tree = etree.parse(rspec)
-            self.xml = tree.getroot()  
-            if namespaces:
-               self.namespaces = namespaces
+            tree = etree.parse(rspec, parser)
         except IOError:
             # 'rspec' file doesnt exist. 'rspec' is proably an xml string
             try:
-                tree = etree.parse(StringIO(rspec))
-                self.xml = tree.getroot()  
+                tree = etree.parse(StringIO(rspec), parser)
             except:
-                raise IOError('Must specify a xml file or xml string. Received: ' + rspec )
+                raise InvalidRSpec('Must specify a xml file or xml string. Received: ' + rspec )
 
-    def get_network(self):
-        raise SfaNotImplemented()
+        self.xml = tree.getroot()  
+        if namespaces:
+           self.namespaces = namespaces
 
-    def get_nodes(self, nodes_with_slivers=False):
-        raise SfaNotImplemented()
-        
-    def add_nodes(self, nodes, check_for_dupes=False):
-        raise SfaNotImplemented()
+    def add_attribute(self, elem, name, value):
+        opt = etree.SubElement(elem, name)
+        opt.text = value
+
+    def remove_attribute(self, elem, name, value):
+        if elem is not None:
+            opts = elem.iterfind(name)
+            if opts is not None:
+                for opt in opts:
+                    if opt.text == value:
+                        elem.remove(opt)
 
-    def add_slivers(self, slivers, check_for_dupes=False): 
-        raise SfaNotImplemented()
-            
-    def add_links(self, links, check_for_dupes=False):
-        raise SfaNotImplemented()
+
+    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()
@@ -64,7 +74,11 @@ class RSpec:
     def toxml(self):
         return self.header + etree.tostring(self.xml, pretty_print=True)  
         
-
+    def save(self, filename):
+        f = open(filename, 'w')
+        f.write(self.toxml())
+        f.close()
+ 
 if __name__ == '__main__':
     rspec = RSpec()
     print rspec