X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fsfaapi.py;h=afb71a422841a75f398217a5d3034f824116663c;hb=0d88de5aaee6820835f2d9770aab6c7392f14e21;hp=faf62afd99f047d1cb2412d78d21c8d87fa41150;hpb=5daf08641a6363cb0c05d3c92cdf2bf95dd09366;p=sfa.git

diff --git a/sfa/server/sfaapi.py b/sfa/server/sfaapi.py
index faf62afd..afb71a42 100644
--- a/sfa/server/sfaapi.py
+++ b/sfa/server/sfaapi.py
@@ -2,18 +2,21 @@ import os, os.path
 import datetime
 
 from sfa.util.faults import SfaFault, SfaAPIError
+from sfa.util.genicode import GENICODE
 from sfa.util.config import Config
 from sfa.util.cache import Cache
 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.server.xmlrpcapi import XmlrpcApi
-from sfa.util.genicode import GENICODE
+
 from sfa.client.return_value import ReturnValue
 
 # thgen xxx fixme this is wrong all right, but temporary, will use generic
-from sfa.util.table import SfaTable
+from sfa.storage.table import SfaTable
 
 ####################
 class SfaApi (XmlrpcApi): 
@@ -211,6 +214,7 @@ class SfaApi (XmlrpcApi):
 
     def get_geni_code(self, result):
         code = {
+            'geni_api': 2,             
             'geni_code': GENICODE.SUCCESS, 
             'am_type': 'sfa',
             'am_code': None,
@@ -246,9 +250,8 @@ class SfaApi (XmlrpcApi):
         Converts the specified result into a standard GENI compliant 
         response  
         """
-        if self.interface.lower() == 'aggregate': 
-            if hasattr(self.config, 'SFA_AGGREGATE_API_VERSION') and \
-              self.config.SFA_AGGREGATE_API_VERSION == 2:
-                result = self.prepare_response_v2_am(result)
+        # as of dec 13 2011 we only support API v2
+        if self.interface.lower() in ['aggregate', 'slicemgr']: 
+            result = self.prepare_response_v2_am(result)
         return XmlrpcApi.prepare_response(self, result, method)