X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=api.py;h=7b5ab95f73d230be7eaad4a7d30f6bec1b267f06;hb=9e6b9c1ea9e020c55c85b433bac47231d63e9ffd;hp=a6cae30dd9f3c06657386cd1d94e79a92a28de0a;hpb=a869b6b1e66606b97fc654001275bb50b9f63206;p=nodemanager.git

diff --git a/api.py b/api.py
index a6cae30..7b5ab95 100644
--- a/api.py
+++ b/api.py
@@ -1,6 +1,4 @@
-# $Id$
-# $URL$
-
+#
 """Sliver manager API.
 
 This module exposes an XMLRPC interface that allows PlanetLab users to
@@ -22,10 +20,7 @@ import threading
 import xmlrpclib
 import sys
 
-import accounts
 import database
-import sliver_vs
-import ticket
 import tools
 from api_calls import *
 import logger
@@ -57,7 +52,7 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
             raise xmlrpclib.Fault(100, 'Invalid API method %s.  Valid choices are %s' % \
                 (method_name, ', '.join(api_method_list)))
         expected_nargs = nargs_dict[method_name]
-        if len(args) != expected_nargs: 
+        if len(args) != expected_nargs:
             raise xmlrpclib.Fault(101, 'Invalid argument count: got %d, expecting %d.' % \
                 (len(args), expected_nargs))
         else:
@@ -76,7 +71,7 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
             elif method_name in ('Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'):
                 try: result = method(*args)
                 except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err)
-            else: # Execute anonymous call. 
+            else: # Execute anonymous call.
                 # Authenticate the caller if not in the above fncts.
                 if method_name == "GetRecord":
                     target_name = caller_name
@@ -87,11 +82,11 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
                 target_rec = database.db.get(target_name)
 
                 # only work on slivers or self. Sanity check.
-                if not (target_rec and target_rec['type'].startswith('sliver.')): 
+                if not (target_rec and target_rec['type'].startswith('sliver.')):
                     raise xmlrpclib.Fault(102, \
                         'Invalid argument: the first argument must be a sliver name.')
 
-                # only manipulate slivers who delegate you authority 
+                # only manipulate slivers who delegate you authority
                 if caller_name in (target_name, target_rec['delegations']):
                     try: result = method(target_rec, *args[1:])
                     except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err)
@@ -106,6 +101,7 @@ class APIServer_UNIX(APIServer_INET): address_family = socket.AF_UNIX
 
 def start():
     """Start two XMLRPC interfaces: one bound to localhost, the other bound to a Unix domain socket."""
+    logger.log('api.start')
     serv1 = APIServer_INET(('127.0.0.1', API_SERVER_PORT), requestHandler=APIRequestHandler, logRequests=0)
     tools.as_daemon_thread(serv1.serve_forever)
     try: os.unlink(UNIX_ADDR)