Simple module for toggling network namespaces based on slice attributes

[nodemanager.git] / api.py

diff --git a/api.py b/api.py
index fe97ae2..f8200fb 100644 (file)
--- a/api.py
+++ b/api.py
@@ -24,15 +24,11 @@ import logger
 import sliver_vs
 import ticket
 import tools
-
+from api_calls import *
 
 API_SERVER_PORT = 812
 UNIX_ADDR = '/tmp/sliver_mgr.api'
 
-deliver_ticket = None  # set in sm.py:start()
-
-from api_calls import *
-
 class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
     # overriding _dispatch to achieve this effect is officially deprecated,
     # but I can't figure out how to get access to .request without
@@ -67,7 +63,7 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
                     raise xmlrpclib.Fault(102, \
                         'Invalid argument: the first argument must be a sliver name.')
                 if not caller_name in (target_name, target_rec['delegations']):
-                    raise xmlrpclib.Fault(108, 'Permission denied.')
+                    raise xmlrpclib.Fault(108, '%s: Permission denied.' % caller_name)
                 try: result = method(target_rec, *args[1:])
                 except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err)
             else: result = method(*args)