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
/
component.py
diff --git
a/sfa/server/component.py
b/sfa/server/component.py
index
1dc6652
..
df91917
100644
(file)
--- a/
sfa/server/component.py
+++ b/
sfa/server/component.py
@@
-6,18
+6,19
@@
import os
import time
import sys
import time
import sys
-from sfa.
util.componentserver import Component
Server
-
+from sfa.
server.sfaserver import Sfa
Server
+
# GeniLight client support is optional
try:
from egeni.geniLight_client import *
except ImportError:
# GeniLight client support is optional
try:
from egeni.geniLight_client import *
except ImportError:
- GeniClientLight = None
+ GeniClientLight = None
##
# Component is a SfaServer that serves component operations.
##
# Component is a SfaServer that serves component operations.
-class Component(ComponentServer):
+
+class Component(SfaServer):
##
# Create a new registry object.
#
##
# Create a new registry object.
#
@@
-27,5
+28,5
@@
class Component(ComponentServer):
# @param cert_file certificate filename containing public key (could be a GID file)
def __init__(self, ip, port, key_file, cert_file):
# @param cert_file certificate filename containing public key (could be a GID file)
def __init__(self, ip, port, key_file, cert_file):
- ComponentServer.__init__(self, ip, port, key_file, cert_file)
- self.server.interface = 'component'
+ SfaServer.__init__(self, ip, port, key_file,
+ cert_file, interface='component')