X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fsfav1Node.py;h=630fd852d5c4afc51be82a10abbb39239a3e4823;hb=55271c452e1e6fd791c9128a51f8ef3d82eeb942;hp=997f395a6b87e917a43110c850ec06308d5fe1a7;hpb=c3de61fe710643aa025945ab0879f2769f57e7dd;p=sfa.git diff --git a/sfa/rspecs/elements/versions/sfav1Node.py b/sfa/rspecs/elements/versions/sfav1Node.py index 997f395a..630fd852 100644 --- a/sfa/rspecs/elements/versions/sfav1Node.py +++ b/sfa/rspecs/elements/versions/sfav1Node.py @@ -143,7 +143,7 @@ class SFAv1Node: node['authority_id'] = node_elem.attrib['site_id'] # get location location_elems = node_elem.xpath('./default:location | ./location') - locations = [loc_elem.get_instance(Location) for loc_elem in location_elems] + locations = [dict(loc_elem.get_instance(Location)) for loc_elem in location_elems] if len(locations) > 0: node['location'] = locations[0] # get bwlimit @@ -153,7 +153,7 @@ class SFAv1Node: 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] + ifaces = [dict(iface_elem.get_instance(Interface)) for iface_elem in iface_elems] node['interfaces'] = ifaces # get services node['services'] = PGv2Services.get_services(node_elem) @@ -163,7 +163,7 @@ class SFAv1Node: 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] + node['hardware_types'] = [dict(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']: