X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=api.py;h=7b5ab95f73d230be7eaad4a7d30f6bec1b267f06;hb=570d234b7d7b40416b296de71225f28c826ee991;hp=221e606b023f0a1b62da8fe60f2b73a983d77e44;hpb=3224c1906c82596a86ae734181488ed14a0f0976;p=nodemanager.git

diff --git a/api.py b/api.py
index 221e606..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,13 +20,11 @@ import threading
 import xmlrpclib
 import sys
 
-import accounts
 import database
-import logger
-import sliver_vs
-import ticket
 import tools
 from api_calls import *
+import logger
+
 try:
     sys.path.append("/etc/planetlab")
     from plc_config import *
@@ -38,7 +34,7 @@ except:
     logger.log("api:  Warning: admin slice prefix set to %s" %(PLC_SLICE_PREFIX), 2)
 
 API_SERVER_PORT = 812
-UNIX_ADDR = '/tmp/sliver_mgr.api'
+UNIX_ADDR = '/tmp/nodemanager.api'
 
 class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
     # overriding _dispatch to achieve this effect is officially deprecated,
@@ -56,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:
@@ -67,12 +63,15 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
             ucred = self.request.getsockopt(socket.SOL_SOCKET, SO_PEERCRED, sizeof_struct_ucred)
             xid = struct.unpack('3i', ucred)[1]
             caller_name = pwd.getpwuid(xid)[0]
-            # Special case the genicw
+            # Special case : the sfa component manager
             if caller_name == PLC_SLICE_PREFIX+"_sfacm":
                 try: result = method(*args)
                 except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err)
             # Anyone can call these functions
-            elif method_name not in ('Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'):
+            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.
                 # Authenticate the caller if not in the above fncts.
                 if method_name == "GetRecord":
                     target_name = caller_name
@@ -82,20 +81,17 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
                 # Gather target slice's object.
                 target_rec = database.db.get(target_name)
 
-                # only work on slivers or self.  Sannity check.
-                if not (target_rec and target_rec['type'].startswith('sliver.')): 
+                # only work on slivers or self. Sanity check.
+                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)
                 else:
                     raise xmlrpclib.Fault(108, '%s: Permission denied.' % caller_name)
-            else: # Execute anonymous call. 
-                try: result = method(*args)
-                except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err)
             if result == None: result = 1
             return result
 
@@ -105,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)