GetNodeFlavour exposes 'virt' based on node's 'virt' tag, or on PLC_FLAVOUR_VIRT_MAP

[plcapi.git] / PLC / API.py

diff --git a/PLC/API.py b/PLC/API.py
index 783280f..6cab28e 100644 (file)
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -5,15 +5,28 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 #
 # Copyright (C) 2004-2006 The Trustees of Princeton University
-# $Id$
-# $URL$
 #
 
+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:
 #
@@ -129,11 +142,39 @@ class PLCAPI:
         else:
             raise PLCAPIError, "Unsupported database type " + self.config.PLC_DB_TYPE
 
-        # Aspects modify the API injecting code before/after method
-        # calls. As of now we only have aspects for OMF integration,
-        # that's why we enable aspects only if PLC_OMF is set to true.
+        # 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_aspects; apply_aspects()
+            from aspects import apply_omf_aspect
+            apply_omf_aspect()
+        
+        if self.config.PLC_RATELIMIT_ENABLED:
+            from aspects import apply_ratelimit_aspect
+            apply_ratelimit_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):
@@ -207,3 +248,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) 
+        
+