Merge branch 'master' into senslab2

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

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index cc30249..f8bbe80 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -1,11 +1,11 @@
 #!/usr/bin/python 
 from datetime import datetime, timedelta
-from sfa.rspecs.xml import XML, XpathFilter
-from sfa.rspecs.version_manager import VersionManager
-from sfa.util.xrn import *
-from sfa.util.plxrn import hostname_to_urn
+
+from sfa.util.xml import XML, XpathFilter
+from sfa.util.faults import InvalidRSpecElement, InvalidRSpec
+
 from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements 
-from sfa.util.faults import SfaNotImplemented, InvalidRSpec, InvalidRSpecElement
+from sfa.rspecs.version_manager import VersionManager
 
 class RSpec:
  
@@ -19,9 +19,10 @@ class RSpec:
         self.elements = {}
         if rspec:
             self.parse_xml(rspec)
-        else:
+        elif version:
             self.create(version)
-
+        else:
+            raise InvalidRSpec("No RSpec or version sepcified. Must specify a valid rspec string or a valid version") 
     def create(self, version=None):
         """
         Create root element
@@ -46,8 +47,8 @@ class RSpec:
         else:
             #raise InvalidRSpec('unknown rspec schema: %s' % schema)
             # TODO: Should start raising an exception once SFA defines a schema.
-            # for now we just use the default  
-            self.version = self.version_manager.get_version()
+            # for now we just  default to sfa 
+            self.version = self.version_manager.get_version({'type':'sfa','version': '1'})
         self.version.xml = self.xml    
         self.namespaces = self.xml.namespaces
     
@@ -70,7 +71,7 @@ class RSpec:
 
     def get(self, element_type, filter={}, depth=0):
         elements = self.get_elements(element_type, filter)
-        elements = [self.get_element_attributes(element, depth=depth) for element in elements]
+        elements = [self.xml.get_element_attributes(elem, depth=depth) for elem in elements]
         return elements
 
     def get_elements(self, element_type, filter={}):
@@ -83,13 +84,27 @@ class RSpec:
             raise InvalidRSpecElement(element_type, extra=msg)
         rspec_element = self.get_rspec_element(element_type)
         xpath = rspec_element.path + XpathFilter.xpath(filter)
-        return self.xpath(xpath)
+        return self.xml.xpath(xpath)
 
     def merge(self, in_rspec):
-        pass
+        self.version.merge(in_rspec)
+
+    def filter(self, filter):
+        if 'component_manager_id' in filter:    
+            nodes = self.version.get_node_elements()
+            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) 
+        
 
-    def toxml(self):
-        return self.header + self.xml.toxml()
+    def toxml(self, header=True):
+        if header:
+            return self.header + self.xml.toxml()
+        else:
+            return self.xml.toxml()
+    
 
     def save(self, filename):
         return self.xml.save(filename)