removed another bunch of references to geni

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

diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index 65da7c5..1902a64 100644 (file)
--- a/sfa/server/registry.py
+++ b/sfa/server/registry.py
@@ -1,5 +1,5 @@
 #
-# Registry is a GeniServer that implements the Registry interface
+# Registry is a SfaServer that implements the Registry interface
 #
 ### $Id$
 ### $URL$
@@ -10,12 +10,12 @@ import os
 import time
 import sys
 
-from sfa.util.geniserver import GeniServer
-from sfa.util.geniclient import GeniClient
-from sfa.util.genitable import GeniTable
+from sfa.util.server import SfaServer
 from sfa.util.faults import *
 from sfa.util.storage import *
-
+import sfa.util.xmlrpcprotocol as xmlrpcprotocol
+import sfa.util.soapprotocol as soapprotocol
+ 
 # GeniLight client support is optional
 try:
     from egeni.geniLight_client import *
@@ -23,9 +23,9 @@ except ImportError:
     GeniClientLight = None            
 
 ##
-# Registry is a GeniServer that serves registry and slice operations at PLC.
+# Registry is a SfaServer that serves registry and slice operations at PLC.
 
-class Registry(GeniServer):
+class Registry(SfaServer):
     ##
     # Create a new registry object.
     #
@@ -35,12 +35,12 @@ class Registry(GeniServer):
     # @param cert_file certificate filename containing public key (could be a GID file)
 
     def __init__(self, ip, port, key_file, cert_file):
-        GeniServer.__init__(self, ip, port, key_file, cert_file)
+        SfaServer.__init__(self, ip, port, key_file, cert_file)
         self.server.interface = 'registry' 
 
 
 ##
-# Registries is a dictionary of geniclient registry connections keyed on the registry
+# Registries is a dictionary of registry connections keyed on the registry
 # hrn
 
 class Registries(dict):
@@ -50,7 +50,8 @@ class Registries(dict):
     def __init__(self, api, file = "/etc/sfa/registries.xml"):
         dict.__init__(self, {})
         self.api = api
-    
+        self.interfaces = []
+       
         # create default connection dict
         connection_dict = {}
         for field in self.required_fields:
@@ -80,7 +81,7 @@ class Registries(dict):
     def connectRegistries(self):
         """
         Get connection details for the trusted peer registries from file and 
-        create an GeniClient connection to each. 
+        create a connection to each. 
         """
         registries = self.registry_info['registries']['registry']
         if isinstance(registries, dict):
@@ -93,10 +94,10 @@ class Registries(dict):
                 hrn, address, port = registry['hrn'], registry['addr'], registry['port']
                 if not hrn or not address or not port:
                     continue
-
+                self.interfaces.append(registry)
                 # check which client we should use
-                # geniclient is default
-                client_type = 'geniclient'
+                # sfa.util.xmlrpcprotocol is default
+                client_type = 'xmlrpcprotocol'
                 if registry.has_key('client') and registry['client'] in ['geniclientlight']:
                     client_type = 'geniclientlight'
                 
@@ -108,12 +109,13 @@ class Registries(dict):
                 if client_type in ['geniclientlight'] and GeniClientLight:
                     self[hrn] = GeniClientLight(url, self.api.key_file, self.api.cert_file) 
                 else:    
-                    self[hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)
+                    self[hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
 
         # set up a connection to the local registry
-        # connect to registry using GeniClient
         address = self.api.config.SFA_REGISTRY_HOST
         port = self.api.config.SFA_REGISTRY_PORT
         url = 'http://%(address)s:%(port)s' % locals()
-        self[self.api.hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)            
+        local_registry = {'hrn': self.api.hrn, 'addr': address, 'port': port}
+        self.interfaces.append(local_registry)
+        self[self.api.hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)