connectAggregatges() renamed to get_connections

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

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index eb4652e..0ecc01d 100644 (file)
--- 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, 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.