X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fapi.py;h=39d6538254d2fa04ba85a52d29d6fcf38ec61351;hb=b28b70593bb5ac1d3017910736b64d8f3140a90f;hp=65ccc88b825911fec905e0a898e8f6df471d0fd8;hpb=9c3a451f7d42b349462d2c80f81644c5a150b2f2;p=sfa.git

diff --git a/sfa/util/api.py b/sfa/util/api.py
index 65ccc88b..39d65382 100644
--- a/sfa/util/api.py
+++ b/sfa/util/api.py
@@ -1,9 +1,6 @@
 #
 # SFA XML-RPC and SOAP interfaces
 #
-### $Id$
-### $URL$
-#
 
 import sys
 import os
@@ -11,14 +8,17 @@ import traceback
 import string
 import xmlrpclib
 
-import sfa.util.sfalogging
-from sfa.trust.auth import Auth
-from sfa.util.config import *
 from sfa.util.faults import *
-from sfa.util.debug import *
+from sfa.util.config import *
+import sfa.util.xmlrpcprotocol as xmlrpcprotocol
+from sfa.util.sfalogging import logger
+from sfa.trust.auth import Auth
+from sfa.util.cache import Cache
 from sfa.trust.credential import *
 from sfa.trust.certificate import *
-from sfa.util.namespace import *
+
+# this is wrong all right, but temporary 
+from sfa.managers.import_manager import import_manager
 
 # See "2.2 Characters" in the XML specification:
 #
@@ -99,7 +99,7 @@ class ManagerWrapper:
     """
     This class acts as a wrapper around an SFA interface manager module, but
     can be used with any python module. The purpose of this class is raise a 
-    SfaNotImplemented exception if the a someone attepmts to use an attribute 
+    SfaNotImplemented exception if someone attempts to use an attribute 
     (could be a callable) thats not available in the library by checking the
     library using hasattr. This helps to communicate better errors messages 
     to the users and developers in the event that a specifiec operation 
@@ -111,19 +111,17 @@ class ManagerWrapper:
         self.interface = interface
         
     def __getattr__(self, method):
-        
         if not hasattr(self.manager, method):
             raise SfaNotImplemented(method, self.interface)
         return getattr(self.manager, method)
         
 class BaseAPI:
 
-    cache = None
     protocol = None
   
     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, cache = cache):
+                 key_file = None, cert_file = None, cache = None):
 
         self.encoding = encoding
         
@@ -134,7 +132,6 @@ class BaseAPI:
         # Better just be documenting the API
         if config is None:
             return
-        
         # Load configuration
         self.config = Config(config)
         self.auth = Auth(peer_cert)
@@ -145,18 +142,20 @@ class BaseAPI:
         self.cert_file = cert_file
         self.cert = Certificate(filename=self.cert_file)
         self.cache = cache
+        if self.cache is None:
+            self.cache = Cache()
         self.credential = None
         self.source = None 
         self.time_format = "%Y-%m-%d %H:%M:%S"
-        self.logger=sfa.util.sfalogging.logger
-        
+        self.logger = logger
+ 
         # load registries
         from sfa.server.registry import Registries
-        self.registries = Registries(self) 
+        self.registries = Registries() 
 
         # load aggregates
         from sfa.server.aggregate import Aggregates
-        self.aggregates = Aggregates(self)
+        self.aggregates = Aggregates()
 
 
     def get_interface_manager(self, manager_base = 'sfa.managers'):
@@ -164,23 +163,19 @@ class BaseAPI:
         Returns the appropriate manager module for this interface.
         Modules are usually found in sfa/managers/
         """
-        
+        manager=None
         if self.interface in ['registry']:
-            mgr_type = self.config.SFA_REGISTRY_TYPE
-            manager_module = manager_base + ".registry_manager_%s" % mgr_type
+            manager=import_manager ("registry",  self.config.SFA_REGISTRY_TYPE)
         elif self.interface in ['aggregate']:
-            mgr_type = self.config.SFA_AGGREGATE_TYPE
-            manager_module = manager_base + ".aggregate_manager_%s" % mgr_type 
+            manager=import_manager ("aggregate", self.config.SFA_AGGREGATE_TYPE)
         elif self.interface in ['slicemgr', 'sm']:
-            mgr_type = self.config.SFA_SM_TYPE
-            manager_module = manager_base + ".slice_manager_%s" % mgr_type
+            manager=import_manager ("slice",     self.config.SFA_SM_TYPE)
         elif self.interface in ['component', 'cm']:
-            mgr_type = self.config.SFA_CM_TYPE
-            manager_module = manager_base + ".component_manager_%s" % mgr_type
-        else:
+            manager=import_manager ("component", self.config.SFA_CM_TYPE)
+        if not manager:
             raise SfaAPIError("No manager for interface: %s" % self.interface)  
-        manager = __import__(manager_module, fromlist=[manager_base])
-        # this isnt necessary but will hlep to produce better error messages
+            
+        # this isnt necessary but will help to produce better error messages
         # if someone tries to access an operation this manager doesn't implement  
         manager = ManagerWrapper(manager, self.interface)
 
@@ -243,7 +238,7 @@ class BaseAPI:
         except SfaFault, fault:
             result = fault 
         except Exception, fault:
-            traceback.print_exc(file = log)
+            logger.log_exc("BaseAPI.handle has caught Exception")
             result = SfaAPIError(fault)
 
 
@@ -271,3 +266,14 @@ class BaseAPI:
                 raise result 
             
         return response
+
+    def get_cached_server_version(self, server):
+        cache_key = server.url + "-version"
+        server_version = None
+        if self.cache:
+            server_version = self.cache.get(cache_key)
+        if not server_version:
+            server_version = server.GetVersion()
+            # cache version for 24 hours
+            self.cache.add(cache_key, server_version, ttl= 60*60*24)
+        return server_version