cleanup

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

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index 92be729..cc42a87 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -5,7 +5,7 @@ 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
@@ -30,33 +30,31 @@ class RSpec:
                                  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 add_slivers(self, slivers, check_for_dupes=False): 
-        raise SfaNotImplemented()
-            
-    def add_links(self, links, check_for_dupes=False):
-        raise SfaNotImplemented()
+    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 __str__(self):
         return self.toxml()
@@ -64,7 +62,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