X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fslice_manager_pl.py;fp=sfa%2Fmanagers%2Fslice_manager_pl.py;h=acf7864c54f26567cd4dd545961c9dd42b08eb60;hb=40d980701a909581b485fbcf7c58ca3ace543961;hp=01fd43b2faf863686af2925e7a7c7568d4ff84c4;hpb=e2ef655b4f4c9fb20f0c802aa7ed7ea300d79b22;p=sfa.git diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index 01fd43b2..acf7864c 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -28,6 +28,7 @@ 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.rspecs.pl_rspec_version import supported_rspecs 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]) @@ -344,7 +346,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: