X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2Node.py;h=769a72f68df140c34a9188c49160052c598bc736;hb=c3de61fe710643aa025945ab0879f2769f57e7dd;hp=9892d8caf7d800b1e6c6a6da06ed170d54264031;hpb=d4fdf5099eff793459ad956b6a40ff85003cecc0;p=sfa.git diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py index 9892d8ca..769a72f6 100644 --- a/sfa/rspecs/elements/versions/pgv2Node.py +++ b/sfa/rspecs/elements/versions/pgv2Node.py @@ -1,7 +1,7 @@ from sfa.util.xrn import Xrn from sfa.util.xml import XpathFilter -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 @@ -11,6 +11,10 @@ from sfa.rspecs.elements.bwlimit import BWlimit from sfa.rspecs.elements.pltag import PLTag from sfa.rspecs.elements.versions.pgv2Services import PGv2Services from sfa.rspecs.elements.versions.pgv2SliverType import PGv2SliverType +from sfa.rspecs.elements.versions.pgv2Interface import PGv2Interface +from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag +from sfa.rspecs.elements.granularity import Granularity +from sfa.rspecs.elements.attribute import Attribute from sfa.planetlab.plxrn import xrn_to_hostname @@ -33,16 +37,19 @@ class PGv2Node: # set location if node.get('location'): node_elem.add_instance('location', node['location'], Location.fields) + + # set granularity + if node['exclusive'] == "true": + granularity = node.get('granularity') + node_elem.add_instance('granularity', granularity, granularity.fields) # set interfaces - if node.get('interfaces'): - for interface in node.get('interfaces', []): - node_elem.add_instance('interface', interface, ['component_id', 'client_id']) + PGv2Interface.add_interfaces(node_elem, node.get('interfaces')) + #if node.get('interfaces'): + # for interface in node.get('interfaces', []): + # node_elem.add_instance('interface', interface, ['component_id', 'client_id']) # set available element - if node.get('boot_state'): - if node.get('boot_state').lower() == 'boot': - available_elem = node_elem.add_element('available', now='true') - else: - available_elem = node_elem.add_element('available', now='false') + if node.get('available'): + available_elem = node_elem.add_element('available', now=node['available']) # add services PGv2Services.add_services(node_elem, node.get('services', [])) # add slivers @@ -56,9 +63,17 @@ class PGv2Node: for initscript in node.get('pl_initscripts', []): slivers['tags'].append({'name': 'initscript', 'value': initscript['name']}) PGv2SliverType.add_slivers(node_elem, slivers) - + + # advertise the node tags + tags = node.get('tags', []) + if tags: + for tag in tags: + tag['name'] = tag.pop('tagname') + node_elem.add_instance('{%s}attribute' % xml.namespaces['planetlab'], tag, ['name', 'value']) + return node_elems + @staticmethod def get_nodes(xml, filter={}): xpath = '//node%s | //default:node%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter)) @@ -75,36 +90,60 @@ class PGv2Node: 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) nodes.append(node) if 'component_id' in node_elem.attrib: node['authority_id'] = Xrn(node_elem.attrib['component_id']).get_authority_urn() # 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] + node['hardware_types'] = [dict(hw_type.get_instance(HardwareType)) for hw_type in hardware_type_elems] # get location location_elems = node_elem.xpath('./default:location | ./location') - locations = [location_elem.get_instance(Location) for location_elem in location_elems] + locations = [dict(location_elem.get_instance(Location)) for location_elem in location_elems] if len(locations) > 0: node['location'] = locations[0] + # get granularity + granularity_elems = node_elem.xpath('./default:granularity | ./granularity') + if len(granularity_elems) > 0: + node['granularity'] = granularity_elems[0].get_instance(Granularity) + # get interfaces iface_elems = node_elem.xpath('./default:interface | ./interface') - node['interfaces'] = [iface_elem.get_instance(Interface) for iface_elem in iface_elems] + node['interfaces'] = [dict(iface_elem.get_instance(Interface)) for iface_elem in iface_elems] # get services node['services'] = PGv2Services.get_services(node_elem) # get slivers node['slivers'] = PGv2SliverType.get_slivers(node_elem) - available_elems = node_elem.xpath('./default:available | ./available') - if len(available_elems) > 0 and 'name' in available_elems[0].attrib: + + # get boot state + available_elems = node_elem.xpath('./default:available | ./available') + if len(available_elems) > 0 and 'now' in available_elems[0].attrib: if available_elems[0].attrib.get('now', '').lower() == 'true': node['boot_state'] = 'boot' else: node['boot_state'] = 'disabled' + + # get initscripts + node['pl_initscripts'] = [] + initscript_elems = node_elem.xpath('./default:sliver_type/planetlab:initscript | ./sliver_type/initscript') + if len(initscript_elems) > 0: + for initscript_elem in initscript_elems: + if 'name' in initscript_elem.attrib: + node['pl_initscripts'].append(dict(initscript_elem.attrib)) + + # get node tags + tag_elems = node_elem.xpath('./planetlab:attribute | ./attribute') + node['tags'] = [] + if len(tag_elems) > 0: + for tag_elem in tag_elems: + tag = dict(tag_elem.get_instance(Attribute)) + tag['tagname'] = tag.pop('name') + node['tags'].append(tag) return nodes