#
# Copyright (C) 2004-2006 The Trustees of Princeton University
# $Id$
+# $URL$
#
import sys
from PLC.Config import Config
from PLC.Faults import *
import PLC.Methods
-import PLC.Shortcuts
import PLC.Legacy
+import PLC.Accessors
def import_deep(name):
mod = __import__(name)
# 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. 'Shortcuts' -> 'PLC.Shortcuts.Shortcuts'
+ # e.g. 'Accessors' -> 'PLC.Accessors.Accessors'
other_methods_map={}
- for subdir in [ 'Shortcuts', 'Legacy']:
+ for subdir in [ 'Accessors' ]:
path="PLC."+subdir
- # scan e.g. PLC.Shortcuts.__all__
+ # scan e.g. PLC.Accessors.__all__
pkg = __import__(path).__dict__[subdir]
for modulename in getattr(pkg,"__all__"):
fullpath=path+"."+modulename
for method in getattr(import_deep(fullpath),"methods"):
other_methods_map[method] = fullpath
- all_methods = native_methods + other_methods_map.keys()
+ all_methods = native_methods + legacy_methods + other_methods_map.keys()
def __init__(self, config = "/etc/planetlab/plc_config", encoding = "utf-8"):
self.encoding = encoding
try:
classname = method.split(".")[-1]
if method in self.native_methods:
- module = __import__("PLC.Methods." + method, globals(), locals(), [classname])
- return getattr(module, classname)(self)
+ 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])
- return getattr(module, classname)(self)
+ module = __import__(fullpath, globals(), locals(), [classname])
+ return getattr(module, classname)(self)
except ImportError, AttributeError:
- raise PLCInvalidAPIMethod, method
+ raise PLCInvalidAPIMethod, "import error %s for %s" % (AttributeError,fullpath)
def call(self, source, method, *args):
"""