X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fversions%2Fsfav1.py;h=588e3c05ad0bf7604f72f3f2052a6476962fb526;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=15ef89edf2bd22e56090e95fb7c996f32769e628;hpb=5baba96420ad26a6e538e12ce31e4f58031798e4;p=sfa.git diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index 15ef89ed..588e3c05 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -1,114 +1,54 @@ +from __future__ import print_function + from copy import deepcopy from lxml import etree from sfa.util.sfalogging import logger from sfa.util.xrn import hrn_to_urn, urn_to_hrn -from sfa.util.plxrn import PlXrn - -from sfa.rspecs.baseversion import BaseVersion +from sfa.rspecs.version import RSpecVersion from sfa.rspecs.elements.element import Element from sfa.rspecs.elements.versions.pgv2Link import PGv2Link from sfa.rspecs.elements.versions.sfav1Node import SFAv1Node +from sfa.rspecs.elements.versions.sfav1Sliver import SFAv1Sliver +from sfa.rspecs.elements.versions.sfav1Lease import SFAv1Lease + -class SFAv1(BaseVersion): +class SFAv1(RSpecVersion): enabled = True type = 'SFA' content_type = '*' version = '1' - schema = None - namespace = None + schema = '' + namespace = '' extensions = {} namespaces = None - elements = [] template = '' % type - + # Network def get_networks(self): - return Element.get_elements(self.xml, '//network', Element) - - def get_nodes(self, network=None): - return SFAv1Node.get_nodes(self.xml) - - def get_node_element(self,hostname,network): - if network is not None: - xpath="//network[@name='%s']/node[@component_id[contains(., '%s')]]" % (network,hostname) - else: xpath="//node[@component_id[contains(., '%s')]]" % (hostname) - nodes=self.xml.xpath(xpath) - print 'found %d nodes'%len(nodes) - if nodes: return nodes[0] - else: return None - - def get_nodes_with_slivers(self, network = None): - return SFAv1Node.get_nodes_with_slivers_thierry(self.xml) - - # xxx thierry - this seems more like it - # warning, the same code is duplicated in xml.py and pgv2.py.. - def attributes_list_thierry (self, elem): - opts=[] - for (k,v) in elem.items(): - opts.append ( (k,v.strip(),) ) - return opts - - def attributes_list(self, elem): - # convert a list of attribute tags into list of tuples - # (tagname, text_value) - opts = [] - if elem is not None: - for e in elem: - opts.append((e.tag, str(e.text).strip())) - return opts - - def get_default_sliver_attributes(self, network=None): - if network: - defaults = self.xml.xpath("//network[@name='%s']/sliver_defaults" % network) - else: - defaults = self.xml.xpath("//sliver_defaults") - if not defaults: return [] - return self.attributes_list_thierry(defaults) - - def get_sliver_attributes(self, hostname, network=None): - node = self.get_node_element(hostname, network) - #sliver = node.find("sliver") - slivers = node.xpath('./sliver') - if not slivers: return [] - return self.attributes_list_thierry(slivers[0]) - - def get_slice_attributes(self, network=None): - slice_attributes = [] - nodes_with_slivers = self.get_nodes_with_slivers(network) - for default_attribute in self.get_default_sliver_attributes(network): - attribute = {'name': str(default_attribute[0]), - 'value': str(default_attribute[1]), - 'node_id': None} - slice_attributes.append(attribute) - for node in nodes_with_slivers: - nodename=node.get('component_name') - sliver_attributes = self.get_sliver_attributes(nodename, network) - for sliver_attribute in sliver_attributes: - attribute = {'name': str(sliver_attribute[0]), 'value': str(sliver_attribute[1]), 'node_id': node} - slice_attributes.append(attribute) - return slice_attributes - - def get_links(self, network=None): - return PGv2Link.get_links(self.xml) - - def get_link_requests(self): - return PGv2Link.get_link_requests(self.xml) - - ################## - # Builder - ################## + network_elems = self.xml.xpath('//network') + networks = [network_elem.get_instance(fields=['name', 'slice']) for + network_elem in network_elems] + return networks def add_network(self, network): network_tags = self.xml.xpath('//network[@name="%s"]' % network) if not network_tags: - network_tag = etree.SubElement(self.xml.root, 'network', name=network) + network_tag = self.xml.add_element('network', name=network) else: network_tag = network_tags[0] return network_tag - def add_nodes(self, nodes, network = None, no_dupes=False): - SFAv1Node.add_nodes(self.xml, nodes) + # Nodes + + def get_nodes(self, filter=None): + return SFAv1Node.get_nodes(self.xml, filter) + + def get_nodes_with_slivers(self): + return SFAv1Node.get_nodes_with_slivers(self.xml) + + def add_nodes(self, nodes, network=None, no_dupes=False, rspec_content_type=None): + SFAv1Node.add_nodes(self.xml, nodes, rspec_content_type) def merge_node(self, source_node_tag, network, no_dupes=False): if no_dupes and self.get_node_element(node['hostname']): @@ -118,86 +58,151 @@ class SFAv1(BaseVersion): network_tag = self.add_network(network) network_tag.append(deepcopy(source_node_tag)) - def add_links(self, links): - networks = self.get_networks() - if len(networks) > 0: - xml = networks[0] - else: - xml = self.xml - PGv2Link.add_links(xml, links) - - def add_link_requests(self, links): - PGv2Link.add_link_requests(self.xml, links) + # Slivers - def add_slivers(self, slivers, network=None, sliver_urn=None, no_dupes=False, append=False): + def add_slivers(self, hostnames, attributes=None, sliver_urn=None, append=False): + if attributes is None: + attributes = [] # add slice name to network tag network_tags = self.xml.xpath('//network') if network_tags: network_tag = network_tags[0] network_tag.set('slice', urn_to_hrn(sliver_urn)[0]) - - all_nodes = self.get_nodes() - all_nodenames = [ n['component_name'] for n in all_nodes ] - nodes_with_slivers = [sliver['hostname'] for sliver in slivers] - nodes_without_slivers = set(all_nodenames).difference(set(nodes_with_slivers)) - + # add slivers - for sliver in slivers: - node_elem = self.get_node_element(sliver['hostname'], network) - if not node_elem: continue -#thierry sliver_elem = etree.SubElement(node_elem, 'sliver') - sliver_elem = node_elem.add_element('sliver') - if 'tags' in sliver: - for tag in sliver['tags']: -#thierry etree.SubElement(sliver_elem, tag['tagname']).text = value=tag['value'] - sliver_elem.add_element (tag['tagname'],{'text':tag['value']}) - + sliver = {'name': sliver_urn, + 'pl_tags': attributes} + for hostname in hostnames: + if sliver_urn: + sliver['name'] = sliver_urn + node_elems = self.get_nodes({'component_id': '*%s*' % hostname}) + if not node_elems: + continue + node_elem = node_elems[0] + SFAv1Sliver.add_slivers(node_elem.element, sliver) + # remove all nodes without slivers if not append: - for node in nodes_without_slivers: - node_elem = self.get_node_element(node) - parent = node_elem.getparent() - parent.remove(node_elem) + for node_elem in self.get_nodes(): + if not node_elem['slivers']: + parent = node_elem.element.getparent() + parent.remove(node_elem.element) def remove_slivers(self, slivers, network=None, no_dupes=False): SFAv1Node.remove_slivers(self.xml, slivers) + def get_slice_attributes(self, network=None): + attributes = [] + nodes_with_slivers = self.get_nodes_with_slivers() + for default_attribute in self.get_default_sliver_attributes(network): + attribute = default_attribute.copy() + attribute['node_id'] = None + attributes.append(attribute) + for node in nodes_with_slivers: + nodename = node['component_name'] + sliver_attributes = self.get_sliver_attributes(nodename, network) + for sliver_attribute in sliver_attributes: + sliver_attribute['node_id'] = nodename + attributes.append(sliver_attribute) + return attributes + + def add_sliver_attribute(self, component_id, name, value, network=None): + nodes = self.get_nodes({'component_id': '*%s*' % component_id}) + if nodes is not None and isinstance(nodes, list) and len(nodes) > 0: + node = nodes[0] + slivers = SFAv1Sliver.get_slivers(node) + if slivers: + sliver = slivers[0] + SFAv1Sliver.add_sliver_attribute(sliver, name, value) + else: + # should this be an assert / raise an exception? + logger.error("WARNING: failed to find component_id %s" % + component_id) + + def get_sliver_attributes(self, component_id, network=None): + nodes = self.get_nodes({'component_id': '*%s*' % component_id}) + attribs = [] + if nodes is not None and isinstance(nodes, list) and len(nodes) > 0: + node = nodes[0] + slivers = SFAv1Sliver.get_slivers(node.element) + if slivers is not None and isinstance(slivers, list) and len(slivers) > 0: + sliver = slivers[0] + attribs = SFAv1Sliver.get_sliver_attributes(sliver.element) + return attribs + + def remove_sliver_attribute(self, component_id, name, value, network=None): + attribs = self.get_sliver_attributes(component_id) + for attrib in attribs: + if attrib['name'] == name and attrib['value'] == value: + # attrib.element.delete() + parent = attrib.element.getparent() + parent.remove(attrib.element) + def add_default_sliver_attribute(self, name, value, network=None): if network: - defaults = self.xml.xpath("//network[@name='%s']/sliver_defaults" % network) + defaults = self.xml.xpath( + "//network[@name='%s']/sliver_defaults" % network) else: - defaults = self.xml.xpath("//sliver_defaults" % network) - if not defaults : - network_tag = self.xml.xpath("//network[@name='%s']" % network) + defaults = self.xml.xpath("//sliver_defaults") + if not defaults: + if network: + network_tag = self.xml.xpath("//network[@name='%s']" % network) + else: + network_tag = self.xml.xpath("//network") if isinstance(network_tag, list): network_tag = network_tag[0] - defaults = self.xml.add_element('sliver_defaults', attrs={}, parent=network_tag) + defaults = network_tag.add_element('sliver_defaults') elif isinstance(defaults, list): defaults = defaults[0] - self.xml.add_attribute(defaults, name, value) + SFAv1Sliver.add_sliver_attribute(defaults, name, value) - def add_sliver_attribute(self, hostname, name, value, network=None): - node = self.get_node_element(hostname, network) - sliver = node.find("sliver") - self.xml.add_attribute(sliver, name, value) + def get_default_sliver_attributes(self, network=None): + if network: + defaults = self.xml.xpath( + "//network[@name='%s']/sliver_defaults" % network) + else: + defaults = self.xml.xpath("//sliver_defaults") + if not defaults: + return [] + return SFAv1Sliver.get_sliver_attributes(defaults[0]) def remove_default_sliver_attribute(self, name, value, network=None): - if network: - defaults = self.xml.xpath("//network[@name='%s']/sliver_defaults" % network) + attribs = self.get_default_sliver_attributes(network) + for attrib in attribs: + if attrib['name'] == name and attrib['value'] == value: + # attrib.element.delete() + parent = attrib.element.getparent() + parent.remove(attrib.element) + + # Links + + def get_links(self, network=None): + return PGv2Link.get_links(self.xml) + + def get_link_requests(self): + return PGv2Link.get_link_requests(self.xml) + + def add_links(self, links): + networks = self.get_networks() + if len(networks) > 0: + xml = networks[0].element else: - defaults = self.xml.xpath("//sliver_defaults" % network) - self.xml.remove_attribute(defaults, name, value) + xml = self.xml + PGv2Link.add_links(xml, links) + + def add_link_requests(self, links): + PGv2Link.add_link_requests(self.xml, links) - def remove_sliver_attribute(self, hostname, name, value, network=None): - node = self.get_node_element(hostname, network) - sliver = node.find("sliver") - self.xml.remove_attribute(sliver, name, value) + # utility def merge(self, in_rspec): """ Merge contents for specified rspec with current rspec """ + if not in_rspec: + return + from sfa.rspecs.rspec import RSpec if isinstance(in_rspec, RSpec): rspec = in_rspec @@ -214,12 +219,28 @@ class SFAv1(BaseVersion): for network in networks: current_network = network.get('name') if current_network and current_network not in current_networks: - self.xml.root.append(network.element) + self.xml.append(network.element) current_networks.append(current_network) + # Leases + + def get_leases(self, filter=None): + return SFAv1Lease.get_leases(self.xml, filter) + + def add_leases(self, leases, network=None, no_dupes=False): + SFAv1Lease.add_leases(self.xml, leases) + + # Spectrum + + def get_channels(self, filter=None): + return [] + + def add_channels(self, channels, network=None, no_dupes=False): + pass + if __name__ == '__main__': from sfa.rspecs.rspec import RSpec from sfa.rspecs.rspec_elements import * r = RSpec('/tmp/resources.rspec') r.load_rspec_elements(SFAv1.elements) - print r.get(RSpecElements.NODE) + print(r.get(RSpecElements.NODE))