git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop support for API v1, hard-wired v2
[sfa.git]
/
sfa
/
server
/
sfaapi.py
diff --git
a/sfa/server/sfaapi.py
b/sfa/server/sfaapi.py
index
9afe9b4
..
c18452b
100644
(file)
--- 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
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.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.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.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.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):
####################
class SfaApi (XmlrpcApi):
@@
-246,9
+249,8
@@
class SfaApi (XmlrpcApi):
Converts the specified result into a standard GENI compliant
response
"""
Converts the specified result into a standard GENI compliant
response
"""
+ # as of dec 13 2011 we only support API v2
if self.interface.lower() in ['aggregate', 'slicemgr']:
if self.interface.lower() in ['aggregate', 'slicemgr']:
- if hasattr(self.config, 'SFA_AGGREGATE_API_VERSION') and \
- self.config.SFA_AGGREGATE_API_VERSION == 2:
- result = self.prepare_response_v2_am(result)
+ result = self.prepare_response_v2_am(result)
return XmlrpcApi.prepare_response(self, result, method)
return XmlrpcApi.prepare_response(self, result, method)