X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Faggregate.py;h=aecc3b69affc196ca1652f8d2113bc6322b81761;hb=dfb45a5cfa125a4633bd21350855e6ad5ddbc88d;hp=fd899e865b58b08de994a61029ab7810f64aad58;hpb=5f78ea7c4804aa5baca5c77afa8c7e52ca2fb072;p=sfa.git

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index fd899e86..aecc3b69 100644
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -25,14 +25,14 @@ class Aggregate(SfaServer):
 ##
 # Aggregates is a dictionary of aggregate connections keyed on the aggregate hrn
 
-class Aggregates(dict):
+class Aggregates(Interfaces):
 
-    default_dict = {'registries': {'registry': [default_fields]}}
+    default_dict = {'aggregates': {'aggregate': [Interfaces.default_fields]}}
  
-    def __init__(self, api, file = "/etc/sfa/aggregates.xml"):
-        Interfaces.__init__(self, api, conf_file, 'sa')
+    def __init__(self, api, conf_file = "/etc/sfa/aggregates.xml"):
+        Interfaces.__init__(self, api, conf_file, 'ma')
 
-    def connectAggregates(self, interfaces):
+    def get_connections(self, interfaces):
         """
         Get connection details for the trusted peer aggregates from file and 
         create an connection to each. 
@@ -46,5 +46,5 @@ class Aggregates(dict):
         local_aggregate = {'hrn': self.api.hrn, 'addr': address, 'port': port}
         self.interfaces.append(local_aggregate) 
         connections[self.api.hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
-        return connetions
+        return connections