X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fnodes%2Fnode.php;h=4d8ccb5988da5e7709cc8794d66627d6f3b25e69;hb=f20e546535306a5fe875d2b8c5585cec0e22db46;hp=8be9900bebbd3a44283cb20795fe3ab07de43bf7;hpb=4a8342f74c2a8a49441d95e2ef666286e40e8c3a;p=plewww.git
diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php
index 8be9900..4d8ccb5 100644
--- a/planetlab/nodes/node.php
+++ b/planetlab/nodes/node.php
@@ -1,7 +1,5 @@
space();
}
-$details->form_start(l_actions(),array("action"=>"update-node", "node_id"=>$node_id));
+$details->form_start(l_actions(),array("action"=>"update-node", "node_id"=>$node_id, "hostname"=>$hostname));
// xxx can hostname really be changed like this without breaking the rest, bootcd .. ?
//$details->th_td("Hostname",$hostname,"hostname");
$details->th_td("Hostname",$hostname);
@@ -152,6 +150,7 @@ $details->tr_submit("submit","Update Node");
$details->form_end();
if ($privileges) $details->space();
+$display_reboot_button = FALSE;
////////////////////
// PCU stuff - not too sure why, but GetPCUs is not exposed to the 'user' role
$display_pcus = ( $local_peer && (plc_is_admin() || plc_is_pi() || plc_is_tech()));
@@ -174,9 +173,15 @@ if ($display_pcus) {
$port=$ports[0];
$pcu_columns = array('hostname');
$pcu=search_pcu($site_pcus,$pcu_id);
- if ( ! $pcu )
+ if ( ! $pcu ) {
$pcu_string = plc_error_html("Cannot find PCU " . $pcu_id);
- // else : regular case - don't set pcu_string
+ } else {
+ // else : regular case - don't set pcu_string
+ // NOTE: temporarily only offer the reboot_button for DC7x00, DRAC, and HPiLO PCU models
+ if ( $pcu['model'] == "IntelAMT" || $pcu['model'] == "DRAC" || $pcu['model'] == "HPiLO" ){
+ $display_reboot_button = TRUE;
+ }
+ }
} else
$pcu_string = plc_warning_html("More than one PCU attached ? ");
@@ -187,7 +192,7 @@ if ($display_pcus) {
if (! $site_pcus) {
$pcu_update_area = "This site has no PCU - " . href ( l_pcu_add(), "add one here");
} else {
- $pcu_add_link = href (l_pcu_add(),plc_add_icon());
+ $pcu_add_link = href (l_pcu_add(),plc_add_icon() . "Add new");
// first option in pcus
if ($pcu_ids)
@@ -217,7 +222,7 @@ if ($display_pcus) {
$pcu_attach_button =
$details->form()->submit_html('attach_pcu',"Attach PCU");
- $pcu_update_area = $pcu_add_link . " " . $pcu_chooser . " " . $port_chooser . " " . $pcu_attach_button;
+ $pcu_update_area = $pcu_add_link . "
Or, select existing " . $pcu_chooser . " " . $port_chooser . " " . $pcu_attach_button;
}
if ($pcu_string)
@@ -227,9 +232,49 @@ if ($display_pcus) {
$details->th_td("PCU",$pcu_value_area);
$details->form_end();
- $details->space();
}
+//////////////////// Reboot Node
+if ( $display_reboot_button )
+{
+ if ( ! empty($_SESSION['messages']) ) {
+ $msg = $_SESSION['messages']['status'][0];
+ } else {
+ $msg = "";
+ }
+ $body="Hello,
+
+This message is a template from the 'Report a problem' link on the node details page.
+
+I've experienced a problem rebooting $hostname with the pcu_id $pcu_id;
+
+ http://".PLC_WWW_HOST."/db/sites/pcu.php?id=$pcu_id
+ http://".PLC_WWW_HOST."/db/nodes/node.php?id=$node_id\n\n";
+
+ if ( $msg != "" ) {
+ $body .= "The last time I tried, it returned:\n $msg\n\n";
+ }
+ $body .= "And, this is what I've tried, which leads me to believe that there is a bug on your side:";
+
+ $url=rawurlencode($body);
+ $email = ">Report a problem";
+
+ // NOTE: not sure how to make the buttons display side-by-side...
+ $reboot = $details->form_start_html(l_actions(),array("action"=>"reboot-node-with-pcu",
+ "node_id"=>$node_id, "hostname"=>$hostname, "test"=>FALSE));
+ $reboot .= $email . $details->form->submit_html("submit","Reboot Node");
+ $reboot .= $details->form_end_html();
+
+ $reboot .= $details->form_start_html(l_actions(),array("action"=>"reboot-node-with-pcu",
+ "node_id"=>$node_id, "hostname"=>$hostname, "test"=>TRUE));
+ $reboot .= $details->form->submit_html("submit","Test PCU");
+ $reboot .= $details->form_end_html();
+
+ $details->tr($reboot, "right");
+
+}
+$details->space();
+
//////////////////// type & version
$details->th_td("Type",$node_type);
$details->th_td("Version",$version);
@@ -241,7 +286,8 @@ $details->th_td("Last contact",$Node->lastContact());
// boot area
$details->space ();
-$details->th_td ("Observed Boot state",$run_level . ( $Node->stale() ? " -- stale value" : "" ));
+$stale_text = $Node->stale() ? ("... (more than " . Node::stale_text() . " ago)") : "" ;
+$details->th_td ("Observed Boot state", $run_level . $stale_text);
if ( ! ($local_peer && $privileges)) {
// just display it
$boot_value=$boot_state;
@@ -274,10 +320,11 @@ if ( $local_peer && $privileges) {
array("value"=>"download-node-iso","display"=>"Download ISO image for $hostname"),
array("value"=>"download-node-usb","display"=>"Download USB image for $hostname"),
array("value"=>"download-node-usb-partition", "display"=>"Download partitioned, USB image for $hostname"),
- array("display"=>"-- Floppy + generic image --","disabled"=>true),
- array("value"=>"download-node-floppy","display"=>"Download Floppy file for $hostname"),
- array("value"=>"download-generic-iso","display"=>"Download generic ISO image (requires floppy)"),
- array("value"=>"download-generic-usb","display"=>"Download generic USB image (requires floppy)"));
+ // array("display"=>"-- Floppy + generic image --","disabled"=>true),
+ // array("value"=>"download-node-floppy","display"=>"Download Floppy file for $hostname"),
+ // array("value"=>"download-generic-iso","display"=>"Download generic ISO image (requires floppy)"),
+ // array("value"=>"download-generic-usb","display"=>"Download generic USB image (requires floppy)"),
+ );
$download_value .= $download_form->select_html("action",$selectors,
array('label'=>"Download mode",'autosubmit'=>true));
$download_value .= $download_form->end_html();
@@ -328,7 +375,6 @@ $form->start();
$table->row_start();
$peers->cell ($table,$slice['peer_id']);
$table->cell (l_slice_t ($slice['slice_id'],$slice['name']));
- # xxx l_sliver not implemented yet - what should we show exactly ?
$table->cell (l_sliver_t ($node_id,$slice['slice_id'],'sliver tags'));
$table->row_end();
}
@@ -348,7 +394,7 @@ if ( $local_peer ) {
$tagnames = array_map ("get_tagname",$tags);
$nodegroups_hash=plc_nodegroup_global_hash($api,$tagnames);
- $toggle = new PlekitToggle ('tags',count_english_warning($tags,'tag'),
+ $toggle = new PlekitToggle ('tags',count_english($tags,'tag'),
array('bubble'=>'Inspect and set tags on that node',
'visible'=>get_arg('show_tags',false)));
$toggle->start();
@@ -390,7 +436,7 @@ if ( $local_peer ) {
// set tag area
$table->row_start();
// get list of tag names in the node/* category
- $all_tags= $api->GetTagTypes( array ("category"=>"node*"), array("tagname","tag_type_id"));
+ $all_tags= $api->GetTagTypes( array ("category"=>"node*","-SORT"=>"tagname"), array("tagname","tag_type_id"));
// xxx cannot use onchange=submit() - would need to somehow pass action name
function tag_selector ($tag) { return array("display"=>$tag['tagname'],"value"=>$tag['tag_type_id']); }
$selector=array_map("tag_selector",$all_tags);
@@ -415,45 +461,47 @@ if ( $local_peer ) {
echo '
'; plc_warning_html("This node has no interface"); echo "Please add an interface to make this a usable PLC node.
\n"; - } else { + } // else { // show this unconditionnally as otherwise there's no mean to create one.. + + // display a hostname column iff at least one interface has a hostname + $need_hostname=false; + if ($interfaces) foreach ($interfaces as $interface) if ($interface['hostname']) $need_hostname=true; + $headers=array(); - $headers["IP"]="IPAddress"; + $sort_column=0; + if (plc_is_admin()) { $headers['I']='int'; $sort_column +=1;} + $headers["IP"]="sortIPAddress"; + if ($need_hostname) $headers['hostname']='string'; $headers["Method"]="string"; $headers["Type"]="string"; $headers["MAC"]="string"; - $headers["bw limit"]="FileSize"; + $headers["bw limit"]="sortBandwidth"; + $headers["tags"]=array('type'=>'int', + 'title'=>"number of tags set on interface"); // a single symbol, marking 'p' for primary and a delete button for non-primary if ( $privileges ) $headers[plc_delete_icon()]='string'; $table_options=array('search_area'=>false,"pagesize_area"=>false,'notes_area'=>false); - $table=new PlekitTable("node_interfaces",$headers,2,$table_options); + $table=new PlekitTable("node_interfaces",$headers,$sort_column,$table_options); $table->start(); - foreach ( $interfaces as $interface ) { + if ($interfaces) foreach ( $interfaces as $interface ) { $interface_id= $interface['interface_id']; $interface_ip= $interface['ip']; - $interface_broad= $interface['broadcast']; - $interface_primary= $interface['is_primary']; - $interface_network= $interface['network']; - $interface_dns1= $interface['dns1']; - $interface_dns2= $interface['dns2']; - $interface_hostname= $interface['hostname']; - $interface_netmaks= $interface['netmask']; - $interface_gatewary= $interface['gateway']; - $interface_mac= $interface['mac']; - $interface_bwlimit= $interface['bwlimit']; - $interface_type= $interface['type']; - $interface_method= $interface['method']; $table->row_start(); + if (plc_is_admin()) $table->cell(l_interface_t($interface_id,$interface_id)); $table->cell(l_interface_t($interface_id,$interface_ip)); - $table->cell($interface_method); - $table->cell($interface_type); - $table->cell($interface_mac); - $table->cell($interface_bwlimit); + if ($need_hostname) $table->cell($interface['hostname']); + $table->cell($interface['method']); + $table->cell($interface['type']); + $table->cell($interface['mac']); + $table->cell(pretty_bandwidth($interface['bwlimit'])); + $table->cell(href(l_interface_tags($interface_id), + count($interface['interface_tag_ids']))); if ( $privileges ) { - if ($interface_primary) { + if ($interface['is_primary']) { $table->cell(plc_bubble("p","Cannot delete a primary interface")); } else { $table->cell ($form->checkbox_html('interface_ids[]',$interface_id)); @@ -464,15 +512,17 @@ if ( $local_peer ) { if ($privileges) { $table->tfoot_start(); $table->row_start(); - $add_button=new PlekitFormButton (l_interface_add($node_id),"add","Add Interface","GET"); // we should have 6 cols, use 3 for the left (new) and the rest for the right (remove) - $table->cell($add_button->html(),array('columns'=> 3,'align'=>'left')); + //$add_button=new PlekitFormButton (l_interface_add($node_id),"add","Add Interface","GET"); + //$table->cell($add_button->html(),array('columns'=> 3,'align'=>'left')); + $table->cell($form->submit_html("new-interface","Add Interface"), + array('columns'=> 3,'align'=>'left')); $table->cell($form->submit_html("delete-interfaces","Remove Interfaces"), array('columns'=>$table->columns()-3,'align'=>'right')); $table->row_end(); } $table->end(); - } + // } $toggle->end(); }