From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Wed, 9 Apr 2008 17:19:37 +0000 (+0000)
Subject: - additional functions for displaying the pcu.
X-Git-Tag: Monitor-1.0-1~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e7a93ac9e59b2558caac3273c7ad6dc0a68a5e2a;p=monitor.git

- additional functions for displaying the pcu.
---

diff --git a/www/printbadpcus.php b/www/printbadpcus.php
index 2efd71a..c2d8daa 100644
--- a/www/printbadpcus.php
+++ b/www/printbadpcus.php
@@ -1,11 +1,24 @@
 <?php 
 
+function plc_site_link($site_name) 
+{ 
+	return "https://www.planet-lab.org/db/sites/index.php?site_pattern=" .  $site_name;
+}
 
 function pcu_link($pcu) 
 { 
 	return "https://www.planet-lab.org/db/sites/pcu.php?id=" . $pcu['pcu_id']; 
 }
 
+function pcu_site($pcu)
+{
+	if ( array_key_exists('plcsite', $pcu) ):
+		return $pcu['plcsite']['login_base'];
+	else: 
+		return "none";
+	endif;
+}
+
 function pcu_name($pcu)
 {
 	if ( $pcu['hostname'] != NULL and $pcu['hostname'] != "" ):
@@ -83,6 +96,19 @@ function DNS_to_color($dns)
 	}
 	return 'white';
 }
+function reboot_to_str($reboot)
+{
+	$ret = $reboot;
+	switch ($reboot)
+	{
+		case "0":
+			$ret = "OK";
+			break;
+		default:
+			break;
+	}
+	return $ret;
+}
 
 function reboot_to_color($reboot)
 {
@@ -154,6 +180,9 @@ if ( $_GET['category'] )
 	if ( $category == "node_ids" )
 	{
 		$newfunc = create_function('$pcu', 'return count($pcu[\'' . $category . '\']);');
+	} else if ( $category == "login_base" )
+	{
+		$newfunc = create_function('$pcu', 'return $pcu[\'plcsite\'][\'' . $category . '\'];');
 	} else {
 		$newfunc = create_function('$pcu', 'return $pcu[\'' . $category . '\'];');
 	}
@@ -179,7 +208,8 @@ Total PCUs : <?= $total ?>
 		<tr>
 			<th>Count</th>
 			<th><?= get_category_link("pcu_id", "PCU ID") ?></th>
-			<th><?= get_category_link("hostname", "Hostname") ?></th>
+			<th><?= get_category_link("login_base", "Site") ?></th>
+			<th><?= get_category_link("hostname", "PCU Name") ?></th>
 			<th><?= get_category_link("complete_entry", "Incomplete Fields") ?></th>
 			<th><?= get_category_link("dnsmatch", "DNS Status") ?></th>
 			<th><?= get_category_link("portstatus", "Port Status") ?></th>
@@ -193,11 +223,12 @@ Total PCUs : <?= $total ?>
 		<tr>
 			<td><?= $count ?></td>
 			<td id='id<?= $pcu['pcu_id'] ?>'><a href='<?= pcu_link($pcu) ?>'><?= $pcu['pcu_id'] ?></a></td>
+			<td><a href='<?= plc_site_link(pcu_site($pcu)) ?>'><?= pcu_site($pcu) ?></a></td>
 			<td><?= pcu_name($pcu) ?></td>
 			<td><?= pcu_entry($pcu) ?></td>
 			<td bgcolor='<?= DNS_to_color($pcu['dnsmatch']) ?>'><?= $pcu['dnsmatch'] ?></td>
 			<td><?= format_ports($pcu) ?></td>
-			<td bgcolor='<?= reboot_to_color($pcu['reboot']) ?>'><?= $pcu['reboot'] ?></td>
+			<td bgcolor='<?= reboot_to_color($pcu['reboot']) ?>'><?= reboot_to_str($pcu['reboot']) ?></td>
 			<td nowrap><?= $pcu['model'] ?></td>
 			<td><?= count( $pcu['node_ids'] ) ?></td>
 		</tr>
diff --git a/www/siteactions.cgi b/www/siteactions.cgi
index 425e468..70bab1d 100755
--- a/www/siteactions.cgi
+++ b/www/siteactions.cgi
@@ -46,7 +46,6 @@ def main():
 
 	act_all = soltesz.dbLoad("act_all")
 	plcdb_hn2lb = soltesz.dbLoad("plcdb_hn2lb")
-	s_nodenames = ""
 	sickdb = {}
 
 	sorted_keys = act_all.keys()
@@ -135,7 +134,6 @@ def main():
 	print "</tr>"
 	print "</table>"
 
-	print s_nodenames
 
 	
 if __name__ == '__main__':