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
removed another bunch of references to geni
[sfa.git]
/
sfa
/
server
/
slicemgr.py
diff --git
a/sfa/server/slicemgr.py
b/sfa/server/slicemgr.py
index
d0782b5
..
1194887
100644
(file)
--- a/
sfa/server/slicemgr.py
+++ b/
sfa/server/slicemgr.py
@@
-5,13
+5,9
@@
import os
import sys
import datetime
import time
import sys
import datetime
import time
+from sfa.util.server import *
-from sfa.util.geniserver import *
-from sfa.util.geniclient import *
-from sfa.util.faults import *
-from sfa.util.misc import *
-
-class SliceMgr(GeniServer):
+class SliceMgr(SfaServer):
##
##
@@
-23,5
+19,5
@@
class SliceMgr(GeniServer):
# @param cert_file certificate filename containing public key (could be a GID file)
def __init__(self, ip, port, key_file, cert_file, config = "/etc/sfa/sfa_config"):
# @param cert_file certificate filename containing public key (could be a GID file)
def __init__(self, ip, port, key_file, cert_file, config = "/etc/sfa/sfa_config"):
-
Geni
Server.__init__(self, ip, port, key_file, cert_file)
+
Sfa
Server.__init__(self, ip, port, key_file, cert_file)
self.server.interface = 'slicemgr'
self.server.interface = 'slicemgr'