From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 22 Oct 2013 09:45:04 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: geni-v2-broken-and-discontinued~28
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2f59816936c147992accae414c9c19da7d693879;hp=d9f805f1e55480ad42b6a9377cbb259a53595381;p=sfa.git

Merge branch 'master' of ssh://git.onelab.eu/git/sfa
---

diff --git a/sfa/rspecs/elements/versions/nitosv1Sliver.py b/sfa/rspecs/elements/versions/nitosv1Sliver.py
index 3fe074b2..1cbe4941 100644
--- a/sfa/rspecs/elements/versions/nitosv1Sliver.py
+++ b/sfa/rspecs/elements/versions/nitosv1Sliver.py
@@ -5,7 +5,7 @@ from sfa.rspecs.elements.element import Element
 from sfa.rspecs.elements.sliver import Sliver
 from sfa.rspecs.elements.versions.nitosv1PLTag import NITOSv1PLTag
 
-from sfa.planetlab.plxrn import PlXrn
+#from sfa.planetlab.plxrn import PlXrn
 
 class NITOSv1Sliver:
 
@@ -21,9 +21,9 @@ class NITOSv1Sliver:
             if tags:
                 for tag in tags:
                     NITOSv1Sliver.add_sliver_attribute(sliver_elem, tag['tagname'], tag['value'])
-            if sliver.get('sliver_id'):
-                name = PlXrn(xrn=sliver.get('sliver_id')).pl_slicename()
-                sliver_elem.set('name', name)
+#            if sliver.get('sliver_id'):
+#                name = PlXrn(xrn=sliver.get('sliver_id')).pl_slicename()
+#                sliver_elem.set('name', name)
 
     @staticmethod
     def add_sliver_attribute(xml, name, value):
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