X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fversions%2Fsfav1.py;h=affab84fb42cf17d65f424a248d5efce73154e8c;hb=9b9ffbbb64ae96d969005cffd1d65aa993731f56;hp=85aa86e6358dc65f065b6e8609952a2a2f6d1b99;hpb=7cea063f8976f5709cf34e4c3e6d08592ce64fa2;p=sfa.git diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index 85aa86e6..affab84f 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -23,12 +23,16 @@ class SFAv1(BaseVersion): # Network def get_networks(self): - return Element.get_elements(self.xml, '//network', Element) + 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 @@ -54,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} @@ -113,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: @@ -128,6 +88,47 @@ 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['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(attribute) + return attributes + + + def add_sliver_attribute(self, hostname, name, value, network=None): + nodes = self.get_nodes({'component_id': '*%s*' % hostname}) + if not nodes: + node = nodes[0] + slivers = SFAv1Sliver.get_slivers(node) + if slivers: + sliver = slivers[0] + SFAv1Sliver.add_attribute(sliver, name, value) + + 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] + 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, hostname, name, value, network=None): + attribs = self.get_sliver_attributes(hostname) + for attrib in attribs: + if attrib['name'] == name and attrib['value'] == value: + attrib.element.delete() def add_default_sliver_attribute(self, name, value, network=None): if network: @@ -138,27 +139,28 @@ class SFAv1(BaseVersion): network_tag = self.xml.xpath("//network[@name='%s']" % 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 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) 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) + attribs = SFAv1Sliver.get_sliver_attributes(defaults) + for attrib in attribs: + if attrib['name'] == name and attrib['value'] == value: + attrib.element.delete() # Links @@ -171,7 +173,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)