X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Frspec.py;h=00e048b86e89322a12eea52f4c86f5c4a73b07a9;hb=57b6a99255d4a88be9c0f910f8524677e34ff4bc;hp=85c8c88f97758b0b99cb33291fe4425988c6db12;hpb=e5114ef9d1000bb480e7091169b14a2461563ed1;p=sfa.git diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py index 85c8c88f..00e048b8 100755 --- a/sfa/rspecs/rspec.py +++ b/sfa/rspecs/rspec.py @@ -1,200 +1,79 @@ #!/usr/bin/python -from lxml import etree -from StringIO import StringIO from datetime import datetime, timedelta -from sfa.util.xrn import * -from sfa.util.plxrn import hostname_to_urn -from sfa.util.enumeration import Enum -from sfa.util.faults import SfaNotImplemented, InvalidRSpec, InvalidRSpecElement +from sfa.util.xml import XML, XpathFilter +from sfa.util.faults import InvalidRSpecElement -class XpathFilter: - @staticmethod - def xpath(filter={}): - xpath = "" - if filter: - filter_list = [] - for (key, value) in filter.items(): - if key == 'text': - key = 'text()' - else: - key = '@'+key - if isinstance(value, str): - filter_list.append('%s="%s"' % (key, value)) - elif isinstance(value, list): - filter_list.append('contains("%s", %s)' % (' '.join(map(str, value)), key)) - if filter_list: - xpath = ' and '.join(filter_list) - xpath = '[' + xpath + ']' - return xpath - -# recognized top level rspec elements -RSpecElements = Enum('NETWORK', 'NODE', 'SLIVER', 'INTERFACE', 'LINK', 'VLINK') - -class RSpecElement: - def __init__(self, element_type, name, path): - if not element_type in RSpecElements: - raise InvalidRSpecElement(element_type) - self.type = element_type - self.name = name - self.path = path +from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements +from sfa.rspecs.version_manager import VersionManager class RSpec: - header = '\n' - template = """""" - xml = None - type = None - version = None - namespaces = None - user_options = {} - def __init__(self, rspec="", namespaces={}, type=None, user_options={}): - self.type = type + def __init__(self, rspec="", version=None, user_options={}): + self.header = '\n' + self.template = """""" + self.version = None + self.xml = XML() + self.version_manager = VersionManager() self.user_options = user_options self.elements = {} if rspec: - self.parse_rspec(rspec, namespaces) + self.parse_xml(rspec) else: - self.create() + self.create(version) - def create(self): + def create(self, version=None): """ Create root element """ + self.version = self.version_manager.get_version(version) + self.namespaces = self.version.namespaces + self.parse_xml(self.version.template) # eg. 2011-03-23T19:53:28Z date_format = '%Y-%m-%dT%H:%M:%SZ' now = datetime.utcnow() generated_ts = now.strftime(date_format) expires_ts = (now + timedelta(hours=1)).strftime(date_format) - self.parse_rspec(self.template, self.namespaces) self.xml.set('expires', expires_ts) self.xml.set('generated', generated_ts) - - def parse_rspec(self, rspec, namespaces={}): - """ - parse rspec into etree - """ - parser = etree.XMLParser(remove_blank_text=True) - try: - tree = etree.parse(rspec, parser) - except IOError: - # 'rspec' file doesnt exist. 'rspec' is proably an xml string - try: - tree = etree.parse(StringIO(rspec), parser) - except Exception, e: - raise InvalidRSpec(str(e)) - self.xml = tree.getroot() - if namespaces: - self.namespaces = namespaces - def validate(self, schema): - """ - Validate against rng 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 xpath(self, xpath): - return self.xml.xpath(xpath, namespaces=self.namespaces) + def parse_xml(self, xml): + self.xml.parse_xml(xml) + self.version = None + 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: Should start raising an exception once SFA defines a schema. + # for now we just use the default + self.version = self.version_manager.get_version() + self.version.xml = self.xml + self.namespaces = self.xml.namespaces + + def load_rspec_elements(self, rspec_elements): + self.elements = {} + for rspec_element in rspec_elements: + if isinstance(rspec_element, RSpecElement): + self.elements[rspec_element.type] = rspec_element - def register_element_type(self, element_type, element_name, element_path): + def register_rspec_element(self, element_type, element_name, element_path): if element_type not in RSpecElements: raise InvalidRSpecElement(element_type, extra="no such element type: %s. Must specify a valid RSpecElement" % element_type) self.elements[element_type] = RSpecElement(element_type, element_name, element_path) - def get_element_type(self, element_type): + def get_rspec_element(self, element_type): if element_type not in self.elements: msg = "ElementType %s not registerd for this rspec" % element_type raise InvalidRSpecElement(element_type, extra=msg) return self.elements[element_type] - def add_attribute(self, elem, name, value): - """ - Add attribute to specified etree element - """ - opt = etree.SubElement(elem, name) - opt.text = value - - def add_element(self, name, attrs={}, parent=None, text=""): - """ - Generic wrapper around etree.SubElement(). Adds an element to - specified parent node. Adds element to root node is parent is - not specified. - """ - if parent == None: - parent = self.xml - element = etree.SubElement(parent, name) - if text: - element.text = text - if isinstance(attrs, dict): - for attr in attrs: - element.set(attr, attrs[attr]) - return element - - def remove_attribute(self, elem, name, value): - """ - Removes an attribute from an element - """ - 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 remove_element(self, element_name, root_node = None): - """ - Removes all occurences of an element from the tree. Start at - specified root_node if specified, otherwise start at tree's root. - """ - if not root_node: - root_node = self.xml - - if not element_name.startswith('//'): - element_name = '//' + element_name - - elements = root_node.xpath('%s ' % element_name, namespaces=self.namespaces) - for element in elements: - parent = element.getparent() - parent.remove(element) - - def attributes_list(self, elem): - # convert a list of attribute tags into list of tuples - # (tagnme, text_value) - opts = [] - if elem is not None: - for e in elem: - opts.append((e.tag, str(e.text).strip())) - return opts - - def get_element_attributes(self, elem=None, depth=0): - if elem == None: - elem = self.root_node - attrs = dict(elem.attrib) - attrs['text'] = str(elem.text).strip() - if isinstance(depth, int) and depth > 0: - for child_elem in list(elem): - key = str(child_elem.tag) - if key not in attrs: - attrs[key] = [self.get_element_attributes(child_elem, depth-1)] - else: - attrs[key].append(self.get_element_attributes(child_elem, depth-1)) - else: - attrs['child_nodes'] = list(elem) - return attrs - - def find(self, element_type, filter={}, depth=0): - elements = [self.get_element_attributes(element, depth=depth) for element in \ - self.find_elements(element_type, filter)] + 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] return elements - def find_elements(self, element_type, filter={}): + def get_elements(self, element_type, filter={}): """ search for a registered element """ @@ -202,54 +81,38 @@ class RSpec: msg = "Unable to search for element %s in rspec, expath expression not found." % \ element_type raise InvalidRSpecElement(element_type, extra=msg) - rspec_element = self.get_element_type(element_type) + rspec_element = self.get_rspec_element(element_type) xpath = rspec_element.path + XpathFilter.xpath(filter) return self.xpath(xpath) def merge(self, in_rspec): - pass - - def cleanup(self): - """ - Optional method which inheriting classes can choose to implent. - """ - pass - - def _process_slivers(self, slivers): - """ - Creates a dict of sliver details for each sliver host + 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) - @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 __str__(self): - return self.toxml() + def toxml(self, header=True): + if header: + return self.header + self.xml.toxml() + else: + return self.xml.toxml() + - def toxml(self, cleanup=False): - if cleanup: - self.cleanup() - return self.header + etree.tostring(self.xml, pretty_print=True) - def save(self, filename): - f = open(filename, 'w') - f.write(self.toxml()) - f.close() - + return self.xml.save(filename) + if __name__ == '__main__': rspec = RSpec('/tmp/resources.rspec') print rspec - #rspec.register_element_type(RSpecElements.NETWORK, 'network', '//network') - #rspec.register_element_type(RSpecElements.NODE, 'node', '//node') - #print rspec.find(RSpecElements.NODE)[0] - #print rspec.find(RSpecElements.NODE, depth=1)[0] + rspec.register_rspec_element(RSpecElements.NETWORK, 'network', '//network') + rspec.register_rspec_element(RSpecElements.NODE, 'node', '//node') + print rspec.get(RSpecElements.NODE)[0] + print rspec.get(RSpecElements.NODE, depth=1)[0]