X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fcommon%2Factions.php;h=b0466bdda7f830e7346b2aa78d7f36cd0f8139a3;hb=943aa87a34c6728e5c41db662dd70c08e9bdb7e4;hp=1600eb4a3cf8a8d5223c69563b22e75f93e829b2;hpb=aa33bcf9a148164427b3d0eb5ca0306ebfc1c628;p=plewww.git

diff --git a/planetlab/common/actions.php b/planetlab/common/actions.php
index 1600eb4..b0466bd 100644
--- a/planetlab/common/actions.php
+++ b/planetlab/common/actions.php
@@ -51,6 +51,8 @@ $known_actions []= "update-node";
 //	expects:	node_id, hostname, model
 $known_actions []= "attach-pcu";
 //	expects:	node_id, pcu_id, port (pcu_id <0 means detach)
+$known_actions []= "reboot-node-with-pcu";
+//	expects:	node_id
 
 //////////////////////////////////////// interfaces
 $known_actions []= "delete-interfaces";	
@@ -85,6 +87,9 @@ $known_actions []= 'remove-nodes-from-slice';
 //	expects:	slice_id & node_ids
 $known_actions []= 'add-nodes-in-slice';
 //	expects:	slice_id & node_ids
+$known_actions []= 'update-initscripts';
+//	expects:	slice_id & name & previous-initscript & previous-initscript-body 
+//			& initscript & initscript-body
 $known_actions []= 'delete-slice-tags';
 //      expects:        slice_tag_id
 $known_actions []= 'add-slice-tag';
@@ -97,6 +102,10 @@ $known_actions []= "add-tag-type";
 //	expects:	tag_type_id & tagname & description & category & min_role_id  
 $known_actions []= "delete-tag-types";
 //	expects:	tag_type_ids
+$known_actions []= "remove-roles-from-tag-type";
+//	expects:	tag_type_id & role_ids
+$known_actions []= "add-role-to-tag-type";
+//	expects:	tag_type_id_id & id
 
 //////////////////////////////////////// tags
 $known_actions []= "set-tag-on-node";
@@ -108,6 +117,20 @@ $known_actions []= "delete-node-tags";
 $known_actions []= "delete-interface-tags";
 //	expects:	interface_id & interface_tag_ids
 
+//////////////////////////////////////// nodegroups
+$known_actions []= "update-nodegroup";
+//	expects nodegroup_id groupname value
+$known_actions []= "add-nodegroup";
+//	expects groupname, tag_type_id, value
+$known_actions []= 'delete-nodegroups';
+//	expects nodegroup_ids
+
+//////////////////////////////////////// leases
+$known_actions []= "manage-leases";
+//	expects as 'actions' a list of 'action' of the form
+//      either [ 'add-leases', [nodenames], slicename, t_from, t_until ]
+//      or     [ 'delete-leases', lease_id ]
+
 ////////////////////////////////////////////////////////////
 $interface_details= array ('method','type', 'ip', 'gateway', 'network', 
 			   'broadcast', 'netmask', 'dns1', 'dns2', 
@@ -159,19 +182,23 @@ switch ($action) {
  case 'remove-roles-from-person' : {
    $role_ids=$_POST['role_ids'];
    if ( ! $role_ids) {
-     drupal_set_message("action=$action - No role selected");
-     return;
-   }
-   foreach( $role_ids as $role_id)  {
-     $api->DeleteRoleFromPerson( intval( $role_id ), intval( $person_id ) );
+     drupal_set_error("You have not selected role(s) to remove");
+   } else {
+     foreach( $role_ids as $role_id)  
+       if ( $api->DeleteRoleFromPerson( intval( $role_id ), intval( $person_id ) ) != 1 ) 
+	 drupal_set_error ("Could not remove role $role_id from person $person_id");
    }
-   plc_redirect (l_person($person_id));
+   plc_redirect (l_person_roles($person_id));
  }
      
  case 'add-role-to-person' : {
    $role_id=$_POST['role_id'];
-   $api->AddRoleToPerson( intval( $role_id ), intval( $person_id ) );
-   plc_redirect (l_person($person_id));
+   if ( ! $role_id) {
+     drupal_set_error ("You have not selected a role to add");
+   } else if ($api->AddRoleToPerson( intval( $role_id ), intval( $person_id ) ) != 1) {
+     drupal_set_error("Could not add role $role_id to person $person_id");
+   }
+   plc_redirect (l_person_roles($person_id));
  }
 
  case 'enable-person' : {
@@ -362,6 +389,22 @@ switch ($action) {
    plc_redirect(l_node($node_id));
    break;
  }
+
+ case 'reboot-node-with-pcu': {
+   $node_id=intval($_POST['node_id']);
+   $hostname= $_POST['hostname'];
+
+   $ret = $api->RebootNodeWithPCU( $node_id );
+   $error= $api->error();
+
+   if( empty( $error ) ) {
+     drupal_set_message("Reboot node $hostname: $ret");
+     plc_redirect(l_node($node_id));
+   } else {
+     drupal_set_error($error);
+   }
+   break;
+ }
    
 
 //////////////////////////////////////////////////////////// interfaces
@@ -385,32 +428,46 @@ switch ($action) {
      drupal_set_error ("Could not delete all selected interfaces, only $counter were removed");
    plc_redirect(l_node($_POST['node_id']));
  }
+
  case 'new-interface': {
    plc_redirect(l_interface_add($_POST['node_id']));
  }
+
  case 'add-interface': {
-   $node_id=$_POST['node_id'];
+   $node_id=intval($_POST['node_id']);
    foreach ($interface_details as $field) {
      $interface[$field]= $_POST[$field];
+     // these must be integers
      if( in_array( $field, array( 'bwlimit', 'node_id' ) ) ) {
-       $interface[$field]= intval( $interface[$field] );
+       if ( empty ($interface[$field]) ) 
+	 unset ($interface[$field]);
+       else 
+	 $interface[$field]= intval( $interface[$field] );
      }
    }
-   $interface_id =$api->AddInterface( intval( $node_id ), $interface );
-   if ($interface_id >0 ) {
-     $api->begin();
-	 $api->AddInterfaceTag($interface_id,"alias",strval($interface_id));
-	 $api->AddInterfaceTag($interface_id,"ifname","eth0");
-     list($id1, $id2) = $api->commit();
-     if ( $id1 > 0 && $id2 > 0 ) {
-         drupal_set_message ("Interface $interface_id added into node $node_id");
-     } else {
-         drupal_set_error ("Could not add interface tags to interface $interface_id");
-     }
-   } else {
+   $interface_id =$api->AddInterface( $node_id , $interface );
+   if ($interface_id <= 0 ) {
      drupal_set_error ("Could not create interface");
+     drupal_set_error ($api->error());
+   } else {
+     $ip=$interface['ip'];
+     drupal_set_message ("Interface $ip added into node $node_id");
+     if ($_POST['is-virtual']) {
+       $ifname=$_POST['ifname'];
+       if ($api->AddInterfaceTag($interface_id,"ifname",$ifname) <= 0) 
+	 drupal_set_error ("Could not set tag 'ifname'=$ifname");
+       else 
+	 drupal_set_message ("Set tag 'ifname'=$ifname");
+       $alias=$_POST['alias'];
+       // deafult to interface_id
+       if ( ! $alias ) $alias=strval($interface_id);
+       if ($api->AddInterfaceTag($interface_id,"alias",$alias) <= 0) 
+	 drupal_set_error ("Could not set tag 'alias'=$alias");
+       else 
+	 drupal_set_message ("Set tag 'alias'=$alias");
+     }
    }
-   plc_redirect (l_node($node_id));
+   plc_redirect (l_node_interfaces($node_id));
  }
    
  case 'update-interface': {
@@ -429,7 +486,7 @@ switch ($action) {
    if ($result == 1 ) 
      drupal_set_message ("Interface $interface_id updated");
    else
-     drupal_set_error ("Could not update interface");
+     drupal_set_error ("Could not update interface: " . $api->error());
    plc_redirect (l_interface($interface_id));
  }
    
@@ -541,8 +598,6 @@ switch ($action) {
      drupal_set_error("Cannot renew slice that far in the future, max is $WEEKS weeks from now");
      plc_redirect(l_slice($slice_id));
    }
-   plc_debug('slice_id',$slice_id);
-   plc_debug('expires',$expires);
    if ($api->UpdateSlice ($slice_id, array('expires'=>$expires)) == 1)
      drupal_set_message("Slice renewed");
    else
@@ -637,7 +692,7 @@ Our support team will be glad to answer any question that you might have.
      drupal_set_message ("Removed $count node(s)");
    else
      drupal_set_error ("Could not remove selected nodes");
-   plc_redirect(l_slice($slice_id) . " &show_nodes=true");
+   plc_redirect(l_slice_nodes($slice_id));
    break;
  }
 
@@ -649,10 +704,53 @@ Our support team will be glad to answer any question that you might have.
      drupal_set_message ("Added $count node(s)");
    else
      drupal_set_error ("Could not add all selected nodes");
-   plc_redirect(l_slice($slice_id) . "&show_nodes=true" );
+   plc_redirect(l_slice_nodes($slice_id));
+   break;
+ }
+
+ case 'update-initscripts': {
+//	expects:	slice_id & name & previous-initscript & previous-initscript-body 
+//			& initscript & initscript-body
+   $slice_id = intval ($_POST['slice_id']); 	
+   $previous_initscript=$_POST['previous-initscript'];
+   $initscript=$_POST['initscript'];
+   $previous_initscript_body=$_POST['previous-initscript-body'];
+   $initscript_body=$_POST['initscript-body'];
+
+   $changes=FALSE;
+   if (strcmp($initscript,$previous_initscript) != 0) {
+     $newvalue=$api->SetSliceInitscript($slice_id,$initscript);
+     $status = (strcmp($newvalue,$initscript)==0) ? "OK" : "failed";
+     if (! $initscript)		drupal_set_message("Removed shared initscript '" . $previous_initscript . "' " . $status);
+     else			drupal_set_message("Replaced shared initscript with '" . $initscript . "' " . $status);
+     $changes=TRUE;
+   }
+
+   // somehow some \r chars make it here; just ignore them
+   $previous_initscript_body=str_replace("\r","",$previous_initscript_body);
+   //   plc_debug_txt('previous initscript_body after cr',$previous_initscript_body);
+
+   $initscript_body=str_replace("\r","",$initscript_body);
+   // make sure the script ends with a single \n 
+   $initscript_body=trim($initscript_body);
+   if (!empty($initscript_body) && $initscript_body[strlen($initscript_body)-1] != "\n")
+     $initscript_body.="\n";
+   // plc_debug_txt('initscript_body after cr & nl/eof',$initscript_body);
+
+   if (strcmp($initscript_body,$previous_initscript_body) != 0) {
+     $newvalue=$api->SetSliceInitscriptBody($slice_id,$initscript_body);
+     // plc_debug_txt('newvalue',$newvalue);
+     $status=(strcmp($newvalue,$initscript_body)==0) ? "OK" : "failed";
+     if (! $initscript_body)	drupal_set_message("Removed initscript body " . $status);
+     else			drupal_set_message("Installed new initscript body " . $status);
+     $changes=TRUE;
+   }
+   if (!$changes) drupal_set_message("No changes required in initscript");
+   plc_redirect(l_slice($slice_id) . "&show_details=0&show_initscripts=1" );
    break;
  }
 
+
  case 'delete-slice-tags': {
    $slice_id = intval($_POST['slice_id']);
    $slice_tag_ids = array_map("intval", $_POST['slice_tag_ids']);
@@ -667,7 +765,7 @@ Our support team will be glad to answer any question that you might have.
    }
    if ($success)
      drupal_set_message ("Deleted $count slice tag(s)");
-   plc_redirect(l_slice($slice_id) . "&show_tags=true" );
+   plc_redirect(l_slice($slice_id) . "&show_tags=1" );
    break;
  }
   
@@ -719,6 +817,7 @@ Our support team will be glad to answer any question that you might have.
    else 
      drupal_set_error ("Could not update tag type $tag_type_id\n".$api->error());
    plc_redirect(l_tag($tag_type_id));
+   break;
  }
 
  case 'add-tag-type': {
@@ -742,6 +841,7 @@ Our support team will be glad to answer any question that you might have.
    else
      drupal_set_error ("Could not create tag type $tagname");
    plc_redirect( l_tags());
+   break;
  }
 
  case 'delete-tag-types': {
@@ -765,6 +865,30 @@ Our support team will be glad to answer any question that you might have.
    break;
  }
 
+ case 'remove-roles-from-tag-type' : {
+   $tag_type_id=$_POST['tag_type_id'];
+   $role_ids=$_POST['role_ids'];
+   if ( ! $role_ids) {
+     drupal_set_error("You have not selected role(s) to remove");
+   } else {
+     foreach( $role_ids as $role_id)  
+       if ( $api->DeleteRoleFromTagType( intval( $role_id ), intval( $tag_type_id ) ) != 1 ) 
+	 drupal_set_error ("Could not remove role $role_id from tag type $tag_type_id");
+   }
+   plc_redirect (l_tag_roles($tag_type_id));
+ }
+     
+ case 'add-role-to-tag-type' : {
+   $tag_type_id=$_POST['tag_type_id'];
+   $role_id=$_POST['role_id'];
+   if ( ! $role_id) {
+     drupal_set_error ("You have not selected a role to add");
+   } else if ($api->AddRoleToTagType( intval( $role_id ), intval( $tag_type_id ) ) != 1) {
+     drupal_set_error("Could not add role $role_id to tag $tag_type_id");
+   }
+   plc_redirect (l_tag_roles($tag_type_id));
+ }
+
 //////////////////////////////////////// tags   
  case 'set-tag-on-node': 
  case 'set-tag-on-interface': {
@@ -813,9 +937,9 @@ Our support team will be glad to answer any question that you might have.
    }
    
    if ($node_mode)
-     plc_redirect (l_node($node_id));
+     plc_redirect (l_node_tags($node_id));
    else
-     plc_redirect (l_interface($interface_id));
+     plc_redirect (l_interface_tags($interface_id));
  }
 
  case 'delete-node-tags' : 
@@ -850,11 +974,119 @@ Our support team will be glad to answer any question that you might have.
    else
      drupal_set_error ("Could not delete all selected tags, only $counter were removed");
    if ($node_mode)
-     plc_redirect(l_node($_POST['node_id']));
+     plc_redirect(l_node_tags($_POST['node_id']));
    else
-     plc_redirect(l_interface($_POST['interface_id']));
+     plc_redirect(l_interface_tags($_POST['interface_id']));
  }
 
+//////////////////////////////////////// nodegroups
+ case 'update-nodegroup': {
+   $nodegroup_id = $_POST['nodegroup_id'];
+   $groupname = $_POST['groupname'];
+   $value = $_POST['value'];
+
+   $fields=array();
+   $fields['groupname']=$groupname;
+   $fields['value']=$value;
+   if ( $api->UpdateNodeGroup($nodegroup_id,$fields) == 1) 
+     drupal_set_message ('Nodegroup updated');
+   else 
+     drupal_set_error ("Could not update nodegroup $groupname");
+   
+   plc_redirect(l_nodegroup($nodegroup_id));
+
+ }
+
+ case 'add-nodegroup': {
+   $groupname=$_POST['groupname'];
+   if ( ! $groupname ) {
+     drupal_set_error ('Empty groupname');
+     plc_redirect (l_nodegroups());
+   }
+   $tag_type_id=intval($_POST['tag_type_id']);
+   if ( ! $tag_type_id ) {
+     drupal_set_error ('You must select a tag in the dropdown list');
+     plc_redirect (l_nodegroups());
+   }
+   $value=$_POST['value'];
+   if ( ! $value ) {
+     drupal_set_message ("Empty value.. let's see ..");
+   }
+   if ( $api->AddNodeGroup ($groupname,$tag_type_id,$value) > 0) 
+     drupal_set_message ("Nodegroup $groupname created");
+   else
+     drupal_set_error ("Could not create nodegroup $groupname");
+
+   plc_redirect (l_nodegroups());
+   break;
+ }
+
+ case 'delete-nodegroups': {
+   $nodegroup_ids=$_POST['nodegroup_ids'];
+   if ( ! $nodegroup_ids ) {
+     drupal_set_message("action=delete-nodegroups - No group selected");
+     plc_redirect(l_nodegroups());
+   }
+   $success=true;
+   $counter=0;
+   foreach ($nodegroup_ids as $nodegroup_id) 
+     if ($api->DeleteNodeGroup(intval($nodegroup_id)) != 1) 
+       $success=false;
+     else
+       $counter++;
+   if ($success) 
+     drupal_set_message ("Deleted $counter group(s)");
+   else
+     drupal_set_error ("Could not delete all selected groups, only $counter were removed");
+   plc_redirect (l_nodegroups());
+   break;
+ }
+
+//////////////////////////////////////// leases
+ case 'manage-leases': {
+   $actions=json_decode($_POST['actions']);
+   $add_requested=0;
+   $add_done=0;
+   $del_requested=0;
+   $del_done=0;
+   $errors=array();
+   foreach ($actions as $action) {
+     if ($action[0] == 'add-leases') {
+       $nodenames=$action[1];
+       $add_requested += count($nodenames);
+       $slicename=$action[2];
+       $t_from=intval($action[3]);
+       $t_until=intval($action[4]);
+       $hash = $api->AddLeases($nodenames,$slicename,$t_from,$t_until);
+       // update number of added leases
+       $ids=$hash['new_ids'];
+       $add_done += count($ids);
+       // update global errors array
+       foreach ($api_errors=$hash['errors'] as $error) $errors[]=$error;
+     } else if ($action[0]=='delete-leases') {
+       $lease_id=intval($action[1]);
+       $del_requested += 1;
+       if ($api->DeleteLeases(array($lease_id)) == 1) {
+	 $del_done += 1;
+       } else {
+	 $errors []= "Could not delete lease " . $lease_id;
+       }
+     } else {
+       $errors []= "in actions.php, manage-leases, wrong action ". $action[0];
+     }
+   }
+   
+   if (count($errors)==0) {
+     echo("All leases updated (" . $add_done . " added and " . $del_done . " deleted)");
+   } else {
+     foreach ($errors as $error) echo($error. "\n");
+     echo("Leases updated only partially (" . 
+	  $add_done . "/" . $add_requested . " added and " . 
+	  $del_done . "/" . $del_requested . " deleted)");
+   }     
+
+   break;
+ }
 
 ////////////////////////////////////////