// Common functions
require_once 'plc_functions.php';
-require_once 'plc_sorts.php';
+require_once 'details.php';
+require_once 'table.php';
+require_once 'toggle.php';
-// find person roles
-$_person= $plc->person;
-$_roles= $_person['role_ids'];
-
-//print_r( $_person );
+//plc_debug('POST',$_POST);
// if not a PI or admin then redirect to slice index
-if( !in_array( '10', $_roles ) && !in_array( '20', $_roles ) )
+$has_privileges = plc_is_admin() || plc_is_pi();
+if ( ! $has_privileges ) {
+ drupal_set_error("Insufficient privilege to add a slice");
header( "index.php" );
-
-if( !$_POST['name'] ) {
- // get default site base
- $site_info= $api->GetSites( array( $_person['site_ids'][0] ), array( "login_base" ) );
- $base= $site_info[0]['login_base'] ."_";
+ return 0;
}
-// add it
-if( $_POST['add'] ) {
+// find out which site the slice should be added to
+// without site_id set in GET, we use the first site that this user is in
+if (isset($_GET['site_id'])) {
+ $site_id=intval($_GET['site_id']);
+ } else if (isset ($_POST['site_id'])) {
+ $site_id=intval($_POST['site_id']);
+ } else {
+ $site_id=plc_my_site_id();
+ }
+
+//////////////////// action
+if ( $_POST['add-slice'] ) {
// get post vars
$url= $_POST['url'];
$instantiation= $_POST['instantiation'];
$name= $_POST['name'];
$description= $_POST['description'];
+ $person_ids = $_POST['person_ids'];
+
+ $check=true;
+
+ $sites=$api->GetSites(array('site_id'=>$site_id));
+ if ( ! $sites) {
+ drupal_set_error("Cannot find site_id $site_id");
+ $check=false;
+ }
+ $site=$sites[0];
+ $base=$site['login_base'] . '_';
// validate input
- if( $name == $base )
- $error['name']= "<font color=red>You must enter a name for your slice.</font>";
- else {
- $slice_name= $name;
+ if( $name == $base ) {
+ drupal_set_error("You must enter a name for your slice");
+ $check=false;
+ } else if (strpos($name,$base) != 0) {
+ drupal_set_error("Slice name $name should begin with $base");
+ $check=false;
+ } else {
// make sure slice name doesnt exist
- $slice_info= $api->GetSlices( array( $slice_name ), array( "slice_id" ) );
-
- if( !empty( $slice_info ) ) {
- $error['name']= "<font color=red>Slice name already in use. Please choose another.</font>";
- $name= "";
+ $slices = $api->GetSlices( array( $name ), array( "slice_id" ) );
+ if ( count($slices) != 0) {
+ drupal_set_error("Slice name $name already in use, please choose another");
+ $check=false;
}
-
}
- if( $url == "http://" || "" )
- $error['url']= "<font color=red>You must enter a URL for your slice's info.</font>";
+ if ( ($url == "http://") || ( $url=="" ) ) {
+ drupal_set_error("You must enter a URL for your slice's info");
+ $check=false;
+ }
- if( $description == "" )
- $error['description']= "<font color=red>Your must enter a description for you slice.</font>";
+ if( $description == "" ) {
+ drupal_set_error("Your must enter a description for you slice.");
+ $check=false;
+ }
// if no errors then add
- if( !$error ) {
- $fields= array( "url" => $url, "instantiation" => $instantiation, "name" => $slice_name, "description" => $description );
- echo "added: <pre>"; print_r( $fields ); echo "</pre>\n";
+ if ( $check ) {
+ $fields= array( "url" => $url,
+ "instantiation" => $instantiation,
+ "name" => $name,
+ "description" => $description );
// add it!
- $slice_new_id= $api->AddSlice( $fields );
-
- if( $slice_new_id ) {
- plc_redirect( "index.php?id=$slice_new_id" );
- exit();
+ $slice_id= $api->AddSlice( $fields );
+
+ if ($slice_id > 0) {
+ drupal_set_message ("Slice $slice_id created");
+ if ($person_ids) {
+ // Add people
+ $success=true;
+ $counter=0;
+ foreach ($person_ids as $person_id) {
+ $person_id=intval($person_id);
+ if ($api->AddPersonToSlice($person_id,$slice_id) != 1) {
+ drupal_set_error("Could not add person $person_id in slice :" . $api->error());
+ $success=false;
+ } else {
+ $counter++;
+ }
+ }
+ if ($success)
+ drupal_set_message ("Added $counter person(s)");
+ else
+ drupal_set_error ("Could not add all selected persons, only $counter were added");
+ }
+ plc_redirect(l_slice($slice_id) );
} else {
- $error['api']= $api->error();
+ drupal_set_error("Could not create slice $name " . $api->error() );
+ $check=false;
}
}
+ }
-}
+//////////////////// still here : either it's a blank form or something was wrong
// Print header
require_once 'plc_drupal.php';
-drupal_set_title('Slices');
include 'plc_header.php';
+$sites=$api->GetSites(array($site_id));
+$site=$sites[0];
+$sitename=$site['name'];
+if ( ! $_POST['name'])
+ $base= $site['login_base'] ."_";
+
+// propose to add all 'reachable' persons
+$site_person_ids=$site['person_ids'];
+$persons_filter=array("person_id"=>$site_person_ids,
+ "enabled"=>true);
+$persons=$api->GetPersons($persons_filter,array('email','enabled','first_name','last_name','person_id'));
+
+drupal_set_title('Create slice in site "' . $sitename . '"');
-if( !$url )
- $url= "http://";
+// defaults
+$url = $_POST['url'];
+if( !$url ) $url= "http://";
// check for errors and set error styles
if( $error['name'] )
$desc_error= " class='plc-warning'";
-// add javaScript code
-echo "<script type='text/javascript'>
- function update(str1) {
- var temp= new Array()
- temp= str1.split('->');
- var c= ( temp[1] + '_' )
- document.getElementById('textbox').value = c;
- }
-</script>\n";
-
-
-// start form
-echo "<form action='slice_add.php' method=post>\n";
-
-if( $error['api'] )
- echo "<font class='plc-warning'>". $error['api'] ."</font>\n";
-
-echo "<h2>Create Slice</h2>\n";
-
-echo "<p>You must provide a short description of the new slice as well as a link to a project website before creating it. Do <strong>not</strong> provide bogus information; if a complaint is lodged against your slice and PlanetLab Operations is unable to determine what the normal behavior of your slice is, your slice may be deleted to resolve the complaint.\n";
-echo "<p>There are three possible \"instantiation\" states for a slice. <strong>PLC</strong> creates a slice with default settings. <strong>Delegated</strong> creates a ticket to use on each node. <strong>None</strong> allows you to reserve a slice name; you may instantiate the slice later.\n";
-echo "<p><strong>NOTE</strong>: All PlanetLab users are <strong>strongly</strong> encouraged to join the PlanetLab <a href='https://lists.planet-lab.org/mailman/listinfo/users'>Users</a> mailing list. Most questions about running software on PlanetLab can be answered by posting to this list. Site administrators often use this list to post announcements about service outages. New software releases and available services are announced here as well.\n";
-
-echo "<p><table><tbody>\n";
-
-// displays a site select list for admins and multi-site users
-if( count( $_person['site_ids'] ) > 1 || in_array( 10, $_roles ) ) {
- // get sites depending on role and sites associated.
- if( in_array( 10, $_roles ) )
- $site_info= $api->GetSites( NULL, array( "name", "site_id", "login_base" ) );
- elseif( count( $_person['site_ids'] ) > 1 )
- $site_info= $api->GetSites( $_person['site_ids'], array( "name", "site_id", "login_base" ) );
-
- echo "<tr><th>Site: </th><td><select onchange='update(this[selectedIndex].text)' name='site_id'>\n";
-
- sort_sites( $site_info );
- foreach( $site_info as $site ) {
- echo "<option value=". $site['site_id'];
- if( $site['site_id'] == $_person['site_ids'][0] )
- echo " selected";
- echo ">". $site['name'] ."->". $site['login_base'] ."</option>\n";
+// is there a need to consider several sites ?
+$multiple_sites=false;
+$site_columns=array('name','login_base','site_id');
+if (plc_is_admin ()) {
+ $multiple_sites=true;
+ $filter=NULL;
+ } else if (count (plc_my_site_ids()) > 1) {
+ $multiple_sites=true;
+ $filter=plc_my_site_ids();
+ }
+
+if ($multiple_sites) {
+ print "<div id='add_slice_in_site'>";
+ $other_sites=$api->GetSites($filter,$site_columns);
+ $selectors=array();
+ foreach ($other_sites as $other_site) {
+ $selector=array('display'=>$other_site['name'],
+ 'value'=>$other_site['site_id']);
+ if ($other_site['site_id']==$other_site_id) $selector['selected']='selected';
+ $selectors []= $selector;
}
- echo "</select></td><td></td></tr>\n";
-
-}
-
-echo "<tr><th$name_error>Name: </th><td><input type=text id='textbox' name='name' size=40 value='";
-if( $name )
- echo $name;
-else
- echo $base;
-echo "'></td><td>". $error['name'] ."</td></tr>\n";
-echo "<tr><th$url_error>URL: </th><td> <input type=text name='url' size=50 value='$url'></td><td>". $error['url'] ."</td></tr>\n";
-echo "<tr><th$desc_error>Description: </th><td> <textarea name='description' rows=5 cols=45>$description</textarea></td><td>". $error['description'] ."</td></tr>\n";
-echo "<tr><th>Instantiation: </th><td> <select name='instantiation'>\n";
-echo "<option value='plc-instantiated'"; if( $instantiation == 'plc-instantiated' ) echo " selected"; echo ">PLC</option>\n";
-echo "<option value='delegated'"; if( $instantiation == 'delegated' ) echo " selected"; echo ">Delegated</option>\n";
-echo "<option value='not-instantiated'"; if( $instantiation == 'not-instantiated' ) echo " selected"; echo ">None</option>\n";
-echo "</select></td><td></td></tr>\n";
-
-echo "</tbody></table>\n";
-
-echo "<p><input type=submit name='add' value='Add Slice'>\n";
-
-echo "</form>\n";
-
+ $site_form = new PleKitForm (l_slice_add(),array(),'get');
+ $site_form->start();
+ print $site_form->label_html('site_id','Or choose some other site');
+ print $site_form->select_html('site_id',$selectors,array('autosubmit'=>true,
+ 'id'=>'add_slice_choose_site'));
+ $site_form->end();
+ print "</div>";
+ }
+
+print <<< EOF
+<div class='slice_add'>
+<p>You must provide a short description of the new slice
+as well as a link to a project website before creating it.
+<br/>
+Do <strong>not</strong> provide bogus information; if a complaint
+is lodged against your slice and your PlanetLab Operations Center
+is unable to determine what the normal behavior of your slice is,
+your slice may be deleted to resolve the complaint.
+</p>
+<p><strong>NOTE</strong>:
+All PlanetLab users are <strong>strongly</strong> encouraged to join the PlanetLab
+<a href='https://lists.planet-lab.org/mailman/listinfo/users'>Users</a>
+mailing list. Most questions about running software on PlanetLab can be answered by
+posting to this list.
+<br/>Site administrators often use this list to post announcements about service outages.
+New software releases and available services are announced here as well.
+</p>
+</div>
+EOF;
+
+$details = new PlekitDetails(TRUE);
+
+$form_variables = array('site_id'=>plc_my_site_id());
+$form = $details -> form_start("/db/slices/slice_add.php",$form_variables);
+print $form->hidden_html("site_id",$site_id);
+
+$details->start();
+
+$running=count($site['slice_ids']);
+$max=$site['max_slices'];
+$allocated = " $running running / $max max";
+if ($running >= $max) $allocated = plc_warning_html($allocated);
+$details->th_td("Allocated slices",$allocated);
+$details->th_td("Name",$name ? $name : $base, "name");
+$details->th_td("URL",$url,"url");
+$details->th_td("Description",$description,"description",
+ array('input_type'=>'textarea',
+ 'width'=>50,'height'=>5));
+$selectors=array(array('display'=>"PLC",'value'=>'plc-instantiated'),
+ array('display'=>"Delegated",'value'=>'delegated'),
+ array('display'=>"Controller",'value'=>'nm-controller'),
+ array('display'=>"None",'value'=>'not-instantiated'));
+
+$instanciation_select = $form->select_html ("instantiation", $selectors);
+$details->th_td("Instanciation",$instanciation_select,"instantiation",
+ array('input_type'=>'select', 'value'=>$instantiation));
+
+
+$details->end();
+
+print <<< EOF
+<div class='slice_add'>
+<p>There are three possible "instantiation" states for a slice.</p>
+<ul>
+<li> <strong>PLC</strong> creates a slice with default settings. </li>
+<li><strong>Delegated</strong> creates a ticket to use on each node. </li>
+<li><strong>None</strong> allows you to reserve a slice name; you may instantiate the slice later.</li>
+</ul>
+</div>
+EOF;
+
+if ($persons) {
+ $title = count($persons) . " people can be added in slice";
+ $toggle=new PlekitToggle ('persons',$title,
+ array('visible'=>get_arg('show_persons',true)));
+ $toggle->start();
+
+ $headers = array();
+ $headers['email']='string';
+ $headers['first']='string';
+ $headers['last']='string';
+ $headers['+']='none';
+ $table = new PlekitTable ('persons_in_slice',$headers,0);
+ $table->start();
+ foreach ($persons as $person) {
+ $table->row_start();
+ $table->cell($person['email']);
+ $table->cell($person['first_name']);
+ $table->cell($person['last_name']);
+ $table->cell ($form->checkbox_html('person_ids[]',$person['person_id']));
+ $table->row_end();
+ }
+ $table->end();
+ $toggle->end();
+ }
+$add_button = $form->submit_html ("add-slice","Create Slice");
+print ("<div id='slice_add_button'> $add_button </div>");
+$form->end();
// Print footer
include 'plc_footer.php';
git://git.onelab.eu / plewww.git / blobdiff