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
fix bug in install_peer_certs
[sfa.git]
/
sfa
/
server
/
sfa-clean-peer-records.py
diff --git
a/sfa/server/sfa-clean-peer-records.py
b/sfa/server/sfa-clean-peer-records.py
index
e3d8128
..
bcb917b
100644
(file)
--- a/
sfa/server/sfa-clean-peer-records.py
+++ b/
sfa/server/sfa-clean-peer-records.py
@@
-3,16
+3,20
@@
import sys
import os
import traceback
import sys
import os
import traceback
-from sfa.util.namespace import *
-from sfa.util.table import SfaTable
+import socket
+
from sfa.util.prefixTree import prefixTree
from sfa.util.prefixTree import prefixTree
-from sfa.plc.api import SfaAPI
from sfa.util.config import Config
from sfa.util.config import Config
+
from sfa.trust.certificate import Keypair
from sfa.trust.hierarchy import Hierarchy
from sfa.server.registry import Registries
from sfa.trust.certificate import Keypair
from sfa.trust.hierarchy import Hierarchy
from sfa.server.registry import Registries
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol
-import socket
+
+from sfa.storage.table import SfaTable
+
+from sfa.client.sfaserverproxy import SfaServerProxy
+
+from sfa.generic import Generic
def main():
config = Config()
def main():
config = Config()
@@
-31,8
+35,8
@@
def main():
# and a valid credential
authority = config.SFA_INTERFACE_HRN
url = 'http://%s:%s/' %(config.SFA_REGISTRY_HOST, config.SFA_REGISTRY_PORT)
# and a valid credential
authority = config.SFA_INTERFACE_HRN
url = 'http://%s:%s/' %(config.SFA_REGISTRY_HOST, config.SFA_REGISTRY_PORT)
- registry =
xmlrpcprotocol.get_server
(url, key_file, cert_file)
- sfa_api =
SfaAPI(key_file = key_file, cert_file = cert_file, interface='registry'
)
+ registry =
SfaServerProxy
(url, key_file, cert_file)
+ sfa_api =
Generic.the_flavour(
)
credential = sfa_api.getCredential()
# get peer registries
credential = sfa_api.getCredential()
# get peer registries