resolve circular import

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

diff --git a/sfa/util/api.py b/sfa/util/api.py
index 3158851..099f079 100644 (file)
--- a/sfa/util/api.py
+++ b/sfa/util/api.py
@@ -1,8 +1,8 @@
 #
-# Geniwrapper XML-RPC and SOAP interfaces
+# SFA XML-RPC and SOAP interfaces
 #
-### $Id: api.py 15596 2009-10-31 21:42:05Z anil $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/plc/api.py $
+### $Id$
+### $URL$
 #
 
 import sys
@@ -17,7 +17,7 @@ from sfa.util.faults import *
 from sfa.util.debug import *
 from sfa.trust.credential import *
 from sfa.trust.certificate import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.sfalogging import *
 
 # See "2.2 Characters" in the XML specification:
@@ -97,14 +97,16 @@ 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
         
         # flat list of method names
-        methods_module = __import__(methods)
-        self.methods = methods_module.methods.all
+         
+        self.methods_module = methods_module = __import__(methods, fromlist=[methods])
+        self.methods = methods_module.all
 
         # Better just be documenting the API
         if config is None:
@@ -113,22 +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
-        
-        # Initialize the PLC shell only if SFA wraps a myPLC
-        rspec_type = self.config.get_aggregate_rspec_type()
-        if (rspec_type == 'pl' or rspec_type == 'vini'):
-            self.plshell = self.getPLCShell()
-            self.plshell_version = self.getPLCShellVersion()
-
-        self.hrn = self.config.SFA_INTERFACE_HRN
+        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):
@@ -137,16 +141,16 @@ class BaseAPI:
         """
         # Look up method
         if method not in self.methods:
-            raise GeniInvalidAPIMethod, method
+            raise SfaInvalidAPIMethod, method
         
         # Get new instance of method
         try:
             classname = method.split(".")[-1]
-            module = __import__("sfa.methods." + method, globals(), locals(), [classname])
+            module = __import__(self.methods_module.__name__ + "." + method, globals(), locals(), [classname])
             callablemethod = getattr(module, classname)(self)
             return getattr(module, classname)(self)
         except ImportError, AttributeError:
-            raise GeniInvalidAPIMethod, method
+            raise SfaInvalidAPIMethod, method
 
     def call(self, source, method, *args):
         """
@@ -155,6 +159,7 @@ class BaseAPI:
         """
         function = self.callable(method)
         function.source = source
+        self.source = source
         return function(*args)
 
     def handle(self, source, data):
@@ -192,7 +197,7 @@ class BaseAPI:
 
         # Return result
         if interface == xmlrpclib:
-            if not isinstance(result, GeniFault):
+            if not isinstance(result, SfaFault):
                 result = (result,)
 
             data = xmlrpclib.dumps(result, methodresponse = True, encoding = self.encoding, allow_none = 1)