X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fsfaapi.py;h=845ccffe06ad6a87b0333325c196731c4bbfe8bf;hb=ac8ec612da42acae82de032057c39068f87c5409;hp=97741bf6f305a2c123a74dd7e6dae93a447029a0;hpb=ee8a376da1107884bee1ea29248a70e4da8410c9;p=sfa.git diff --git a/sfa/server/sfaapi.py b/sfa/server/sfaapi.py index 97741bf6..845ccffe 100644 --- a/sfa/server/sfaapi.py +++ b/sfa/server/sfaapi.py @@ -1,14 +1,18 @@ +import os, os.path +import datetime + from sfa.util.faults import SfaAPIError from sfa.util.config import Config from sfa.util.cache import Cache - from sfa.trust.auth import Auth from sfa.trust.certificate import Keypair, Certificate - -# this is wrong all right, but temporary -from sfa.managers.managerwrapper import ManagerWrapper, import_manager - +from sfa.trust.credential import Credential +from sfa.trust.rights import determine_rights from sfa.server.xmlrpcapi import XmlrpcApi +from sfa.util.genicode import GENICODE + +# thgen xxx fixme this is wrong all right, but temporary, will use generic +from sfa.util.table import SfaTable #################### class SfaApi (XmlrpcApi): @@ -16,9 +20,18 @@ class SfaApi (XmlrpcApi): """ An SfaApi instance is a basic xmlrcp service augmented with the local cryptographic material and hrn - It also has the notion of neighbour sfa services - as defined in /etc/sfa/{aggregates,registries}.xml - It has no a priori knowledge of the underlying testbed + + It also has the notion of its own interface (a string describing + whether we run a registry, aggregate or slicemgr) and has + the notion of neighbour sfa services as defined + in /etc/sfa/{aggregates,registries}.xml + + Finally it contains a cache instance + + It gets augmented by the generic layer with + (*) an instance of manager (actually a manager module for now) + (*) which in turn holds an instance of a testbed driver + For convenience api.manager.driver == api.driver """ def __init__ (self, encoding="utf-8", methods='sfa.methods', @@ -33,6 +46,7 @@ class SfaApi (XmlrpcApi): return # Load configuration self.config = Config(config) + self.credential = None self.auth = Auth(peer_cert) self.interface = interface self.hrn = self.config.SFA_INTERFACE_HRN @@ -43,7 +57,6 @@ class SfaApi (XmlrpcApi): self.cache = cache if self.cache is None: self.cache = Cache() - self.credential = None # load registries from sfa.server.registry import Registries @@ -52,32 +65,11 @@ class SfaApi (XmlrpcApi): # load aggregates from sfa.server.aggregate import Aggregates self.aggregates = Aggregates() + + # filled later on by generic/Generic + self.manager=None - - def get_interface_manager(self, manager_base = 'sfa.managers'): - """ - Returns the appropriate manager module for this interface. - Modules are usually found in sfa/managers/ - """ - manager=None - if self.interface in ['registry']: - manager=import_manager ("registry", self.config.SFA_REGISTRY_TYPE) - elif self.interface in ['aggregate']: - manager=import_manager ("aggregate", self.config.SFA_AGGREGATE_TYPE) - elif self.interface in ['slicemgr', 'sm']: - manager=import_manager ("slice", self.config.SFA_SM_TYPE) - elif self.interface in ['component', 'cm']: - manager=import_manager ("component", self.config.SFA_CM_TYPE) - if not manager: - raise SfaAPIError("No manager for interface: %s" % self.interface) - - # 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) - - return manager - - def get_server(self, interface, cred, timeout=30): + def server_proxy(self, interface, cred, timeout=30): """ Returns a connection to the specified interface. Use the specified credential to determine the caller and look for the caller's key/cert @@ -93,7 +85,7 @@ class SfaApi (XmlrpcApi): auth_info = hierarchy.get_auth_info(caller_gid.get_hrn()) key_file = auth_info.get_privkey_filename() cert_file = auth_info.get_gid_filename() - server = interface.get_server(key_file, cert_file, timeout) + server = interface.server_proxy(key_file, cert_file, timeout) return server @@ -104,7 +96,7 @@ class SfaApi (XmlrpcApi): type = 'authority' path = self.config.SFA_DATA_DIR filename = ".".join([self.interface, self.hrn, type, "cred"]) - cred_filename = path + os.sep + filename + cred_filename = os.path.join(path,filename) cred = None if os.path.isfile(cred_filename): cred = Credential(filename = cred_filename) @@ -146,7 +138,7 @@ class SfaApi (XmlrpcApi): """ from sfa.server.registry import Registries registries = Registries() - registry = registries.get_server(self.hrn, self.key_file, self.cert_file) + registry = registries.server_proxy(self.hrn, self.key_file, self.cert_file) cert_string=self.cert.save_to_string(save_parents=True) # get self credential self_cred = registry.GetSelfCredential(cert_string, self.hrn, 'authority') @@ -166,7 +158,9 @@ class SfaApi (XmlrpcApi): if not auth_hrn or hrn == self.config.SFA_INTERFACE_HRN: auth_hrn = hrn auth_info = self.auth.get_auth_info(auth_hrn) - table = self.SfaTable() + # xxx thgen fixme - use SfaTable hardwired for now + #table = self.SfaTable() + table = SfaTable() records = table.findObjects({'hrn': hrn, 'type': 'authority+sa'}) if not records: raise RecordNotFound @@ -193,10 +187,11 @@ class SfaApi (XmlrpcApi): # see if this file exists # XX This is really the aggregate's credential. Using this is easier than getting - # the registry's credential from iteslf (ssl errors). - ma_cred_filename = self.config.SFA_DATA_DIR + os.sep + self.interface + self.hrn + ".ma.cred" + # the registry's credential from iteslf (ssl errors). + filename = self.interface + self.hrn + ".ma.cred" + ma_cred_path = os.path.join(self.config.SFA_DATA_DIR,filename) try: - self.credential = Credential(filename = ma_cred_filename) + self.credential = Credential(filename = ma_cred_path) except IOError: self.credential = self.getCredentialFromRegistry() @@ -210,3 +205,48 @@ class SfaApi (XmlrpcApi): # cache version for 24 hours self.cache.add(cache_key, server_version, ttl= 60*60*24) return server_version + + + def get_geni_code(self, result): + code = { + 'geni_code': GENICODE.SUCCESS, + 'am_type': 'sfa', + 'am_code': None, + } + if isinstnace(result, SfaFault): + code['geni_code'] = result.faultCode + code['am_code'] = result.faultCode + + return code + + def get_geni_value(self, result): + value = result + if isinstance(result, SfaFault): + value = "" + return value + + def get_geni_output(self, result): + output = "" + if isinstance(result, SFaFault): + output = result.faultString + return output + + def prepare_response_v2_am(self, result): + response = { + 'code': self.get_geni_code(result), + 'value': self.get_geni_value(result), + 'output': self.get_geni_output(result), + } + return response + + def prepare_response(self, result, method=""): + """ + Converts the specified result into a standard GENI compliant + response + """ + if self.interface.lower() == 'aggregate': + if hasattr(self.config, 'SFA_AGGREGATE_API_VERSION') and \ + self.config.SFA_AGGREGATE_API_VERSION == "2": + result = self.prepare_response_v2_am(result) + return XmlrpcApi.prepare_response(self, result, method) +