From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 21 Dec 2011 21:11:17 +0000 (-0500)
Subject: add 'geni_api_versions' field to GetVersion output
X-Git-Tag: sfa-2.0-7~13^2~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=524dea147f722c881aea976ec5d475ef393c6af2;p=sfa.git

add 'geni_api_versions' field to GetVersion output
---

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index 89559204..b7106e6d 100644
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -12,12 +12,14 @@ class AggregateManager:
     
         xrn=Xrn(api.hrn)
         version = version_core()
-        version_generic = {'interface':'aggregate',
-                           'sfa': 2,
-                           'geni_api': 2,
-                           'hrn':xrn.get_hrn(),
-                           'urn':xrn.get_urn(),
-                           }
+        version_generic = {
+            'interface':'aggregate',
+            'sfa': 2,
+            'geni_api': 2,
+            'geni_api_versions': {'2': '%s:%s' % (api.config.SFA_SM_HOST, api.config.SFA_SM_PORT)}, 
+            'hrn':xrn.get_hrn(),
+            'urn':xrn.get_urn(),
+            }
         version.update(version_generic)
         testbed_version = self.driver.aggregate_version()
         version.update(testbed_version)
diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py
index e22ec50c..f0cced3a 100644
--- a/sfa/managers/slice_manager.py
+++ b/sfa/managers/slice_manager.py
@@ -48,15 +48,17 @@ class SliceManager:
             if rspec_version.content_type in ['*', 'request']:
                 request_rspec_versions.append(rspec_version.to_dict())
         xrn=Xrn(api.hrn, 'authority+sa')
-        version_more = {'interface':'slicemgr',
-                        'sfa': 2,
-                        'geni_api': 2,
-                        'hrn' : xrn.get_hrn(),
-                        'urn' : xrn.get_urn(),
-                        'peers': peers,
-                        'geni_request_rspec_versions': request_rspec_versions,
-                        'geni_ad_rspec_versions': ad_rspec_versions,
-                    }
+        version_more = {
+            'interface':'slicemgr',
+            'sfa': 2,
+            'geni_api': 2,
+            'geni_api_versions': {'2': '%s:%s' % (api.config.SFA_SM_HOST, api.config.SFA_SM_PORT)},
+            'hrn' : xrn.get_hrn(),
+            'urn' : xrn.get_urn(),
+            'peers': peers,
+            'geni_request_rspec_versions': request_rspec_versions,
+            'geni_ad_rspec_versions': ad_rspec_versions,
+            }
         sm_version=version_core(version_more)
         # local aggregate if present needs to have localhost resolved
         if api.hrn in api.aggregates: