From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 7 Aug 2012 14:48:44 +0000 (-0400)
Subject: added geni_api to GetVersion output
X-Git-Tag: sfa-3.0-0~150
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=4f610c199d1007ab210ed97c25e6249e28da1e30

added geni_api to GetVersion output
---

diff --git a/sfa/server/sfaapi.py b/sfa/server/sfaapi.py
index 9fe7656c..80bb7cd0 100644
--- a/sfa/server/sfaapi.py
+++ b/sfa/server/sfaapi.py
@@ -10,9 +10,8 @@ from sfa.trust.auth import Auth
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.credential import Credential
 from sfa.trust.rights import determine_rights
-
+from sfa.util.version import version_core
 from sfa.server.xmlrpcapi import XmlrpcApi
-
 from sfa.client.return_value import ReturnValue
 
 
@@ -232,9 +231,10 @@ class SfaApi (XmlrpcApi):
             output = result.faultString 
         return output
 
-    def prepare_response_v2_am(self, result):
+    def prepare_response_am(self, result):
+        version = version_core() 
         response = {
-            'geni_api': 2,             
+            'geni_api': version['geni_api'],             
             'code': self.get_geni_code(result),
             'value': self.get_geni_value(result),
             'output': self.get_geni_output(result),
@@ -248,6 +248,6 @@ class SfaApi (XmlrpcApi):
         """
         # as of dec 13 2011 we only support API v2
         if self.interface.lower() in ['aggregate', 'slicemgr']: 
-            result = self.prepare_response_v2_am(result)
+            result = self.prepare_response_am(result)
         return XmlrpcApi.prepare_response(self, result, method)
 
diff --git a/sfa/util/version.py.in b/sfa/util/version.py.in
index 46b31d39..82537f30 100644
--- a/sfa/util/version.py.in
+++ b/sfa/util/version.py.in
@@ -7,6 +7,7 @@ def version_core (more={}):
     core = { 'code_tag' : version_tag,
              'code_url' : scm_url,
              'hostname' : socket.gethostname(),
+             'geni_api': 3,
              }
     core.update(more)
     return core