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
rough cleanup of the slicemanager business
[sfa.git]
/
sfa
/
server
/
modpython
/
SfaAggregateModPython.py
diff --git
a/sfa/server/modpython/SfaAggregateModPython.py
b/sfa/server/modpython/SfaAggregateModPython.py
index
deaf89f
..
3a87017
100755
(executable)
--- a/
sfa/server/modpython/SfaAggregateModPython.py
+++ b/
sfa/server/modpython/SfaAggregateModPython.py
@@
-9,13
+9,13
@@
import sys
import traceback
import sys
import traceback
-import xmlrpclib
from mod_python import apache
from mod_python import apache
-from sfa.plc.api import SfaAPI
from sfa.util.sfalogging import logger
from sfa.util.sfalogging import logger
+from sfa.planetlab.server import SfaApi
+
+api = SfaApi(interface='aggregate')
-api = SfaAPI(interface='aggregate')
def handler(req):
try:
def handler(req):
try:
@@
-51,7
+51,7
@@
def handler(req):
return apache.OK
return apache.OK
- except Exception
,
err:
+ except Exception
as
err:
# Log error in /var/log/httpd/(ssl_)?error_log
# Log error in /var/log/httpd/(ssl_)?error_log
- logger.log_exc('%r'
%
err)
+ logger.log_exc('%r'
%
err)
return apache.HTTP_INTERNAL_SERVER_ERROR
return apache.HTTP_INTERNAL_SERVER_ERROR