X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fversions%2Fsfav1.py;h=bdfeb47d5bd41b461c406c8519faef00567603e8;hb=1cc8e9613cab8b5b22478de369f259e591c54e6d;hp=39a53483b183c660f91c97ec44a6cdeaa67ffaa2;hpb=04ed4ac050de268d1469c379f6bf60a46bfc333f;p=sfa.git diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index 39a53483..bdfeb47d 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -3,20 +3,20 @@ 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 template = '' % type @@ -58,58 +58,14 @@ class SFAv1(BaseVersion): network_tag.append(deepcopy(source_node_tag)) # Slivers - - 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): - nodes = self.get_nodes({'component_id': '*%s*' %hostname}) - attribs = [] - if nodes is not None and isinstance(nodes, list) and len(nodes) > 0: - node = nodes[0] - sliver = node.xpath('./default:sliver', namespaces=self.namespaces) - if sliver is not None and isinstance(sliver, list) and len(sliver) > 0: - sliver = sliver[0] - #attribs = self.attributes_list(sliver) - return attribs - - def get_slice_attributes(self, network=None): - slice_attributes = [] - nodes_with_slivers = self.get_nodes_with_slivers() - 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 add_slivers(self, hostnames, attributes=[], sliver_urn=None, append=False): # 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]) - + # add slivers sliver = {'name':sliver_urn, 'pl_tags': attributes} @@ -117,10 +73,10 @@ class SFAv1(BaseVersion): if sliver_urn: sliver['name'] = sliver_urn node_elems = self.get_nodes({'component_id': '*%s*' % hostname}) - if not node_elems: + if not node_elems: continue node_elem = node_elems[0] - SFAv1Sliver.add_slivers(node_elem.element, sliver) + SFAv1Sliver.add_slivers(node_elem.element, sliver) # remove all nodes without slivers if not append: @@ -132,37 +88,86 @@ class SFAv1(BaseVersion): 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) 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) - - 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) + SFAv1Sliver.add_sliver_attribute(defaults, name, value) - def remove_default_sliver_attribute(self, name, value, network=None): + 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" % network) - self.xml.remove_attribute(defaults, name, value) - - 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) + 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): + 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 @@ -175,7 +180,7 @@ class SFAv1(BaseVersion): def add_links(self, links): networks = self.get_networks() if len(networks) > 0: - xml = networks[0] + xml = networks[0].element else: xml = self.xml PGv2Link.add_links(xml, links) @@ -190,6 +195,9 @@ class SFAv1(BaseVersion): 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 @@ -209,6 +217,14 @@ class SFAv1(BaseVersion): 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) + if __name__ == '__main__': from sfa.rspecs.rspec import RSpec from sfa.rspecs.rspec_elements import *