#!/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
+
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:
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={}):
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):
self.version.merge(in_rspec)
def filter(self, filter):
if 'component_manager_id' in filter:
nodes = self.version.get_node_elements()
- print filter
for node in nodes:
- print node.attrib
-
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)