// node info
$hostname= $node['hostname'];
$boot_state= $node['boot_state'];
+$run_level = $node['run_level'];
$site_id= $node['site_id'];
$model= $node['model'];
$version= $node['version'];
$conf_file_ids= $node['conf_file_ids'];
$interface_ids= $node['interface_ids'];
$nodegroup_ids= $node['nodegroup_ids'];
-$pcu_ids= $node['pcu_ids'];
// get peers
$peer_id = $node['peer_id'];
if( !empty( $nodegroup_ids ) )
$nodegroups= $api->GetNodeGroups( $nodegroup_ids, array("groupname","tag_type_id","value"));
-// xxx Thierry : remaining stuff
-// (*) events: should display the latest events relating to that node.
-// disabling call to GetEvents, that gets the session deleted in the DB
-// (*) conf_files: is fetched but not displayed
-if( !empty( $conf_file_ids ) )
- $conf_files= $api->GetConfFiles( $conf_file_ids );
-// (*) idem for PCUs
-// gets pcu and port info key to both is $pcu_id
-// turning this off: GetPCUs is not allowed to users, and we don't show PCUs yet anyway
-//if( !empty( $pcu_ids ) )
-// $PCUs= $api->GetPCUs( $pcu_ids );
+// Thierry : remaining stuff
+// (*) events: xxx todo xxx for admins xxx
+// should display the latest events relating to that node.
+// historically we had to turn this off at some point as GetEvents was getting the session deleted in the DB
+// (*) conf_files: xxx todo xxx for admins xxx
+//if( !empty( $conf_file_ids ) )
+// $conf_files= $api->GetConfFiles( $conf_file_ids );
//////////////////// display node info
$details->form_end();
if ($privileges) $details->space();
+////////////////////
+// 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()));
+if ($display_pcus) {
+ $pcu_ids= $node['pcu_ids'];
+ $ports= $node['ports'];
+ // avoid 2 API calls : get all site PCUs and then search from there
+ function search_pcu ($site_pcus,$pcu_id) {
+ if ($site_pcus) foreach ($site_pcus as $site_pcu) if ($site_pcu['pcu_id']==$pcu_id) return $site_pcu;
+ return FALSE;
+ }
+ $site_pcus = $api->GetPCUs(array('site_id'=>$site_id));
+ // not sure what the exact semantics is, but I expect pcu_ids and ports should have same cardinality
+ if (count ($pcu_ids) != count ($ports))
+ $pcu_string = plc_error_html("Unexpected condition: " . count($pcu_ids) . " pcu_ids and " . count($ports) . " ports");
+ else if (count($pcu_ids) == 0)
+ $pcu_string = plc_warning_html("No PCU !");
+ else if (count($pcu_ids) == 1) {
+ $pcu_id=$pcu_ids[0];
+ $port=$ports[0];
+ $pcu_columns = array('hostname');
+ $pcu=search_pcu($site_pcus,$pcu_id);
+ if ( ! $pcu )
+ $pcu_string = plc_error_html("Cannot find PCU " . $pcu_id);
+ // else : regular case - don't set pcu_string
+ } else
+ $pcu_string = plc_warning_html("More than one PCU attached ? ");
+
+ // in the regular case, pcu_string is not set here
+
+ $details->form_start(l_actions(),array("action"=>"attach-pcu","node_id"=>$node_id));
+ // prepare selectors
+ 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());
+
+ // first option in pcus
+ if ($pcu_ids)
+ $none_detach = 'Detach';
+ else
+ $none_detach='None';
+ $pcu_selectors = array(array('display'=>$none_detach,'value'=>-1));
+ // one option per site pcu
+ foreach ($site_pcus as $site_pcu) {
+ $selector=array('display'=>$site_pcu['hostname'],'value'=>$site_pcu['pcu_id']);
+ if ($pcu_id == $site_pcu['pcu_id']) $selector['selected']=true;
+ $pcu_selectors []= $selector;
+ }
+ $pcu_chooser = $details->form()->select_html('pcu_id',$pcu_selectors);
+
+ function port_selector ($i,$port) {
+ $selector = array ('display'=>'port ' . $i, 'value'=>$i);
+ if ($i == $port) $selector['selected'] = true;
+ return $selector;
+ }
+ $port_selectors = array () ;
+ $available_ports =range(1,8);
+ foreach ($available_ports as $available_port)
+ $port_selectors []= port_selector ($available_port,$port);
+ $port_chooser = $details->form()->select_html('port',$port_selectors);
+
+ $pcu_attach_button =
+ $details->form()->submit_html('attach_pcu',"Attach PCU");
+
+ $pcu_update_area = $pcu_add_link . " " . $pcu_chooser . " " . $port_chooser . " " . $pcu_attach_button;
+ }
+
+ if ($pcu_string)
+ $pcu_value_area=plc_vertical_table(array($pcu_string,$pcu_update_area));
+ else
+ $pcu_value_area=$pcu_update_area;
+
+ $details->th_td("PCU",$pcu_value_area);
+ $details->form_end();
+ $details->space();
+ }
+
+//////////////////// type & version
$details->th_td("Type",$node_type);
$details->th_td("Version",$version);
// let's use plc_objects
$Node = new Node($node);
$details->th_td("Date created",$Node->dateCreated());
-$details->th_td("Last contact",$Node->lastContact());
$details->th_td("Last update",$Node->lastUpdated());
+$details->th_td("Last contact",$Node->lastContact());
// boot area
$details->space ();
+$details->th_td ("Observed Boot state",$run_level . ( $Node->stale() ? " -- stale value" : "" ));
if ( ! ($local_peer && $privileges)) {
// just display it
$boot_value=$boot_state;
$boot_form = new PlekitForm (l_actions(), array("node_id"=>$node_id,
"action"=>"node-boot-state"));
$boot_value .= $boot_form->start_html();
- $states = array( 'boot'=>'Boot', 'safeboot'=>'SafeBoot', 'failboot'=>'FailBoot',
- 'disabled' => 'Disabled', 'install'=>'Install', 'reinstall'=>'Reinstall');
+ $states = array( 'boot'=>'Boot', 'safeboot'=>'SafeBoot',
+ 'disabled' => 'Disabled', 'reinstall'=>'Reinstall');
$selectors=array();
foreach ($states as $dbname=>$displayname) {
$selector=array("display"=>$displayname, "value"=>$dbname);
$boot_value .= $boot_form->select_html("boot_state",$selectors,array('autosubmit'=>true));
$boot_value .= $boot_form->end_html();
}
-$details->th_td ("Boot state",$boot_value);
+$details->th_td ("Preferred Boot state",$boot_value);
// same here for the download area
if ( $local_peer && $privileges) {
array("display"=>"-- All in one images --","disabled"=>true),
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('label'=>"Download mode",'autosubmit'=>true));
$download_value .= $download_form->end_html();
$details->th_td ("Download",$download_value);
+
}
// site info and all site nodes
} else {
$headers=array();
$headers['Peer']="string";
- $headers['Name']="string";
+ $headers['Slice Name']="string";
$headers['Sliver']="string";
$reasonable_page=10;
$table_options = array('notes_area'=>false,"search_width"=>10,'pagesize'=>$reasonable_page);
foreach ($slices as $slice) {
$table->row_start();
- $table->cell ($peers->shortname($peer_id));
+ $peers->cell ($table,$slice['peer_id']);
$table->cell (l_slice_t ($slice['slice_id'],$slice['name']));
- $table->cell (l_sliver_t ($node_id,$slice['slice_id'],'view'));
+ # 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();
}
$table->end();
//////////////////////////////////////////////////////////// interfaces
if ( $local_peer ) {
- $toggle=new PlekitToggle ('interfaces',count_english_warning($interfaces,'interfaces'),
+ $toggle=new PlekitToggle ('interfaces',count_english_warning($interfaces,'interface'),
array('bubble'=>'Inspect and tune interfaces on that node',
'visible'=>get_arg('show_interfaces',false)));
$toggle->start();
git://git.onelab.eu / plewww.git / blobdiff