StringIO

[sfa.git] / sfa / rspecs / sfa_rspec_converter.py

diff --git a/sfa/rspecs/sfa_rspec_converter.py b/sfa/rspecs/sfa_rspec_converter.py
index 368ce6b..577b788 100755 (executable)
--- a/sfa/rspecs/sfa_rspec_converter.py
+++ b/sfa/rspecs/sfa_rspec_converter.py
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 
-from lxml import etree
-from StringIO import StringIO
-from sfa.util.xrn import *
+from __future__ import print_function
+
+from sfa.util.xrn import hrn_to_urn
 from sfa.rspecs.rspec import RSpec
 from sfa.rspecs.version_manager import VersionManager
 
@@ -80,18 +80,9 @@ class SfaRSpecConverter:
                         location_attrs['longitude'] = location.get('longitude', 'None')
                         pg_rspec.xml.add_element('location', location_attrs, parent=node_element)
 
-                    sliver_element = sfa_node_element.find('sliver')
-                    if sliver_element != None:
-                        if content_type == 'request':  
-                            # remove all child elements
-                            for child in sfa_node_element.iterchildren():
-                                sfa_node_element.remove(child)
-                        # add the sliver    
-                        pg_rspec.xml.add_element('sliver_type', {'name': 'planetlab-vnode'}, parent=node_element)
-
         return pg_rspec.toxml()
 
 if __name__ == '__main__':
     import sys
     if len(sys.argv) > 1:    
-        print SfaRSpecConverter.to_pg_rspec(sys.argv[1])
+        print(SfaRSpecConverter.to_pg_rspec(sys.argv[1]))