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
merged master onto senslab2, manually solved conflicts in setup.py
[sfa.git]
/
sfa
/
server
/
modpython
/
SfaSliceMgrModPython.py
diff --git
a/sfa/server/modpython/SfaSliceMgrModPython.py
b/sfa/server/modpython/SfaSliceMgrModPython.py
index
e0f2b92
..
3de4519
100755
(executable)
--- a/
sfa/server/modpython/SfaSliceMgrModPython.py
+++ b/
sfa/server/modpython/SfaSliceMgrModPython.py
@@
-12,10
+12,10
@@
import traceback
import xmlrpclib
from mod_python import apache
import xmlrpclib
from mod_python import apache
-from sfa.plc.
api import SfaAPI
+from sfa.plc.
plcsfaapi import PlcSfaApi
from sfa.util.sfalogging import logger
from sfa.util.sfalogging import logger
-api =
SfaAPI
(interface='slicemgr')
+api =
PlcSfaApi
(interface='slicemgr')
def handler(req):
try:
def handler(req):
try: