X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fsfaapi.py;h=26957c001030df61302760221445325be1b9bb00;hb=99374374f38fb62e54a6c284eec6b06c1c53dff7;hp=242979cbace74e7f4d97137af2edb0dd581b142a;hpb=e6c8a0a5061bae7e646851b6f265a02cdfb57f22;p=sfa.git

diff --git a/sfa/server/sfaapi.py b/sfa/server/sfaapi.py
index 242979cb..26957c00 100644
--- a/sfa/server/sfaapi.py
+++ b/sfa/server/sfaapi.py
@@ -1,4 +1,4 @@
-import os.path
+import os, os.path
 import datetime
 
 from sfa.util.faults import SfaAPIError
@@ -8,11 +8,11 @@ from sfa.trust.auth import Auth
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.credential import Credential
 from sfa.trust.rights import determine_rights
-
-# this is wrong all right, but temporary, will use generic
 from sfa.server.xmlrpcapi import XmlrpcApi
-import os
-import datetime
+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): 
@@ -20,12 +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 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', 
@@ -63,11 +69,7 @@ class SfaApi (XmlrpcApi):
         # filled later on by generic/Generic
         self.manager=None
 
-    # tmp
-    def get_interface_manager(self, manager_base = 'sfa.managers'):
-        return self.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 
@@ -83,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
                
         
@@ -136,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')
@@ -156,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
@@ -201,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_AM_API_VERSION') and \
+              self.config.SFA_AM_API_VERSION == "2":
+                result = self.prepare_response_v2_am(result)
+        return XmlrpcApi.prepare_response(result, method)
+