From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 8 Mar 2011 22:49:27 +0000 (+0100)
Subject: GetVersion['peers'] for SMs also reports local AM when relevant, with localhost resolved
X-Git-Tag: sfa-1.0-17~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=83c4278e0065d0e72f382e353f6b89d0e8edeb6a;hp=be30bf70fc4462f3c2a486d386130f1bab535712;p=sfa.git

GetVersion['peers'] for SMs also reports local AM when relevant, with localhost resolved
---

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index d8977e3c..44715dd2 100644
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -29,14 +29,20 @@ from sfa.util.version import version_core
 from sfa.managers.aggregate_manager_pl import slice_status
 
 def GetVersion(api):
+    # peers explicitly in aggregates.xml
     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' : xrn.get_hrn(),
-                         'urn' : xrn.get_urn(),
-                         'peers': peers,
-                         })
+    sm_version=version_core({'interface':'slicemgr',
+                             'hrn' : xrn.get_hrn(),
+                             'urn' : xrn.get_urn(),
+                             'peers': peers,
+                             })
+    # local aggregate if present needs to have localhost resolved
+    if api.hrn in api.aggregates:
+        local_am_url=api.aggregates[api.hrn]._ServerProxy__host
+        sm_version['peers'][api.hrn]=local_am_url.replace('localhost',sm_version['hostname'])
+    return sm_version
 
 def create_slice(api, xrn, creds, rspec, users):
     hrn, type = urn_to_hrn(xrn)