X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fnodes%2Fnode.php;h=e3ba39e2cc27ab3fee710fb7dc90c50ac3eac7e7;hb=0499a60e445e2f7660f651f13b75563571c388f4;hp=6825f1646f93991f8edaa463d1189f6782cf9069;hpb=020d87fb03fa696009143b9158e2d9db65880f23;p=plewww.git

diff --git a/planetlab/nodes/node.php b/planetlab/nodes/node.php
index 6825f16..e3ba39e 100644
--- a/planetlab/nodes/node.php
+++ b/planetlab/nodes/node.php
@@ -41,6 +41,7 @@ $node=$nodes[0];
 // 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'];
@@ -51,7 +52,6 @@ $slice_ids= $node['slice_ids'];
 $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'];
@@ -86,17 +86,13 @@ if( !empty( $interface_ids ) )
 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
 
@@ -147,7 +143,7 @@ if ( ! $local_peer) {
   $details->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); 
@@ -156,16 +152,96 @@ $details->tr_submit("submit","Update Node");
 $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;
@@ -174,8 +250,8 @@ if ( ! ($local_peer && $privileges)) {
   $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);
@@ -185,7 +261,7 @@ if ( ! ($local_peer && $privileges)) {
   $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) {
@@ -197,14 +273,17 @@ 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("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("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)"),
+		      );
   $download_value .= $download_form->select_html("action",$selectors,
 						 array('label'=>"Download mode",'autosubmit'=>true));
   $download_value .= $download_form->end_html();
   $details->th_td ("Download",$download_value);
+
  }
 
 // site info and all site nodes
@@ -235,7 +314,7 @@ $form->start();
   } 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);
@@ -248,10 +327,10 @@ $form->start();
 
     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']));
       # xxx l_sliver not implemented yet - what should we show exactly ?
-      $table->cell (l_sliver_t ($node_id,$slice['slice_id'],'view'));
+      $table->cell (l_sliver_t ($node_id,$slice['slice_id'],'sliver tags'));
       $table->row_end();
     }
     $table->end();
@@ -338,44 +417,42 @@ if ( $local_peer ) {
     plc_warning_html("This node has no interface");
     echo "Please add an interface to make this a usable PLC node.</p>\n";
   } else {
+
+    // 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";
     // 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 ) {
       $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']));
       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));
@@ -386,9 +463,11 @@ 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();