ListResources uses the 'rspec_version' field specified in the 'options' struct to...

[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 7f0a754..254c817 100644 (file)
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -15,6 +15,7 @@ from sfa.util.rspec import *
 from sfa.util.specdict import *
 from sfa.util.faults import *
 from sfa.util.record import SfaRecord
+from sfa.rspecs.sfa_rspec import SfaRSpec
 from sfa.util.policy import Policy
 from sfa.util.prefixTree import prefixTree
 from sfa.util.sfaticket import *
@@ -23,6 +24,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
@@ -94,9 +96,11 @@ def CreateSliver(api, xrn, creds, rspec, users, call_id):
         server = api.aggregates[aggregate]
         threads.run(server.CreateSliver, xrn, credential, rspec, users, call_id)
             
-    results = threads.get_results() 
-    merged_rspec = merge_rspecs(results)
-    return merged_rspec
+    results = threads.get_results()
+    rspec = SfaRSpec()
+    for result in results:
+        rspec.merge(result)     
+    return rspec
 
 def RenewSliver(api, xrn, creds, expiration_time, call_id):
     if Callids().already_handled(call_id): return True
@@ -336,6 +340,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:
@@ -346,7 +354,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
 
@@ -372,13 +380,15 @@ def ListResources(api, creds, options, call_id):
         #threads.run(server.get_resources, cred, xrn, origin_hrn)
                     
     results = threads.get_results()
-    merged_rspec = merge_rspecs(results)
+    rspec = SfaRSpec()
+    for result in results:
+        rspec.merge(result)
 
     # cache the result
     if caching and api.cache and not xrn:
-        api.cache.add('nodes', merged_rspec)
+        api.cache.add(version_string, rspec)
  
-    return merged_rspec
+    return rspec.toxml()
 
 # first draft at a merging SliverStatus
 def SliverStatus(api, slice_xrn, creds, call_id):