X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FAPI.py;h=201de2d925f25a127c0eadc2fa64a264f8ac643c;hb=12c40b08c0317282d4d278bc8272c55cf2f529ba;hp=6ea37bc610a36a9534f1a314c7b838a093e68938;hpb=edbf1923b57a320ef85f61882240ac2c4a3306f0;p=plcapi.git

diff --git a/PLC/API.py b/PLC/API.py
index 6ea37bc..201de2d 100644
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -5,14 +5,28 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 #
 # Copyright (C) 2004-2006 The Trustees of Princeton University
-# $Id$
 #
 
+import os
 import sys
 import traceback
 import string
 
 import xmlrpclib
+import simplejson
+# use this one
+json=simplejson
+#try:
+#    # Try to use jsonlib before using simpljson. This is a hack to get around
+#    # the fact that the version of simplejson available for f8 is slightly 
+#    # faster than xmlrpc but not as fast as jsonlib. There is no jsonlib 
+#    # package 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:
 #
@@ -110,7 +124,7 @@ class PLCAPI:
                 other_methods_map[method] = fullpath
 
     all_methods = native_methods + other_methods_map.keys()
-    
+
     def __init__(self, config = "/etc/planetlab/plc_config", encoding = "utf-8"):
         self.encoding = encoding
 
@@ -120,15 +134,52 @@ 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()
+        
+        if self.config.PLC_RATELIMIT_ENABLED:
+            from aspects import apply_ratelimit_aspect
+            apply_ratelimit_aspect()
+
+        if getattr(self.config, "PLC_NETCONFIG_ENABLED", False):
+            from aspects.netconfigaspects import apply_netconfig_aspect
+            apply_netconfig_aspect()
+
+        # Enable Caching. Only for GetSlivers for the moment.
+        # TODO: we may consider to do this in an aspect like the ones above.
+        try:
+            if self.config.PLC_GETSLIVERS_CACHE:
+                getslivers_cache = True
+        except AttributeError:
+            getslivers_cache = False
+
+        if getslivers_cache:
+            os.environ['DJANGO_SETTINGS_MODULE']='plc_django_settings'
+            from cache_utils.decorators import cached
+            from PLC.Methods.GetSlivers import GetSlivers
+
+            @cached(7200)
+            def cacheable_call(cls, auth, node_id_or_hostname):
+                return cls.raw_call(auth, node_id_or_hostname)
+            
+            GetSlivers.call = cacheable_call
+            
+
+
     def callable(self, method):
         """
         Return a new instance of the specified method.
@@ -137,7 +188,7 @@ 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]
@@ -200,3 +251,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) 
+        
+