CreateSliver() should return an xml string

[sfa.git] / sfa / managers / slice_manager_pl.py

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index dc16a05..596ae31 100644 (file)
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -15,7 +15,10 @@ from sfa.util.rspec import *
 from sfa.util.specdict import *
 from sfa.util.faults import *
 from sfa.util.record import SfaRecord
+from sfa.rspecs.pg_rspec import PGRSpec
 from sfa.rspecs.sfa_rspec import SfaRSpec
+from sfa.rspecs.pg_rspec_converter import PGRSpecConverter
+from sfa.rspecs.rspec_parser import parse_rspec    
 from sfa.util.policy import Policy
 from sfa.util.prefixTree import prefixTree
 from sfa.util.sfaticket import *
@@ -24,6 +27,7 @@ from sfa.util.threadmanager import ThreadManager
 import sfa.util.xmlrpcprotocol as xmlrpcprotocol     
 import sfa.plc.peers as peers
 from sfa.util.version import version_core
+from sfa.rspecs.rspec_version import RSpecVersion
 from sfa.util.callids import Callids
 
 # we have specialized xmlrpclib.ServerProxy to remember the input url
@@ -99,7 +103,7 @@ def CreateSliver(api, xrn, creds, rspec, users, call_id):
     rspec = SfaRSpec()
     for result in results:
         rspec.merge(result)     
-    return rspec
+    return rspec.toxml()
 
 def RenewSliver(api, xrn, creds, expiration_time, call_id):
     if Callids().already_handled(call_id): return True
@@ -339,6 +343,10 @@ def ListResources(api, creds, options, call_id):
     xrn = options.get('geni_slice_urn', '')
     (hrn, type) = urn_to_hrn(xrn)
 
+    # get the rspec's return format from options
+    rspec_version = RSpecVersion(options.get('rspec_version', 'SFA 1'))
+    version_string = "rspec_%s_%s" % (rspec_version.format, rspec_version.version)
+
     # get hrn of the original caller
     origin_hrn = options.get('origin_hrn', None)
     if not origin_hrn:
@@ -349,7 +357,7 @@ def ListResources(api, creds, options, call_id):
     
     # look in cache first 
     if caching and api.cache and not xrn:
-        rspec =  api.cache.get('nodes')
+        rspec =  api.cache.get(version_string)
         if rspec:
             return rspec
 
@@ -375,13 +383,23 @@ def ListResources(api, creds, options, call_id):
         #threads.run(server.get_resources, cred, xrn, origin_hrn)
                     
     results = threads.get_results()
+    #results.append(open('/root/protogeni.rspec', 'r').read())
     rspec = SfaRSpec()
     for result in results:
-        rspec.merge(result)
+        try:
+            tmp_rspec = parse_rspec(result)
+            if isinstance(tmp_rspec, SfaRSpec):
+                rspec.merge(result)
+            elif isinstance(tmp_rspec, PGRSpec):
+                rspec.merge(PGRSpecConverter.to_sfa_rspec(result))
+            else:
+                api.logger.info("SM.ListResources: invalid aggregate rspec")                        
+        except:
+            api.logger.info("SM.ListResources: Failed to merge aggregate rspec")
 
     # cache the result
     if caching and api.cache and not xrn:
-        api.cache.add('nodes', rspec)
+        api.cache.add(version_string, rspec.toxml())
  
     return rspec.toxml()