X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FAPI.py;h=7af3cec2b9177ed1ab337b4f5bd447c2db19a4ba;hb=7ff3079ce042525acbf00e0d4fe555e8988c128d;hp=c4ec4c2c3d6b81af9e22f7b8d9d0bda64978d3c9;hpb=f5cd72e35593c96b9996ab4e49674cccc7525c48;p=plcapi.git

diff --git a/PLC/API.py b/PLC/API.py
index c4ec4c2..7af3cec 100644
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -14,6 +14,18 @@ import traceback
 import string
 
 import xmlrpclib
+import simplejson
+try:
+    # Try to use jsonlib before using simpljson. This is a hack to get around
+    # the fact that the version of simplejson avaialble for f8 is slightly 
+    # faster than xmlrpc but not as fast as jsonlib. There is no jsonlib 
+    # pacakge available for f8, so this has to be installed manually and
+    # is not expected to always be available. Remove this once we move away
+    # from f8 based MyPLC's         
+    import jsonlib
+    json = jsonlib
+except:
+    json = simplejson 
 
 # See "2.2 Characters" in the XML specification:
 #
@@ -84,7 +96,6 @@ except ImportError:
 from PLC.Config import Config
 from PLC.Faults import *
 import PLC.Methods
-import PLC.Legacy
 import PLC.Accessors
 
 def import_deep(name):
@@ -98,7 +109,6 @@ class PLCAPI:
 
     # flat list of method names
     native_methods = PLC.Methods.native_methods
-    legacy_methods = PLC.Legacy.native_methods
 
     # other_methods_map : dict {methodname: fullpath}
     # e.g. 'Accessors' -> 'PLC.Accessors.Accessors'
@@ -112,8 +122,8 @@ class PLCAPI:
             for method in getattr(import_deep(fullpath),"methods"):
                 other_methods_map[method] = fullpath
 
-    all_methods = native_methods + legacy_methods + other_methods_map.keys()
-    
+    all_methods = native_methods + other_methods_map.keys()
+
     def __init__(self, config = "/etc/planetlab/plc_config", encoding = "utf-8"):
         self.encoding = encoding
 
@@ -123,15 +133,24 @@ class PLCAPI:
 
         # Load configuration
         self.config = Config(config)
-	
-	# Initialize database connection
+
+        # Initialize database connection
         if self.config.PLC_DB_TYPE == "postgresql":
             from PLC.PostgreSQL import PostgreSQL
             self.db = PostgreSQL(self)
-
         else:
             raise PLCAPIError, "Unsupported database type " + self.config.PLC_DB_TYPE
 
+        # Aspects modify the API by injecting code before, after or
+        # around method calls. -- http://github.com/baris/pyaspects/blob/master/README
+        # 
+        # As of now we only have aspects for OMF integration, that's
+        # why we enable aspects only if PLC_OMF is set to true.
+        if self.config.PLC_OMF_ENABLED:
+            from aspects import apply_omf_aspect
+            apply_omf_aspect()
+
+
     def callable(self, method):
         """
         Return a new instance of the specified method.
@@ -140,14 +159,12 @@ class PLCAPI:
         # Look up method
         if method not in self.all_methods:
             raise PLCInvalidAPIMethod, method
-        
+
         # Get new instance of method
         try:
             classname = method.split(".")[-1]
             if method in self.native_methods:
                 fullpath="PLC.Methods." + method
-            elif method in self.legacy_methods:
-                fullpath="PLC.Legacy." + method
             else:
                 fullpath=self.other_methods_map[method]
             module = __import__(fullpath, globals(), locals(), [classname])
@@ -205,3 +222,17 @@ class PLCAPI:
             data = buildSOAP(kw = {'%sResponse' % method: {'Result': result}}, encoding = self.encoding)
 
         return data
+
+    def handle_json(self, source, data):
+        """
+        Handle a JSON request 
+        """
+        method, args = json.loads(data)
+        try:
+            result = self.call(source, method, *args)
+        except Exception, e:
+            result = str(e)
+       
+        return json.dumps(result) 
+        
+