From owner-svn-soc-all@freebsd.org Tue Aug 4 10:20:11 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 C9AF39B13C0 for ; Tue, 4 Aug 2015 10:20:11 +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 AE60AC95 for ; Tue, 4 Aug 2015 10:20:11 +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 t74AKBHe043409 for ; Tue, 4 Aug 2015 10:20:11 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t74AK9kY043393 for svn-soc-all@FreeBSD.org; Tue, 4 Aug 2015 10:20:09 GMT (envelope-from kczekirda@FreeBSD.org) Date: Tue, 4 Aug 2015 10:20:09 GMT Message-Id: <201508041020.t74AK9kY043393@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: r289202 - 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: Tue, 04 Aug 2015 10:20:11 -0000 Author: kczekirda Date: Tue Aug 4 10:20:09 2015 New Revision: 289202 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289202 Log: task management init Added: soc2015/kczekirda/www/tpl/add_task.tpl soc2015/kczekirda/www/tpl/delete_task.tpl Modified: soc2015/kczekirda/www/menu.py soc2015/kczekirda/www/tpl/main.tpl Modified: soc2015/kczekirda/www/menu.py ============================================================================== --- soc2015/kczekirda/www/menu.py Tue Aug 4 09:45:10 2015 (r289201) +++ soc2015/kczekirda/www/menu.py Tue Aug 4 10:20:09 2015 (r289202) @@ -6,8 +6,10 @@ database = 'cluster.sqlite' main_tpl = 'tpl/main.tpl' add_node_tpl = 'tpl/add_node.tpl' +add_task_tpl = 'tpl/add_task.tpl' edit_node_tpl = 'tpl/edit_node.tpl' delete_node_tpl = 'tpl/delete_node.tpl' +delete_task_tpl = 'tpl/delete_task.tpl' default = 'menu.ipxe' @route('/static/:path#.+#', name='static') @@ -24,13 +26,16 @@ conn = sqlite3.connect(database) c = conn.cursor() c.execute("SELECT * FROM nodes") - result = c.fetchall() + result_nodes = c.fetchall() + c.execute("SELECT * FROM tasks") + result_tasks = c.fetchall() c.close - output = template(main_tpl,rows=result) + output = template(main_tpl,rows_nodes=result_nodes,rows_tasks=result_tasks) 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 tasks (id INTEGER PRIMARY KEY, revision char(20) NOT NULL, host char(254), status char(20))") conn.commit() return redirect('/admin') @@ -87,6 +92,30 @@ return redirect('/admin') else: return template(add_node_tpl) + +@route('/admin/add_task', method='GET') +def add(): + if request.GET.get('add','').strip(): + revision = request.GET.get('revision','').strip() + conn = sqlite3.connect(database) + c = conn.cursor() + c.execute("INSERT INTO tasks (revision) VALUES (?)", (revision,)) + conn.commit() + c.close() + return redirect('/admin') + else: + return template(add_task_tpl) + +@route('/admin/delete_task/:revision', method='GET') +def delete(revision): + if request.GET.get('delete','').strip(): + conn = sqlite3.connect(database) + c = conn.cursor() + c.execute("DELETE FROM tasks WHERE revision LIKE '%s'" %revision) + conn.commit() + return redirect('/admin') + else: + return template(delete_task_tpl,revision=revision) @route('/menu/:mac', method='GET') def static(mac): Added: soc2015/kczekirda/www/tpl/add_task.tpl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/kczekirda/www/tpl/add_task.tpl Tue Aug 4 10:20:09 2015 (r289202) @@ -0,0 +1,12 @@ + + + +Testing cluster management +
+

Add new task

+
+

revision

+

+
+

Back

+
Added: soc2015/kczekirda/www/tpl/delete_task.tpl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/kczekirda/www/tpl/delete_task.tpl Tue Aug 4 10:20:09 2015 (r289202) @@ -0,0 +1,11 @@ + + + +Testing cluster management +
+

Delete task {{revision}}

+
+ +
+

Back

+
Modified: soc2015/kczekirda/www/tpl/main.tpl ============================================================================== --- soc2015/kczekirda/www/tpl/main.tpl Tue Aug 4 09:45:10 2015 (r289201) +++ soc2015/kczekirda/www/tpl/main.tpl Tue Aug 4 10:20:09 2015 (r289202) @@ -3,10 +3,10 @@ Testing cluster management
-

Nodes

+ -%for row in rows: +%for row in rows_nodes: %id = row[0] %host = row[1] %mac = row[2] @@ -22,6 +22,22 @@ %end + + + +%for row in rows_tasks: + %id = row[0] + %revision = row[1] + %host = row[2] + %status = row[3] + + + + + + + +%end +

Nodes

IDhostmac addressip addressboot
Delete
Add node

Tasks

IDrevisionhoststatus
{{id}}{{revision}}{{host}}{{status}}Delete
Add task
-

Add node