From e3dfbbc08aee7acaf3aedaeb9771cccd677cd647 Mon Sep 17 00:00:00 2001 From: Mohamed Larabi Date: Sat, 19 Oct 2013 01:09:05 +0200 Subject: [PATCH] handle other sliver_type in geniv3 rspecs --- sfa/rspecs/elements/versions/pgv2Node.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py index 8266f969..d553d219 100644 --- a/sfa/rspecs/elements/versions/pgv2Node.py +++ b/sfa/rspecs/elements/versions/pgv2Node.py @@ -55,7 +55,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'): @@ -71,8 +75,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 -- 2.43.0