X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fapi.py;h=28c5a30e2f07b3a85ff34c29a05485a84d8ac883;hb=cb83b38f6586314d51e23dad227047d126bd4b76;hp=099f079d6f1678ee915c33c7c20abd25866491ca;hpb=5ab00a9ce13ad0f8116842e855815a691515d32b;p=sfa.git diff --git a/sfa/util/api.py b/sfa/util/api.py index 099f079d..28c5a30e 100644 --- a/sfa/util/api.py +++ b/sfa/util/api.py @@ -11,14 +11,13 @@ import traceback import string import xmlrpclib +from sfa.util.sfalogging import sfa_logger from sfa.trust.auth import Auth from sfa.util.config import * from sfa.util.faults import * -from sfa.util.debug import * from sfa.trust.credential import * from sfa.trust.certificate import * from sfa.util.namespace import * -from sfa.util.sfalogging import * # See "2.2 Characters" in the XML specification: # @@ -95,16 +94,39 @@ def import_deep(name): mod = getattr(mod, comp) return mod +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 + (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 + is not implemented by a libarary and will generally be more helpful than + the standard AttributeError + """ + def __init__(self, manager, interface): + self.manager = manager + 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: - 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 = 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): self.encoding = encoding # flat list of method names - self.methods_module = methods_module = __import__(methods, fromlist=[methods]) self.methods = methods_module.all @@ -121,10 +143,11 @@ class BaseAPI: self.key = Keypair(filename=self.key_file) self.cert_file = cert_file self.cert = Certificate(filename=self.cert_file) + self.cache = cache self.credential = None self.source = None self.time_format = "%Y-%m-%d %H:%M:%S" - self.logger=get_sfa_logger() + self.logger=sfa_logger # load registries from sfa.server.registry import Registries @@ -135,6 +158,33 @@ class BaseAPI: self.aggregates = Aggregates(self) + def get_interface_manager(self, manager_base = 'sfa.managers'): + """ + Returns the appropriate manager module for this interface. + Modules are usually found in sfa/managers/ + """ + + if self.interface in ['registry']: + mgr_type = self.config.SFA_REGISTRY_TYPE + manager_module = manager_base + ".registry_manager_%s" % mgr_type + elif self.interface in ['aggregate']: + mgr_type = self.config.SFA_AGGREGATE_TYPE + manager_module = manager_base + ".aggregate_manager_%s" % mgr_type + elif self.interface in ['slicemgr', 'sm']: + mgr_type = self.config.SFA_SM_TYPE + manager_module = manager_base + ".slice_manager_%s" % mgr_type + elif self.interface in ['component', 'cm']: + mgr_type = self.config.SFA_CM_TYPE + manager_module = manager_base + ".component_manager_%s" % mgr_type + else: + 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 + # if someone tries to access an operation this manager doesn't implement + manager = ManagerWrapper(manager, self.interface) + + return manager + def callable(self, method): """ Return a new instance of the specified method. @@ -162,17 +212,23 @@ class BaseAPI: self.source = source return function(*args) - def handle(self, source, data): + + def handle(self, source, data, method_map): """ Handle an XML-RPC or SOAP request from the specified source. """ # Parse request into method name and arguments try: interface = xmlrpclib + self.protocol = 'xmlrpclib' (args, method) = xmlrpclib.loads(data) + if method_map.has_key(method): + method = method_map[method] methodresponse = True + except Exception, e: if SOAPpy is not None: + self.protocol = 'soap' interface = SOAPpy (r, header, body, attrs) = parseSOAPRPC(data, header = 1, body = 1, attrs = 1) method = r._name @@ -183,26 +239,34 @@ class BaseAPI: try: result = self.call(source, method, *args) + except SfaFault, fault: + result = fault except Exception, fault: - traceback.print_exc(file = log) - # Handle expected faults - if interface == xmlrpclib: - result = fault - methodresponse = None - elif interface == SOAPpy: - result = faultParameter(NS.ENV_T + ":Server", "Method Failed", method) - result._setDetail("Fault %d: %s" % (fault.faultCode, fault.faultString)) - else: - raise + sfa_logger().log_exc("BaseAPI.handle has caught Exception") + result = SfaAPIError(fault) + # Return result - if interface == xmlrpclib: + response = self.prepare_response(result, method) + return response + + def prepare_response(self, result, method=""): + """ + convert result to a valid xmlrpc or soap response + """ + + if self.protocol == 'xmlrpclib': if not isinstance(result, SfaFault): result = (result,) - - data = xmlrpclib.dumps(result, methodresponse = True, encoding = self.encoding, allow_none = 1) - elif interface == SOAPpy: - data = buildSOAP(kw = {'%sResponse' % method: {'Result': result}}, encoding = self.encoding) - - return data - + response = xmlrpclib.dumps(result, methodresponse = True, encoding = self.encoding, allow_none = 1) + elif self.protocol == 'soap': + if isinstance(result, Exception): + result = faultParameter(NS.ENV_T + ":Server", "Method Failed", method) + result._setDetail("Fault %d: %s" % (result.faultCode, result.faultString)) + else: + response = buildSOAP(kw = {'%sResponse' % method: {'Result': result}}, encoding = self.encoding) + else: + if isinstance(result, Exception): + raise result + + return response