X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Frspec.py;h=fdd9c957dc27908f5138aba39ea9a7808fc64d46;hb=31cc4fa991896f000abb106916662923f37bc3a6;hp=66a1b0105fe546f28e7ef9e0aea542a10fc404a9;hpb=24690326f71129c44f2ac6be13561200c2b0a614;p=sfa.git diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py index 66a1b010..fdd9c957 100755 --- a/sfa/rspecs/rspec.py +++ b/sfa/rspecs/rspec.py @@ -1,65 +1,82 @@ -#!/usr/bin/python +#!/usr/bin/env python2 + +from __future__ import print_function + from datetime import datetime, timedelta -from sfa.rspecs.xml_interface import XMLInterface, XpathFilter + +from sfa.util.xml import XML, XpathFilter +from sfa.util.faults import InvalidRSpecElement, InvalidRSpec +from sfa.util.sfatime import SFATIME_FORMAT + +from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements from sfa.rspecs.version_manager import VersionManager -from sfa.util.xrn import * -from sfa.util.plxrn import hostname_to_urn -from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements -from sfa.util.faults import SfaNotImplemented, InvalidRSpec, InvalidRSpecElement - -class RSpec(XMLInterface): - - def __init__(self, rspec="", version=None, user_options={}): + + +class RSpec: + + def __init__(self, rspec="", version=None, user_options=None, ttl=None, expires=None): + if user_options is None: + user_options = {} self.header = '\n' self.template = """""" self.version = None - self.xml = None + self.xml = XML() self.version_manager = VersionManager() self.user_options = user_options + self.ttl = ttl + self.expires = expires self.elements = {} if rspec: - self.parse_xml(rspec) + if version: + self.version = self.version_manager.get_version(version) + self.parse_xml(rspec, version) + else: + self.parse_xml(rspec) + elif version: + self.create(version, ttl, expires) else: - self.create(version) + raise InvalidRSpec( + "No RSpec or version specified. Must specify a valid rspec string or a valid version") - def create(self, version=None): + def create(self, version=None, ttl=None, expires=None): """ Create root element + ttl: time to live in minutes, this will determine the expires tag of the RSpec """ 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' + self.parse_xml(self.version.template, self.version) now = datetime.utcnow() - generated_ts = now.strftime(date_format) - expires_ts = (now + timedelta(hours=1)).strftime(date_format) + generated_ts = now.strftime(SFATIME_FORMAT) + if ttl is None: + ttl = 60 + if expires is None: + expires_ts = (now + timedelta(minutes=ttl) + ).strftime(SFATIME_FORMAT) + else: + if isinstance(expires, int): + expires_date = datetime.fromtimestamp(expires) + else: + expires_date = expires + expires_ts = expires_date.strftime(SFATIME_FORMAT) self.xml.set('expires', expires_ts) self.xml.set('generated', generated_ts) + def parse_xml(self, xml, version=None): + self.xml.parse_xml(xml) + if not version: + if self.xml.schema: + self.version = self.version_manager.get_version_by_schema( + self.xml.schema) + else: + #raise InvalidRSpec('unknown rspec schema: {}'.format(schema)) + # 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.xml.namespaces - def parse_xml(self, xml): - XMLInterface.parse_xml(self, xml) - # determine rspec version - # look for schema first - schema = None - 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) - else: - # 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() - self.version.xml = self.xml - self.namespaces = self.version.namespaces - def load_rspec_elements(self, rspec_elements): self.elements = {} for rspec_element in rspec_elements: @@ -68,57 +85,68 @@ class RSpec(XMLInterface): 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) + raise InvalidRSpecElement(element_type, + extra="no such element type: {}. Must specify a valid RSpecElement".format(element_type)) + self.elements[element_type] = RSpecElement( + element_type, element_name, element_path) def get_rspec_element(self, element_type): if element_type not in self.elements: - msg = "ElementType %s not registerd for this rspec" % element_type + msg = "ElementType {} not registered for this rspec".format( + element_type) raise InvalidRSpecElement(element_type, extra=msg) return self.elements[element_type] - def get(self, element_type, filter={}, depth=0): + def get(self, element_type, filter=None, depth=0): + if filter is None: + filter = {} 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={}): + def get_elements(self, element_type, filter=None): """ search for a registered element """ + if filter is None: + filter = {} if element_type not in self.elements: - msg = "Unable to search for element %s in rspec, expath expression not found." % \ - element_type + msg = "Unable to search for element {} in rspec, expath expression not found."\ + .format(element_type) 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 - - @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 filter(self, filter): + if 'component_manager_id' in filter: + nodes = self.version.get_nodes() + 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.element) -if __name__ == '__main__': - rspec = RSpec('/tmp/resources.rspec') - print rspec - 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] + 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__': + import sys + input = sys.argv[1] + with open(input) as f: + rspec = RSpec(f.read()) + print(rspec) +# 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]