move sfa.util.server into sfa.server.sfaserver

[sfa.git] / sfa / server / slicemgr.py

diff --git a/sfa/server/slicemgr.py b/sfa/server/slicemgr.py
index 800bcc7..9a7fa4a 100644 (file)
--- a/sfa/server/slicemgr.py
+++ b/sfa/server/slicemgr.py
@@ -1,15 +1,10 @@
-### $Id$
-### $URL$
-
 import os
 import sys
 import datetime
 import time
+from sfa.server.sfaserver import SfaServer
 
-from sfa.util.geniserver import *
-from sfa.util.geniclient import *
-
-class SliceMgr(GeniServer):
+class SliceMgr(SfaServer):
 
   
     ##
@@ -21,5 +16,4 @@ 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"):
-        GeniServer.__init__(self, ip, port, key_file, cert_file)
-        self.server.interface = 'slicemgr'      
+        SfaServer.__init__(self, ip, port, key_file, cert_file,'slicemgr')