X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2Node.py;h=8ee64bac99248a0185e414e8edd1580a7bd85526;hb=660408c4319f0bc03e64b2a484dcc72a332d35ac;hp=df45570974e7576bbdab644a2f2601ad67528a47;hpb=8ab8312984ea96e172bd433118949a967c62a2dd;p=sfa.git diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py index df455709..8ee64bac 100644 --- a/sfa/rspecs/elements/versions/pgv2Node.py +++ b/sfa/rspecs/elements/versions/pgv2Node.py @@ -58,7 +58,11 @@ class PGv2Node: slivers = node.get('slivers', []) if not slivers: # we must still advertise the available sliver types - slivers = Sliver({'type': 'plab-vserver'}) + if node.get('sliver_type'): + slivers = Sliver({'type': node['sliver_type']}) + else: + # Planet lab + slivers = Sliver({'type': 'plab-vserver'}) # we must also advertise the available initscripts slivers['tags'] = [] if node.get('pl_initscripts'): @@ -74,8 +78,8 @@ class PGv2Node: node_elem.add_instance('{%s}attribute' % xml.namespaces['planetlab'], tag, ['name', 'value']) # add sliver tag in Request Rspec - if rspec_content_type == "request": - node_elem.add_instance('sliver', '', []) + #if rspec_content_type == "request": + # node_elem.add_instance('sliver', '', []) return node_elems