X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2Node.py;h=f14e1f81ff20ab847c8fc9fba270bb25e38e6d2e;hb=5c86695dc4235039accca96a0a1e39a41f233dc4;hp=45bbfe37208b1ef85a955b191a2c93752d0313b3;hpb=225bd08bb2fc91fed334391cb958b6d64261194d;p=sfa.git diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py index 45bbfe37..f14e1f81 100644 --- a/sfa/rspecs/elements/versions/pgv2Node.py +++ b/sfa/rspecs/elements/versions/pgv2Node.py @@ -119,13 +119,31 @@ class PGv2Node: # 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 initscripts + initscript_elems = node_elem.xpath('./planetlab:initscript | ./initscript') + if len(initscript_elems) > 0: + for initscript_elem in initscript_elems: + if 'name' in initscript_elem.attrib: + node['pl_initscripts']= initscript_elem.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(initscript_elem.attrib) + # get node tags tag_elems = node_elem.xpath('./planetlab:attribute | ./attribute') node['tags'] = []