locker: set desc on lock

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/locker/api.py b/teuthology/locker/api.py
index cfcb0d70fb528a2c804fa3572f97b5a9b485624f..6454ef9762bc5bd0796f7be41c03ca105d633b18 100644 (file)
--- a/teuthology/locker/api.py
+++ b/teuthology/locker/api.py
@@ -35,12 +35,14 @@ class MachineLock:
 
     def POST(self, name):
         user = web.input('user')['user']
+        desc = web.input('desc')['desc']
         machine = load_machine(name)
         if machine.locked:
             raise web.Forbidden()
         res = DB.update('machine', where='name = $name AND locked = false',
                         vars=dict(name=name),
                         locked=True,
+                        description=desc,
                         locked_by=user,
                         locked_since=web.db.SQLLiteral('NOW()'))
         assert res == 1, 'Failed to lock machine {name}'.format(name=name)
@@ -77,6 +79,7 @@ class Lock:
 
     def POST(self):
         user = web.input('user')['user']
+        desc = web.input('desc')['desc']
         num = int(web.input('num')['num'])
         machinetype = dict(machinetype=(web.input(machinetype='plana')['machinetype']))
 
@@ -102,6 +105,7 @@ class Lock:
                                            where=where_cond,
                                            locked=True,
                                            locked_by=user,
+                                           description=desc,
                                            locked_since=web.db.SQLLiteral('NOW()'))
                     assert num_locked == num, 'Failed to lock machines'
             except: