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.plc.api import SfaAPI
from sfa.util.config import Config
+
from sfa.trust.certificate import Keypair
from sfa.trust.hierarchy import Hierarchy
-from sfa.util.report import trace, error
from sfa.server.registry import Registries
-from sfa.util.xmlrpcprotocol import *
-import socket
+
+from sfa.storage.table import SfaTable
+
+import sfa.client.sfaprotocol as sfaprotocol
+
+from sfa.generic import Generic
def main():
config = Config()
# 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 = sfaprotocol.server_proxy(url, key_file, cert_file)
+ sfa_api = Generic.the_flavour()
credential = sfa_api.getCredential()
# get peer registries
records = []
target_hrns = hrn_dict[registry_hrn]
try:
- records = registries[registry_hrn].resolve(credential, target_hrns)
+ records = registries[registry_hrn].Resolve(target_hrns, credential)
found_records.extend([record['hrn'] for record in records])
+ except ServerException:
+ # an exception will be thrown if the record doenst exist
+ # if so remove the record from the local registry
+ continue
except:
+ # this deosnt necessarily mean the records dont exist
+ # lets give them the benefit of the doubt here (for now)
+ found_records.extend(target_hrns)
traceback.print_exc()
# remove what wasnt found
for peer_record in peer_records:
if peer_record['hrn'] not in found_records:
- registries[sfa_api.hrn].remove(credential, peer_record)
+ registries[sfa_api.hrn].Remove(peer_record['hrn'], credential, peer_record['type'])
if __name__ == '__main__':
main()