X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fsfav1Node.py;h=997f395a6b87e917a43110c850ec06308d5fe1a7;hb=1cc8e9613cab8b5b22478de369f259e591c54e6d;hp=0b67c91d0f25411d7663b5df15349970d598264d;hpb=f71147d7d98b74b7558a72deaaa1e89fb19780ff;p=sfa.git diff --git a/sfa/rspecs/elements/versions/sfav1Node.py b/sfa/rspecs/elements/versions/sfav1Node.py index 0b67c91d..997f395a 100644 --- a/sfa/rspecs/elements/versions/sfav1Node.py +++ b/sfa/rspecs/elements/versions/sfav1Node.py @@ -1,142 +1,176 @@ - -from lxml import etree -from sfa.util.plxrn import PlXrn +from sfa.util.sfalogging import logger +from sfa.util.xml import XpathFilter from sfa.util.xrn import Xrn -from sfa.rspecs.elements.node import Node + +from sfa.rspecs.elements.element import Element +from sfa.rspecs.elements.node import NodeElement from sfa.rspecs.elements.sliver import Sliver -from sfa.rspecs.elements.network import Network from sfa.rspecs.elements.location import Location from sfa.rspecs.elements.hardware_type import HardwareType from sfa.rspecs.elements.disk_image import DiskImage from sfa.rspecs.elements.interface import Interface from sfa.rspecs.elements.bwlimit import BWlimit from sfa.rspecs.elements.pltag import PLTag -from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements -from sfa.rspecs.elements.versions.sfav1Network import SFAv1Network +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: - elements = { - 'node': RSpecElement(RSpecElements.NODE, '//default:node | //node'), - 'sliver': RSpecElement(RSpecElements.SLIVER, './default:sliver | ./sliver'), - 'interface': RSpecElement(RSpecElements.INTERFACE, './default:interface | ./interface'), - 'location': RSpecElement(RSpecElements.LOCATION, './default:location | ./location'), - 'bw_limit': RSpecElement(RSpecElements.BWLIMIT, './default:bw_limit | ./bw_limit'), - } - @staticmethod def add_nodes(xml, nodes): - network_elems = SFAv1Network.get_networks(xml) + 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_elem = SFAv1Network.add_network(xml.root, {'name': nodes[0]['component_manager_id']}) - + 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_elem = etree.SubElement(network_elem, 'node') + node_fields = ['component_manager_id', 'component_id', 'boot_state'] + node_elem = network_elem.add_instance('node', node, node_fields) node_elems.append(node_elem) - network = None + + # determine network hrn + network_hrn = None if 'component_manager_id' in node and node['component_manager_id']: - node_elem.set('component_manager_id', node['component_manager_id']) - network = Xrn(node['component_manager_id']).get_hrn() + network_hrn = Xrn(node['component_manager_id']).get_hrn() + + # set component_name attribute and hostname element if 'component_id' in node and node['component_id']: - node_elem.set('component_id', node['component_id']) - xrn = Xrn(node['component_id']) - node_elem.set('component_name', xrn.get_leaf()) - hostname_tag = etree.SubElement(node_elem, 'hostname').text = xrn.get_leaf() + component_name = xrn_to_hostname(node['component_id']) + node_elem.set('component_name', 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']) - if 'boot_state' in node and node['boot_state']: - node_elem.set('boot_state', node['boot_state']) - if 'location' in node and node['location']: - location_elem = etree.SubElement(node_elem, 'location') - for field in Location.fields: - if field in node['location'] and node['location'][field]: - location_elem.set(field, node['location'][field]) - if 'interfaces' in node and node['interfaces']: - i = 0 - for interface in node['interfaces']: - if 'bwlimit' in interface and interface['bwlimit']: - bwlimit = etree.SubElement(node_elem, 'bw_limit', units='kbps').text = str(interface['bwlimit']/1000) - comp_id = PlXrn(auth=network, interface='node%s:eth%s' % (interface['node_id'], i)).get_urn() - ipaddr = interface['ipv4'] - interface_elem = etree.SubElement(node_elem, 'interface', component_id=comp_id, ipv4=ipaddr) - i+=1 - 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) - - if node.get('services'): - PGv2Services.add_services(node_elem, node.get('services')) - - if 'tags' in node: - for tag in node['tags']: - # expose this hard wired list of tags, plus the ones that are marked 'sfa' in their category - if tag['name'] in ['fcdistro', 'arch']: - tag_element = etree.SubElement(node_elem, tag['name']).text=tag['value'] - - if node.get('slivers'): - for sliver in node['slivers']: - sliver_elem = etree.SubElement(node_elem, 'sliver') - if sliver.get('sliver_id'): - sliver_id_leaf = Xrn(sliver.get('sliver_id')).get_leaf() - sliver_id_parts = sliver_id_leaf.split(':') - name = sliver_id_parts[0] - sliver_elem.set('name', name) + + # 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', [])) + 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 def add_slivers(xml, slivers): - pass + component_ids = [] + for sliver in slivers: + filter = {} + if isinstance(sliver, str): + filter['component_id'] = '*%s*' % sliver + sliver = {} + elif 'component_id' in sliver and sliver['component_id']: + filter['component_id'] = '*%s*' % sliver['component_id'] + if not filter: + continue + nodes = SFAv1Node.get_nodes(xml, filter) + if not nodes: + continue + node = nodes[0] + SFAv1Sliver.add_slivers(node, sliver) + + @staticmethod + def remove_slivers(xml, hostnames): + for hostname in hostnames: + nodes = SFAv1Node.get_nodes(xml, {'component_id': '*%s*' % hostname}) + for node in nodes: + slivers = SFAv1Sliver.get_slivers(node.element) + for sliver in slivers: + node.element.remove(sliver.element) + + @staticmethod + def get_nodes(xml, filter={}): + xpath = '//node%s | //default:node%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter)) + node_elems = xml.xpath(xpath) + return SFAv1Node.get_node_objs(node_elems) + + @staticmethod + def get_nodes_with_slivers(xml): + xpath = '//node[count(sliver)>0] | //default:node[count(default:sliver)>0]' + node_elems = xml.xpath(xpath) + return SFAv1Node.get_node_objs(node_elems) + @staticmethod - def get_nodes(xml): - nodes = [] - node_elems = xml.xpath(SFAv1Node.elements['node'].path) + 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'] - if 'authority_id' in node_elem.attrib: - node['authority_id'] = node_elem.attrib['authority_id'] - - # set the location - location_elems = node_elem.xpath(SFAv1Node.elements['location'].path, xml.namespaces) - if len(location_elems) > 0: - node['location'] = Location(location_elems[0].attrib, location_elems[0]) - - # set the bwlimit - bwlimit_elems = node_elem.xpath(SFAv1Node.elements['bw_limit'].path, xml.namespaces) - if len(bwlimit_elems) > 0: - bwlimit = BWlimit(bwlimit_elems[0].attrib, bwlimit_elems[0]) - node['bwlimit'] = bwlimit - - # set the interfaces - interface_elems = node_elem.xpath(SFAv1Node.elements['interface'].path, xml.namespaces) - node['interfaces'] = [] - for interface_elem in interface_elems: - node['interfaces'].append(Interface(interface_elem.attrib, interface_elem)) - - # set the slivers - sliver_elems = node_elem.xpath(SFAv1Node.elements['sliver'].path, xml.namespaces) - node['slivers'] = [] - for sliver_elem in sliver_elems: - node['slivers'].append(Sliver(sliver_elem.attrib, sliver_elem)) - - # set tags - node['tags'] = [] - for child in node_elem.iterchildren(): - if child.tag not in SFAv1Node.elements: - tag = PLTag({'name': child.tag, 'value': child.text}, child) - node['tags'].append(tag) + # 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) + # 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 - - @staticmethod - def get_nodes_with_slivers(xml): - nodes = SFAv1Node.get_nodes(xml) - nodes_with_slivers = [node for node in nodes if node['slivers']] - return nodes_with_slivers - - + return nodes +