From: Thierry Parmentelat Date: Tue, 26 Oct 2010 11:29:36 +0000 (+0200) Subject: GetVersion to expose urn together with hrn X-Git-Tag: sfa-1.0-8~7 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8662eb7153c57bb4b7a9b4a29988c304866cc519;p=sfa.git GetVersion to expose urn together with hrn --- diff --git a/sfa/managers/registry_manager_pl.py b/sfa/managers/registry_manager_pl.py index 033f762b..4bef95db 100644 --- a/sfa/managers/registry_manager_pl.py +++ b/sfa/managers/registry_manager_pl.py @@ -18,8 +18,10 @@ from sfa.util.version import version_core def GetVersion(api): peers =dict ([ (peername,v._ServerProxy__host) for (peername,v) in api.registries.items() if peername != api.hrn]) + xrn=Xrn(api.hrn) return version_core({'interface':'registry', - 'hrn':api.hrn, + 'hrn':xrn.get_hrn(), + 'urn':xrn.get_urn(), 'peers':peers}) def get_credential(api, xrn, type, is_self=False): diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index d26979be..ed46feb8 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -9,7 +9,7 @@ from lxml import etree from sfa.util.sfalogging import sfa_logger from sfa.util.rspecHelper import merge_rspecs -from sfa.util.xrn import urn_to_hrn, hrn_to_urn +from sfa.util.xrn import Xrn, urn_to_hrn, hrn_to_urn from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * @@ -26,8 +26,10 @@ from sfa.util.version import version_core def GetVersion(api): peers =dict ([ (peername,v._ServerProxy__host) for (peername,v) in api.aggregates.items() if peername != api.hrn]) + xrn=Xrn (api.hrn) return version_core({'interface':'slicemgr', - 'hrn' : api.hrn, + 'hrn' : xrn.get_hrn(), + 'urn' : xrn.get_urn(), 'peers': peers, })