X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fversions%2Fsfav1.py;h=85aa86e6358dc65f065b6e8609952a2a2f6d1b99;hb=69fb221c274eb0b6e9f6ff6f895e5e6f90b17230;hp=ea38f698128291e827c882c26ff15a007a8c8a2e;hpb=37e3aa340adc25a9f153217be91aa5a18d77e2e3;p=sfa.git diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index ea38f698..85aa86e6 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -1,11 +1,14 @@ 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.rspec_version import BaseVersion +from sfa.rspecs.baseversion import BaseVersion 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 class SFAv1(BaseVersion): enabled = True @@ -16,22 +19,45 @@ class SFAv1(BaseVersion): namespace = None 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 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) + else: + network_tag = network_tags[0] + return network_tag + + + # Nodes + + def get_nodes(self, filter=None): + return SFAv1Node.get_nodes(self.xml, filter) - def get_nodes_with_slivers(self, network = None): + def get_nodes_with_slivers(self): return SFAv1Node.get_nodes_with_slivers(self.xml) + def add_nodes(self, nodes, network = None, no_dupes=False): + SFAv1Node.add_nodes(self.xml, nodes) + + def merge_node(self, source_node_tag, network, no_dupes=False): + if no_dupes and self.get_node_element(node['hostname']): + # node already exists + return + + network_tag = self.add_network(network) + network_tag.append(deepcopy(source_node_tag)) + + # Slivers + def attributes_list(self, elem): # convert a list of attribute tags into list of tuples - # (tagnme, text_value) + # (tagname, text_value) opts = [] if elem is not None: for e in elem: @@ -43,98 +69,62 @@ class SFAv1(BaseVersion): defaults = self.xml.xpath("//network[@name='%s']/sliver_defaults" % network) else: defaults = self.xml.xpath("//sliver_defaults") - if isinstance(defaults, list) and defaults: - defaults = defaults[0] - return self.attributes_list(defaults) + if not defaults: return [] + return self.attributes_list_thierry(defaults) def get_sliver_attributes(self, hostname, network=None): - attributes = [] - node = self.get_node_element(hostname, network) - #sliver = node.find("sliver") - slivers = node.xpath('./sliver') - if isinstance(slivers, list) and slivers: - attributes = self.attributes_list(slivers[0]) - return attributes + 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(network) + 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} + attribute = {'name': str(default_attribute[0]), + 'value': str(default_attribute[1]), + 'node_id': None} slice_attributes.append(attribute) for node in nodes_with_slivers: - sliver_attributes = self.get_sliver_attributes(node, network) + 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 - ################## - - 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) - 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) - - def merge_node(self, source_node_tag, network, no_dupes=False): - if no_dupes and self.get_node_element(node['hostname']): - # node already exists - return - - 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) - - def add_slivers(self, slivers, network=None, sliver_urn=None, no_dupes=False, append=False): + 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]) - all_nodes = self.get_nodes() - nodes_with_slivers = [sliver['hostname'] for sliver in slivers] - nodes_without_slivers = set(all_nodes).difference(nodes_with_slivers) - # add slivers - for sliver in slivers: - node_elem = self.get_node_element(sliver['hostname'], network) - if not node_elem: continue - sliver_elem = etree.SubElement(node_elem, 'sliver') - if 'tags' in sliver: - for tag in sliver['tags']: - etree.SubElement(sliver_elem, tag['tagname']).text = value=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) @@ -170,6 +160,27 @@ class SFAv1(BaseVersion): sliver = node.find("sliver") self.xml.remove_attribute(sliver, name, value) + # 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] + else: + xml = self.xml + PGv2Link.add_links(xml, links) + + def add_link_requests(self, links): + PGv2Link.add_link_requests(self.xml, links) + + # utility + def merge(self, in_rspec): """ Merge contents for specified rspec with current rspec @@ -191,7 +202,7 @@ 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) if __name__ == '__main__':