X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fsfav1Node.py;h=997f395a6b87e917a43110c850ec06308d5fe1a7;hb=1cc8e9613cab8b5b22478de369f259e591c54e6d;hp=ba03055e143d5d5c6eaec55e8b6b0ba6189ae0b5;hpb=49d6283b1bd79231e394a33376a03bf0edad9914;p=sfa.git diff --git a/sfa/rspecs/elements/versions/sfav1Node.py b/sfa/rspecs/elements/versions/sfav1Node.py index ba03055e..997f395a 100644 --- a/sfa/rspecs/elements/versions/sfav1Node.py +++ b/sfa/rspecs/elements/versions/sfav1Node.py @@ -1,9 +1,9 @@ - +from sfa.util.sfalogging import logger from sfa.util.xml import XpathFilter -from sfa.util.plxrn import PlXrn, xrn_to_hostname from sfa.util.xrn import Xrn + from sfa.rspecs.elements.element import Element -from sfa.rspecs.elements.node import Node +from sfa.rspecs.elements.node import NodeElement from sfa.rspecs.elements.sliver import Sliver from sfa.rspecs.elements.location import Location from sfa.rspecs.elements.hardware_type import HardwareType @@ -15,23 +15,25 @@ from sfa.rspecs.elements.versions.sfav1Sliver import SFAv1Sliver from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag from sfa.rspecs.elements.versions.pgv2Services import PGv2Services +from sfa.planetlab.plxrn import xrn_to_hostname + class SFAv1Node: @staticmethod def add_nodes(xml, nodes): - network_elems = Element.get_elements(xml, '//network', fields=['name']) + network_elems = xml.xpath('//network') if len(network_elems) > 0: network_elem = network_elems[0] elif len(nodes) > 0 and nodes[0].get('component_manager_id'): - network_urn = nodes[0]['component_manager_id'] - network_elems = Element.add_elements(xml, 'network', {'name': Xrn(network_urn).get_hrn()}) - network_elem = network_elems[0] + network_urn = nodes[0]['component_manager_id'] + network_elem = xml.add_element('network', name = Xrn(network_urn).get_hrn()) + else: + network_elem = xml node_elems = [] for node in nodes: node_fields = ['component_manager_id', 'component_id', 'boot_state'] - elems = Element.add_elements(network_elem, 'node', node, node_fields) - node_elem = elems[0] + node_elem = network_elem.add_instance('node', node, node_fields) node_elems.append(node_elem) # determine network hrn @@ -43,21 +45,53 @@ class SFAv1Node: if 'component_id' in node and node['component_id']: component_name = xrn_to_hostname(node['component_id']) node_elem.set('component_name', component_name) - hostname_tag = node_elem.add_element('hostname') - hostname_tag.set_text(component_name) + hostname_elem = node_elem.add_element('hostname') + hostname_elem.set_text(component_name) # set site id if 'authority_id' in node and node['authority_id']: node_elem.set('site_id', node['authority_id']) - location_elems = Element.add_elements(node_elem, 'location', node.get('location', []), Location.fields) - interface_elems = Element.add_elements(node_elem, 'interface', node.get('interfaces', []), Interface.fields) + # add locaiton + location = node.get('location') + if location: + node_elem.add_instance('location', location, Location.fields) + + # add exclusive tag to distinguish between Reservable and Shared nodes + exclusive_elem = node_elem.add_element('exclusive') + if node.get('exclusive') and node.get('exclusive') == 'true': + exclusive_elem.set_text('TRUE') + # add granularity of the reservation system + granularity = node.get('granularity') + if granularity: + node_elem.add_instance('granularity', granularity, granularity.fields) + else: + exclusive_elem.set_text('FALSE') + + + if isinstance(node.get('interfaces'), list): + for interface in node.get('interfaces', []): + node_elem.add_instance('interface', interface, ['component_id', 'client_id', 'ipv4']) #if 'bw_unallocated' in node and node['bw_unallocated']: # bw_unallocated = etree.SubElement(node_elem, 'bw_unallocated', units='kbps').text = str(int(node['bw_unallocated'])/1000) PGv2Services.add_services(node_elem, node.get('services', [])) - SFAv1PLTag.add_pl_tags(node_elem, node.get('tags', [])) + tags = node.get('tags', []) + if tags: + for tag in tags: + # backdoor for FITeagle + # Alexander Willner + if tag['tagname']=="fiteagle_settings": + tag_elem = node_elem.add_element(tag['tagname']) + for subtag in tag['value']: + subtag_elem = tag_elem.add_element('setting') + subtag_elem.set('name', str(subtag['tagname'])) + subtag_elem.set('description', str(subtag['description'])) + subtag_elem.set_text(subtag['value']) + else: + tag_elem = node_elem.add_element(tag['tagname']) + tag_elem.set_text(tag['value']) SFAv1Sliver.add_slivers(node_elem, node.get('slivers', [])) @staticmethod @@ -70,7 +104,7 @@ class SFAv1Node: sliver = {} elif 'component_id' in sliver and sliver['component_id']: filter['component_id'] = '*%s*' % sliver['component_id'] - if not fliter: + if not filter: continue nodes = SFAv1Node.get_nodes(xml, filter) if not nodes: @@ -83,7 +117,7 @@ class SFAv1Node: for hostname in hostnames: nodes = SFAv1Node.get_nodes(xml, {'component_id': '*%s*' % hostname}) for node in nodes: - slivers = SFAv1Slivers.get_slivers(node.element) + slivers = SFAv1Sliver.get_slivers(node.element) for sliver in slivers: node.element.remove(sliver.element) @@ -95,7 +129,7 @@ class SFAv1Node: @staticmethod def get_nodes_with_slivers(xml): - xpath = '//node/sliver | //default:node/default:sliver' + xpath = '//node[count(sliver)>0] | //default:node[count(default:sliver)>0]' node_elems = xml.xpath(xpath) return SFAv1Node.get_node_objs(node_elems) @@ -104,19 +138,39 @@ class SFAv1Node: def get_node_objs(node_elems): nodes = [] for node_elem in node_elems: - node = Node(node_elem.attrib, node_elem) + node = NodeElement(node_elem.attrib, node_elem) if 'site_id' in node_elem.attrib: node['authority_id'] = node_elem.attrib['site_id'] - location_objs = Element.get_elements(node_elem, './default:location | ./location', Location) - if len(location_objs) > 0: - node['location'] = location_objs[0] - bwlimit_objs = Element.get_elements(node_elem, './default:bw_limit | ./bw_limit', BWlimit) - if len(bwlimit_objs) > 0: - node['bwlimit'] = bwlimit_objs[0] - node['interfaces'] = Element.get_elements(node_elem, './default:interface | ./interface', Interface) + # get location + location_elems = node_elem.xpath('./default:location | ./location') + locations = [loc_elem.get_instance(Location) for loc_elem in location_elems] + if len(locations) > 0: + node['location'] = locations[0] + # get bwlimit + bwlimit_elems = node_elem.xpath('./default:bw_limit | ./bw_limit') + bwlimits = [bwlimit_elem.get_instance(BWlimit) for bwlimit_elem in bwlimit_elems] + if len(bwlimits) > 0: + node['bwlimit'] = bwlimits[0] + # get interfaces + iface_elems = node_elem.xpath('./default:interface | ./interface') + ifaces = [iface_elem.get_instance(Interface) for iface_elem in iface_elems] + node['interfaces'] = ifaces + # get services node['services'] = PGv2Services.get_services(node_elem) + # get slivers node['slivers'] = SFAv1Sliver.get_slivers(node_elem) - node['tags'] = SFAv1PLTag.get_pl_tags(node_elem, ignore=Node.fields.keys()) + # get tags + node['tags'] = SFAv1PLTag.get_pl_tags(node_elem, ignore=NodeElement.fields+["hardware_type"]) + # get hardware types + hardware_type_elems = node_elem.xpath('./default:hardware_type | ./hardware_type') + node['hardware_types'] = [hw_type.get_instance(HardwareType) for hw_type in hardware_type_elems] + + # temporary... play nice with old slice manager rspec + if not node['component_name']: + hostname_elem = node_elem.find("hostname") + if hostname_elem != None: + node['component_name'] = hostname_elem.text + nodes.append(node) return nodes - +