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:
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):
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'):
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