Date: Thu, 20 Aug 2015 14:55:01 GMT From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289969 - in soc2015/kczekirda/www: . tpl Message-ID: <201508201455.t7KEt1Q8080635@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kczekirda Date: Thu Aug 20 14:55:00 2015 New Revision: 289969 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289969 Log: add node status, change changing task status from mac to hostname Modified: soc2015/kczekirda/www/menu.py soc2015/kczekirda/www/tpl/main.tpl Modified: soc2015/kczekirda/www/menu.py ============================================================================== --- soc2015/kczekirda/www/menu.py Thu Aug 20 14:52:53 2015 (r289968) +++ soc2015/kczekirda/www/menu.py Thu Aug 20 14:55:00 2015 (r289969) @@ -34,7 +34,7 @@ return output else: conn = sqlite3.connect(database) - conn.execute("CREATE TABLE nodes (id INTEGER PRIMARY KEY, host char(254) NOT NULL, mac char(20) NOT NULL, ip char(20) NOT NULL, boot char(50) NOT NULL)") + conn.execute("CREATE TABLE nodes (id INTEGER PRIMARY KEY, host char(254) NOT NULL, mac char(20) NOT NULL, ip char(20) NOT NULL, boot char(50) NOT NULL, status char(50))") conn.execute("CREATE TABLE tasks (id INTEGER PRIMARY KEY, revision char(20) NOT NULL, host char(254), status char(20))") conn.commit() return redirect('/admin') @@ -69,11 +69,11 @@ current_data = c.fetchone() return template(edit_node_tpl,old=current_data,id=id) -@route('/admin/change_boot/:mac/:new', method='GET') -def change_boot(mac,new): +@route('/admin/change_boot/:host/:new', method='GET') +def change_boot(host,new): conn = sqlite3.connect(database) c = conn.cursor() - c.execute("UPDATE nodes SET boot = ? WHERE mac LIKE ?", (new,mac)) + c.execute("UPDATE nodes SET boot = ? WHERE host LIKE ?", (new,host)) conn.commit() return redirect('/admin') @@ -84,9 +84,10 @@ mac = request.GET.get('mac','').strip() ip = request.GET.get('ip','').strip() boot = request.GET.get('boot','').strip() + status = "?" conn = sqlite3.connect(database) c = conn.cursor() - c.execute("INSERT INTO nodes (host, mac, ip, boot) VALUES (?,?,?,?)", (host,mac,ip,boot)) + c.execute("INSERT INTO nodes (host, mac, ip, boot, status) VALUES (?,?,?,?,?)", (host,mac,ip,boot,status)) conn.commit() c.close() return redirect('/admin') @@ -117,14 +118,22 @@ else: return template(delete_task_tpl,revision=revision) -@route('/admin/change_status/:revision/:new_status', method='GET') -def change_status(revision,new_status): +@route('/admin/change_task_status/:revision/:new_status', method='GET') +def change_task_status(revision,new_status): conn = sqlite3.connect(database) c = conn.cursor() c.execute("UPDATE tasks SET status = ? WHERE revision LIKE ?", (new_status,revision)) conn.commit() return redirect('/admin') +@route('/admin/change_node_status/:hostname/:new_status', method='GET') +def change_node_status(hostname,new_status): + conn = sqlite3.connect(database) + c = conn.cursor() + c.execute("UPDATE nodes SET status = ? WHERE host LIKE ?", (new_status,hostname)) + conn.commit() + return redirect('/admin') + @route('/admin/take_task/:revision/:host', method='GET') def take_task(revision,host): conn = sqlite3.connect(database) Modified: soc2015/kczekirda/www/tpl/main.tpl ============================================================================== --- soc2015/kczekirda/www/tpl/main.tpl Thu Aug 20 14:52:53 2015 (r289968) +++ soc2015/kczekirda/www/tpl/main.tpl Thu Aug 20 14:55:00 2015 (r289969) @@ -5,19 +5,21 @@ <div id="body"> <table border="0"> <tr><td><h2>Nodes</h2></td></tr> -<tr><th>ID</th><th>host</th><th>mac address</th><th>ip address</th><th>boot</th></tr> +<tr><th>ID</th><th>host</th><th>mac address</th><th>ip address</th><th>boot</th><th>status</th></tr> %for row in rows_nodes: %id = row[0] %host = row[1] %mac = row[2] %ip = row[3] %boot = row[4] + %status = row[5] <tr> <td>{{id}}</td> <td>{{host}}</td> <td>{{mac}}</td> <td>{{ip}}</td> <td>{{boot}}</td> + <td>{{status}}</td> <td><a href="/admin/edit_node/{{id}}">Editt</a></td> <td><a href="/admin/delete_node/{{id}}">Delete</a></td> </tr>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508201455.t7KEt1Q8080635>