From owner-svn-soc-all@freebsd.org Thu Aug 20 14:55:02 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 371EE9BF8B0 for ; Thu, 20 Aug 2015 14:55:02 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 275681C88 for ; Thu, 20 Aug 2015 14:55:02 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7KEt2hm080661 for ; Thu, 20 Aug 2015 14:55:02 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7KEt1Q8080635 for svn-soc-all@FreeBSD.org; Thu, 20 Aug 2015 14:55:01 GMT (envelope-from kczekirda@FreeBSD.org) Date: Thu, 20 Aug 2015 14:55:01 GMT Message-Id: <201508201455.t7KEt1Q8080635@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289969 - in soc2015/kczekirda/www: . tpl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2015 14:55:02 -0000 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 @@
- + %for row in rows_nodes: %id = row[0] %host = row[1] %mac = row[2] %ip = row[3] %boot = row[4] + %status = row[5] +

Nodes

IDhostmac addressip addressboot
IDhostmac addressip addressbootstatus
{{id}} {{host}} {{mac}} {{ip}} {{boot}}{{status}} Editt Delete