Merge branch 'master' into senslab2

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

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index 1a8f10e..f8bbe80 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -1,27 +1,28 @@
 #!/usr/bin/python 
 from datetime import datetime, timedelta
-from sfa.rspecs.xml_interface import XMLInterface, 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(XMLInterface):
+class RSpec:
  
     def __init__(self, rspec="", version=None, user_options={}):
         self.header = '<?xml version="1.0"?>\n'
         self.template = """<RSpec></RSpec>"""
         self.version = None
-        self.xml = None
+        self.xml = XML()
         self.version_manager = VersionManager()
         self.user_options = user_options
         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
@@ -39,27 +40,17 @@ class RSpec(XMLInterface):
 
 
     def parse_xml(self, xml):
-        XMLInterface.parse_xml(self, xml)
-        # determine rspec version
-        # look for schema first
-        schema = None
+        self.xml.parse_xml(xml)
         self.version = None
-        for key in self.xml.attrib.keys():
-            if key.endswith('schemaLocation'):
-                # schema location should be at the end of the list
-                schema_parts  = self.xml.attrib[key].split(' ')
-                namespace, schema  = schema_parts[0], schema_parts[1]                 
-                break
-
-        if schema:
-            self.version = self.version_manager.get_version_by_schema(schema)
+        if self.xml.schema:
+            self.version = self.version_manager.get_version_by_schema(self.xml.schema)
         else:
             #raise InvalidRSpec('unknown rspec schema: %s' % schema)
-            # TODO: probably isn't safe to assume use default version here
-            # should probably fault if we arent certain  
-            self.version = self.version_manager.get_version()
+            # TODO: Should start raising an exception once SFA defines a schema.
+            # 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.version.namespaces
+        self.namespaces = self.xml.namespaces
     
     def load_rspec_elements(self, rspec_elements):
         self.elements = {}
@@ -80,7 +71,7 @@ class RSpec(XMLInterface):
 
     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={}):
@@ -93,28 +84,31 @@ class RSpec(XMLInterface):
             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 _process_slivers(self, slivers):
-        """
-        Creates a dict of sliver details for each sliver host
+    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) 
         
-        @param slivers a single hostname, list of hostanmes or list of dicts keys on hostname,
-        Returns a list of dicts 
-        """
-        if not isinstance(slivers, list):
-            slivers = [slivers]
-        dicts = []
-        for sliver in slivers:
-            if isinstance(sliver, dict):
-                dicts.append(sliver)
-            elif isinstance(sliver, basestring):
-                dicts.append({'hostname': sliver}) 
-        return dicts
 
+    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)
+         
 if __name__ == '__main__':
     rspec = RSpec('/tmp/resources.rspec')
     print rspec