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
sfaprotocol is renamed into sfaserverproxy, with class SfaServerProxy
[sfa.git]
/
sfa
/
server
/
sfa_component_setup.py
diff --git
a/sfa/server/sfa_component_setup.py
b/sfa/server/sfa_component_setup.py
index
3775391
..
589a572
100755
(executable)
--- a/
sfa/server/sfa_component_setup.py
+++ b/
sfa/server/sfa_component_setup.py
@@
-6,7
+6,7
@@
from optparse import OptionParser
from sfa.util.faults import ConnectionKeyGIDMismatch
from sfa.util.config import Config
from sfa.util.faults import ConnectionKeyGIDMismatch
from sfa.util.config import Config
-import sfa.client.xmlrpcprotocol as xmlrpcprotocol
+from sfa.client.sfaserverproxy import SfaServerProxy
from sfa.util.plxrn import hrn_to_pl_slicename, slicename_to_hrn
from sfa.trust.certificate import Keypair, Certificate
from sfa.util.plxrn import hrn_to_pl_slicename, slicename_to_hrn
from sfa.trust.certificate import Keypair, Certificate
@@
-48,7
+48,7
@@
def server_proxy(url=None, port=None, keyfile=None, certfile=None,verbose=False)
if verbose:
print "Contacting registry at: %(url)s" % locals()
if verbose:
print "Contacting registry at: %(url)s" % locals()
- server =
xmlrpcprotocol.server_p
roxy(url, keyfile, certfile)
+ server =
SfaServerP
roxy(url, keyfile, certfile)
return server
return server