# Mark Huang <mlhuang@cs.princeton.edu>
#
# Copyright (C) 2004-2006 The Trustees of Princeton University
-# $Id$
#
import sys
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:
#
from PLC.Faults import *
import PLC.Methods
import PLC.Accessors
-import PLC.Legacy
def import_deep(name):
mod = __import__(name)
# other_methods_map : dict {methodname: fullpath}
# e.g. 'Accessors' -> 'PLC.Accessors.Accessors'
other_methods_map={}
- for subdir in [ 'Accessors', 'Legacy']:
+ for subdir in [ 'Accessors' ]:
path="PLC."+subdir
# scan e.g. PLC.Accessors.__all__
pkg = __import__(path).__dict__[subdir]
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
# 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.
# Look up method
if method not in self.all_methods:
raise PLCInvalidAPIMethod, method
-
+
# Get new instance of method
try:
classname = method.split(".")[-1]
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)
+
+