X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2Node.py;h=fb9a9ac50cc9044b8a5cb617134d2d2a18ba2af7;hb=1cc8e9613cab8b5b22478de369f259e591c54e6d;hp=68e184b52a9b3350a2492086a69a10fc4457fcdc;hpb=ac1440bdb6bfe8825d2c1e913a0458add730efe3;p=sfa.git diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py index 68e184b5..fb9a9ac5 100644 --- a/sfa/rspecs/elements/versions/pgv2Node.py +++ b/sfa/rspecs/elements/versions/pgv2Node.py @@ -1,10 +1,8 @@ - -from sfa.util.plxrn import PlXrn from sfa.util.xrn import Xrn -from sfa.rspecs.elements.element import Element -from sfa.rspecs.elements.node import Node +from sfa.util.xml import XpathFilter + +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 @@ -13,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.granularity import Granularity + +from sfa.planetlab.plxrn import xrn_to_hostname class PGv2Node: @staticmethod @@ -20,24 +22,32 @@ class PGv2Node: node_elems = [] for node in nodes: node_fields = ['component_manager_id', 'component_id', 'client_id', 'sliver_id', 'exclusive'] - elems = Element.add(xml, 'node', node, node_fields) - node_elem = elems[0] + node_elem = xml.add_instance('node', node, node_fields) node_elems.append(node_elem) # set component name if node.get('component_id'): - component_name = Xrn(node['component_id']).get_leaf() + component_name = xrn_to_hostname(node['component_id']) node_elem.set('component_name', component_name) - # set hardware types - Element.add(node_elem, 'hardware_type', node.get('hardware_types', []), HardwareType.fields.keys()) - # set location - location_elems = Element.add(node_elem, 'location', node.get('location', []), Location.fields) + # set hardware types + if node.get('hardware_types'): + for hardware_type in node.get('hardware_types', []): + node_elem.add_instance('hardware_type', hardware_type, HardwareType.fields) + # 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 - interface_elems = Element.add(node_elem, 'interface', node.get('interfaces', []), Interface.fields) + 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', '').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 @@ -47,10 +57,10 @@ class PGv2Node: slivers = Sliver({'type': 'plab-vserver'}) # we must also advertise the available initscripts slivers['tags'] = [] - for initscript in node.get('pl_initscripts', []): - slivers['tags'].append({'name': 'initscript', 'value': initscript['name']}) + if node.get('pl_initscripts'): + for initscript in node.get('pl_initscripts', []): + slivers['tags'].append({'name': 'initscript', 'value': initscript['name']}) PGv2SliverType.add_slivers(node_elem, slivers) - return node_elems @staticmethod @@ -60,30 +70,47 @@ class PGv2Node: return PGv2Node.get_node_objs(node_elems) @staticmethod - def get_nodes_with_sliver(xml, filter={}): - xpath = '//node/sliver_type | //default:node/default:sliver_type' + def get_nodes_with_slivers(xml, filter={}): + xpath = '//node[count(sliver_type)>0] | //default:node[count(default:sliver_type) > 0]' node_elems = xml.xpath(xpath) return PGv2Node.get_node_objs(node_elems) @staticmethod - def get_nodes_objs(node_elems): + 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] + + # get location + location_elems = node_elem.xpath('./default:location | ./location') + locations = [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['hardware_types'] = Element.get(node_elem, './default:hardwate_type | ./hardware_type', HardwareType) - lolocation_elems = Element.get(node_elem, './default:location | ./location', Location) - if len(location_elems) > 0: - node['location'] = location_elems[0] - node['interfaces'] = Element.get(node_elem, './default:interface | ./interface', Interface) + # get services node['services'] = PGv2Services.get_services(node_elem) + + # get slivers node['slivers'] = PGv2SliverType.get_slivers(node_elem) - available = Element.get(node_element, './default:available | ./available', fields=['now']) - if len(available) > 0 and 'name' in available[0].attrib: - if available[0].attrib.get('now', '').lower() == 'true': + available_elems = node_elem.xpath('./default:available | ./available') + if len(available_elems) > 0 and 'name' in available_elems[0].attrib: + if available_elems[0].attrib.get('now', '').lower() == 'true': node['boot_state'] = 'boot' else: node['boot_state'] = 'disabled'