instantiate with the correct # of parameters

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index eb4652e..fd899e8 100644 (file)
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -30,7 +30,7 @@ class Aggregates(dict):
     default_dict = {'registries': {'registry': [default_fields]}}
  
     def __init__(self, api, file = "/etc/sfa/aggregates.xml"):
-        Interfaces.__init__(self, conf_file, 'sa')
+        Interfaces.__init__(self, api, conf_file, 'sa')
 
     def connectAggregates(self, interfaces):
         """

diff --git a/sfa/server/interface.py b/sfa/server/interface.py
index bea5149..6ba74fb 100644 (file)
--- a/sfa/server/interface.py
+++ b/sfa/server/interface.py
@@ -151,7 +151,7 @@ class Interfaces(dict):
             interfaces = [interfaces]
         for interface in interfaces:
             # make sure the required fields are present and not null
-            for key in required_fields
+            for key in required_fields:
                 if not interface.get(key):
                     continue 
             hrn, address, port = interface['hrn'], interface['addr'], interface['port']

diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index fe845a3..5658f37 100644 (file)
--- a/sfa/server/registry.py
+++ b/sfa/server/registry.py
@@ -34,10 +34,10 @@ class Registry(SfaServer):
 
 class Registries(Interfaces):
     
-    default_dict = {'registries': {'registry': [default_fields]}}
+    default_dict = {'registries': {'registry': [Interfaces.default_fields]}}
 
     def __init__(self, api, conf_file = "/etc/sfa/registries.xml"):
-        Interfaces.__init__(self, conf_file, 'sa') 
+        Interfaces.__init__(self, api, conf_file, 'sa') 
 
     def get_connections(self, interfaces):
         """