From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Fri, 18 Oct 2013 23:09:05 +0000 (+0200)
Subject: handle other sliver_type in geniv3 rspecs
X-Git-Tag: sfa-3.0-2-bonfire-r1-0~12
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=e3dfbbc08aee7acaf3aedaeb9771cccd677cd647

handle other sliver_type in geniv3 rspecs
---

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