From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Fri, 20 Jul 2007 19:49:05 +0000 (+0000)
Subject: Merge from HEAD
X-Git-Tag: planetlab-4_1-rc1~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e705535e3e27e55e8a27bcd89b81824be2ede2e4;p=nodemanager.git

Merge from HEAD
---

diff --git a/api.py b/api.py
index 96fafe7..c3b980c 100644
--- a/api.py
+++ b/api.py
@@ -52,9 +52,11 @@ def Ticket(tkt):
     """Ticket(tkt): deliver a ticket"""
     try:
         data = ticket.verify(tkt)
+        name = data['slivers'][0]['name']
         if data != None:
             deliver_ticket(data)
-        logger.log('Got ticket')
+        logger.log('Ticket delivered for %s' % name)
+        Create(database.db.get(name))
     except Exception, err:
         raise xmlrpclib.Fault(102, 'Ticket error: ' + str(err))
 
@@ -133,11 +135,12 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
         except KeyError:
             api_method_list = api_method_dict.keys()
             api_method_list.sort()
-            raise xmlrpclib.Fault(100, 'Invalid API method %s.  Valid choices are %s' % (method_name, ', '.join(api_method_list)))
+            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: 
-            raise xmlrpclib.Fault(101, 'Invalid argument count: got %d, expecting %d.' % (len(args), 
-            expected_nargs))
+            raise xmlrpclib.Fault(101, 'Invalid argument count: got %d, expecting %d.' % \
+                (len(args), expected_nargs))
         else:
             # Figure out who's calling.
             # XXX - these ought to be imported directly from some .h file
@@ -150,11 +153,11 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
                 target_name = args[0]
                 target_rec = database.db.get(target_name)
                 if not (target_rec and target_rec['type'].startswith('sliver.')): 
-                    raise xmlrpclib.Fault(102, 'Invalid argument: the first argument must be a sliver name.')
-                if not (caller_name, method_name) in target_rec['delegations']:
+                    raise xmlrpclib.Fault(102, 
+                        'Invalid argument: the first argument must be a sliver name.')
+                if not caller_name in target_rec['delegations']:
                # or (caller_name == 'utah_elab_delegate' and target_name.startswith('utah_'))): 
                     raise xmlrpclib.Fault(108, 'Permission denied.')
-
                 result = method(target_rec, *args[1:])
             else: result = method(*args)
             if result == None: result = 1
diff --git a/database.py b/database.py
index be304d3..46a4e47 100644
--- a/database.py
+++ b/database.py
@@ -104,10 +104,8 @@ class Database(dict):
             if rec['instantiation'] == 'plc-instantiated': accounts.get(name).ensure_created(rec)
             if rec['instantiation'] == 'nm-controller': accounts.get(name).ensure_created(rec)
 
-        #try: bwmon.GetSlivers(self)
-        #except: logger.log_exc()
+		# Wake up bwmom to update limits.
         bwmon.lock.set()
-        # request a database dump
         global dump_requested
         dump_requested = True
         db_cond.notify()