From 6bf71c2dd1f5e530f86479c65161e4ca41c5d8d3 Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 13 Aug 2009 22:03:57 +0000
Subject: [PATCH] added 'interfaces' class variable

---
 sfa/server/aggregate.py | 8 ++++----
 sfa/server/registry.py  | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index 7f2fa87a..45eff40b 100644
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -29,7 +29,6 @@ class Aggregate(GeniServer):
     # @param port the port to listen on
     # @param key_file private key filename of registry
     # @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)
         self.server.interface = 'aggregate'
@@ -44,7 +43,7 @@ class Aggregates(dict):
     def __init__(self, api, file = "/etc/sfa/aggregates.xml"):
         dict.__init__(self, {})
         self.api = api
-
+        self.interfaces = []
         # create default connection dict
         connection_dict = {}
         for field in self.required_fields:
@@ -70,7 +69,6 @@ class Aggregates(dict):
         self.aggregate_info.load()
         self.connectAggregates()
 
-
     def connectAggregates(self):
         """
         Get connection details for the trusted peer aggregates from file and 
@@ -87,6 +85,7 @@ class Aggregates(dict):
                 hrn, address, port = aggregate['hrn'], aggregate['addr'], aggregate['port']
                 if not hrn or not address or not port:
                     continue
+                self.interfaces.append(aggregate)
                 # check which client we should use
                 # geniclient is default
                 client_type = 'geniclient'
@@ -109,4 +108,5 @@ class Aggregates(dict):
         port = self.api.config.SFA_AGGREGATE_PORT
         url = 'http://%(address)s:%(port)s' % locals()
         self[self.api.hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)
-                   
+
+
diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index 65da7c5d..18caa9ce 100644
--- 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'
-- 
2.47.0