...contd

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

diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index 3b209ea..7e8e3b2 100644 (file)
--- a/sfa/server/registry.py
+++ b/sfa/server/registry.py
@@ -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:
@@ -93,7 +94,7 @@ 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'
@@ -112,8 +113,10 @@ class Registries(dict):
 
         # set up a connection to the local registry
         # connect to registry using GeniClient
-        address = self.api.config.GENI_REGISTRY_HOST
-        port = self.api.config.GENI_REGISTRY_PORT
+        address = self.api.config.SFA_REGISTRY_HOST
+        port = self.api.config.SFA_REGISTRY_PORT
         url = 'http://%(address)s:%(port)s' % locals()
+        local_registry = {'hrn': self.api.hrn, 'addr': address, 'port': port}
+        self.interfaces.append(local_registry)
         self[self.api.hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)