SM.CreateSliver() result rspec is same format as rspec request

[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 01fd43b..6be29bf 100644 (file)
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -19,6 +19,8 @@ from sfa.rspecs.pg_rspec import PGRSpec
 from sfa.rspecs.sfa_rspec import SfaRSpec
 from sfa.rspecs.rspec_converter import RSpecConverter
 from sfa.rspecs.rspec_parser import parse_rspec    
+from sfa.rspecs.rspec_version import RSpecVersion
+from sfa.rspecs.pl_rspec_version import supported_rspecs
 from sfa.util.policy import Policy
 from sfa.util.prefixTree import prefixTree
 from sfa.util.sfaticket import *
@@ -27,7 +29,6 @@ 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
@@ -44,11 +45,12 @@ def GetVersion(api):
     peers =dict ([ (peername,get_serverproxy_url(v)) for (peername,v) in api.aggregates.iteritems() 
                    if peername != api.hrn])
     xrn=Xrn (api.hrn)
-    sm_version=version_core({'interface':'slicemgr',
-                             'hrn' : xrn.get_hrn(),
-                             'urn' : xrn.get_urn(),
-                             'peers': peers,
-                             })
+    version_more = {'interface':'slicemgr',
+                    'hrn' : xrn.get_hrn(),
+                    'urn' : xrn.get_urn(),
+                    'peers': peers,}
+    version_more.update(supported_rspecs)     
+    sm_version=version_core(version_more)
     # local aggregate if present needs to have localhost resolved
     if api.hrn in api.aggregates:
         local_am_url=get_serverproxy_url(api.aggregates[api.hrn])
@@ -58,14 +60,15 @@ def GetVersion(api):
 def CreateSliver(api, xrn, creds, rspec_str, users, call_id):
 
     def _CreateSliver(server, xrn, credentail, rspec, users, call_id):
+            # should check the cache first
             # get aggregate version
             version = server.GetVersion()
-            if 'sfa' in version:
-                # just send the whole rspec to SFA AM/SM 
-                server.CreateSliver(xrn, credential, rspec, users, call_id)
-            elif 'geni_api' in version:
-                pass  
-                # convert to pg rspec
+            if 'sfa' not in version and 'geni_api' in version:
+                # sfa aggregtes support both sfa and pg rspecs, no need to convert
+                # if aggregate supports sfa rspecs. othewise convert to pg rspec
+                rspec = RSpecConverter.to_pg_rspec(rspec)
+
+            return server.CreateSliver(xrn, credential, rspec, users, call_id)
                 
 
     if Callids().already_handled(call_id): return ""
@@ -344,7 +347,7 @@ def ListResources(api, creds, options, call_id):
 
     # 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)
+    version_string = "rspec_%s" % (rspec_version.get_version_name())
 
     # look in cache first
     if caching and api.cache and not xrn: