resolve circular import

[sfa.git] / sfa / util / api.py

diff --git a/sfa/util/api.py b/sfa/util/api.py
index 514364a..099f079 100644 (file)
--- a/sfa/util/api.py
+++ b/sfa/util/api.py
@@ -97,7 +97,8 @@ def import_deep(name):
 
 class BaseAPI:
 
-    def __init__(self, config = "/etc/sfa/sfa_config", encoding = "utf-8", methods='sfa.methods',
+    def __init__(self, config = "/etc/sfa/sfa_config.py", encoding = "utf-8", methods='sfa.methods',
+
                  peer_cert = None, interface = None, key_file = None, cert_file = None):
 
         self.encoding = encoding
@@ -114,15 +115,24 @@ class BaseAPI:
         # Load configuration
         self.config = Config(config)
         self.auth = Auth(peer_cert)
+        self.hrn = self.config.SFA_INTERFACE_HRN
         self.interface = interface
         self.key_file = key_file
         self.key = Keypair(filename=self.key_file)
         self.cert_file = cert_file
         self.cert = Certificate(filename=self.cert_file)
         self.credential = None
-        
+        self.source = None 
         self.time_format = "%Y-%m-%d %H:%M:%S"
         self.logger=get_sfa_logger()
+        
+        # load registries
+        from sfa.server.registry import Registries
+        self.registries = Registries(self) 
+
+        # load aggregates
+        from sfa.server.aggregate import Aggregates
+        self.aggregates = Aggregates(self)
 
 
     def callable(self, method):
@@ -149,6 +159,7 @@ class BaseAPI:
         """
         function = self.callable(method)
         function.source = source
+        self.source = source
         return function(*args)
 
     def handle(self, source, data):