X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fnodes%2Fnode_add.php;h=8a17774d936d6b820ade66e0838afae9c50e991d;hb=c0e69680677e153e96e0302633e97e31b1e2c7a6;hp=b56cf1b189a6261bafb3fb6f7d4680f6d0bcecc7;hpb=e1205e67d6ddb33eb56e06b9c2a1d44d7eb2da32;p=plewww.git
diff --git a/planetlab/nodes/node_add.php b/planetlab/nodes/node_add.php
index b56cf1b..8a17774 100644
--- a/planetlab/nodes/node_add.php
+++ b/planetlab/nodes/node_add.php
@@ -9,40 +9,46 @@ global $plc, $api;
// Common functions
require_once 'plc_functions.php';
+require_once 'toggle.php';
+require_once 'details.php';
+require_once 'form.php';
// if not a admin, pi, or tech then redirect to node index
// xxx does not take site into account
-$has_privileges=plc_is_admin() || plc_is_pi() || plc_is_tech();
+$has_privileges=plc_is_admin();
+$is_pi_or_tech=plc_is_pi() || plc_is_tech();
if( ! $has_privileges) {
+ if ( $is_pi_or_tech) {
+ drupal_goto(l_register_node());
+ return 0;
+ }
+ drupal_set_error ("Insufficient privileges to add a node");
header( "index.php" );
+ return 0;
}
-// this sets up which box is to be checked the first time the page is loaded
-$method= $_POST['method'];
-if( $method == "" ) $method= "static";
-
-$model= $_POST['model'];
-if( $model == "" ) $model= "Custom";
-
-
-$submitted = false;
+//plc_debug('POST',$_POST);
// if submitted validate and add
-if ( $_POST['submitted'] ) {
- $submitted = true;
+// could go in actions.php but OTOH when things fail it's more convenient
+// to show the current values again
+if ( $_POST['add-node'] ) {
$errors= array();
+ $site_id = trim($_POST['site_id']);
+ $hostname = trim($_POST['hostname']);
+ $model= trim($_POST['model']);
+ $node_type = trim ($_POST['node_type']);
$method = trim($_POST['method']);
$ip = trim($_POST['ip']);
$netmask = trim($_POST['netmask']);
$network = trim($_POST['network']);
- $gateway = trim($_POST['gateway']);
$broadcast = trim($_POST['broadcast']);
+ $gateway = trim($_POST['gateway']);
$dns1 = trim($_POST['dns1']);
$dns2 = trim($_POST['dns2']);
- $hostname = trim($_POST['hostname']);
- $model= trim($_POST['model']);
+ $bwlimit = trim($_POST['bwlimit']);
// used to generate error strings for static fields only
$static_fields= array();
@@ -62,7 +68,7 @@ if ( $_POST['submitted'] ) {
}
if( !is_valid_network_addr($network,$netmask) ) {
- $errors[] = "The network address does not coorespond to the netmask";
+ $errors[] = "The network address does not match the netmask";
}
}
@@ -71,44 +77,56 @@ if ( $_POST['submitted'] ) {
}
if( $ip == "" ) {
$errors[] = "IP is required";
+ } else if ( ! is_valid_ip ($ip)) {
+ $errors []= "Invalid IP $ip";
}
- if( count($errors) == 0 ) {
- $success= 1;
-
+
+ if( !empty($errors) ) {
+ drupal_set_error(plc_itemize($errors));
+ } else {
// add new node and its interface
- $optional_vals= array( "hostname"=>$hostname, "model"=>$model );
- $site_id= plc_my_site_id();
- $node_id= $api->AddNode( intval( $site_id ), $optional_vals );
+ $node_fields= array( "hostname"=>$hostname, "model"=>$model , "node_type" => $node_type);
+ $node_id= $api->AddNode( intval( $site_id ), $node_fields );
- if ( $api->error() ) {
- $errors[] = "Hostname already present or not valid";
- $success= 0;
+ if ( empty($node_id) || ($node_id < 0) ) {
+ drupal_set_error ("AddNode failed - hostname already present, or not valid ?");
} else {
// now, try to add the network.
- $optional_vals= array();
- $optional_vals['is_primary']= true;
- $optional_vals['ip']= $ip;
- $optional_vals['type']= 'ipv4';
- $optional_vals['method']= $method;
+ $interface_fields= array();
+ $interface_fields['is_primary']= true;
+ $interface_fields['ip']= $ip;
+ $interface_fields['type']= $_POST['type'];
+ $interface_fields['method']= $method;
+ if (!empty($bwlimit))
+ $interface_fields['bwlimit']=$bwlimit;
- if( $method == 'static' ) {
- $optional_vals['gateway']= $gateway;
- $optional_vals['network']= $network;
- $optional_vals['broadcast']= $broadcast;
- $optional_vals['netmask']= $netmask;
- $optional_vals['dns1']= $dns1;
- if (!empty($dns2)) {
- $optional_vals['dns2']= $dns2;
- }
+ if ( $method == 'static' ) {
+ $interface_fields['netmask']= $netmask;
+ $interface_fields['network']= $network;
+ $interface_fields['broadcast']= $broadcast;
+ $interface_fields['gateway']= $gateway;
+ $interface_fields['dns1']= $dns1;
+ if (!empty($dns2))
+ $interface_fields['dns2']= $dns2;
}
- $interface_id= $api->AddInterface( $node_id, $optional_vals);
- // if AddInterface fails, we have the node created,
- // but no primary interface is present.
- // The primary interface can be added later,
- // but take a look at the possible Methods,
- // if we specify TUN/TAP Method we will have
- // an error on download of the configuration file
+ $interface_id= $api->AddInterface( $node_id, $interface_fields);
+ if ($interface_id > 0) {
+ drupal_set_message ("Node successfully created");
+ drupal_set_message ("Download a boot image in the 'Download' drop down below");
+ plc_redirect (l_node($node_id));
+ } else {
+ // if AddInterface fails, we have the node created,
+ // but no primary interface is present.
+ // The primary interface can be added later,
+ // but take a look at the possible Methods,
+ // if we specify TUN/TAP Method we will have
+ // an error on download of the configuration file
+ drupal_set_message ("Node created");
+ drupal_set_error ("But without an interface");
+ drupal_set_error ("Please review manually");
+ plc_redirect (l_node($node_id));
+ }
}
}
}
@@ -117,148 +135,104 @@ if ( $_POST['submitted'] ) {
require_once 'plc_drupal.php';
include 'plc_header.php';
-?>
-
-
-
-The node has been successfully added.
-
-View node details and download a configuration
- file $link.
-EOF;
- } else {
- $sites=$api->GetSites(array(plc_my_site_id()));
- $sitename=$sites[0]['name'];
-
- drupal_set_title('Add a new node in site "' . $sitename . '"');
- print <<< EOF
-
-
This page will allow you to add a new machine to your site. This must
-be done before the machine is turned on, as it will allow you to download
-a configuration file when complete for this node.
-
-
Even for DHCP, you must enter the IP address of the node.
+// include javacsript helpers
+require_once 'prototype.php';
+drupal_set_html_head ('
+
+');
+
+drupal_set_title('Add a new node to site');
+
+// defaults
+$model = $_POST['model'];
+if( ! $model ) $model= "Custom";
+
+$node_type = $_POST['node_type'];
+if ( ! $node_type ) $node_type= "regular";
+
+$method = $_POST['method'];
+if( ! $method ) $method= "static";
+
+print <<< EOF
+
+This page lets you declare a new machine to a site.
+
+This must be done before the machine is turned on,
+as it will allow you to download a boot image when complete for this node.
+
+It is now reserved to admins, as regular users are supposed to use the register wizard, that among other things enforces PCU deployment.
+
+An IP address is required even if you use DHCP.
+
EOF;
-if( count($errors) > 0 ) {
- plc_errors ($errors);
-}
-
-$self = $_SERVER['PHP_SELF'];
-if (!empty($_SERVER['QUERY_STRING'])) {
- $self .= "?" . $_SERVER['QUERY_STRING'];
-}
-
-?>
-
-
-
-'Add a node - does not enforce PCU - for admins only !',
+ 'visible'=>get_arg('show_details',true)));
+$toggle->start();
+
+$details=new PlekitDetails($has_privileges);
+
+// xxx hardwire network type for now
+$form_variables = array('type'=>"ipv4");
+//$form=$details->form_start(l_actions(),$form_variables);
+$form=$details->form_start('/db/nodes/node_add.php',$form_variables,
+ array('onSubmit'=>'return interfaceSubmit()'));
+
+$details->start();
+
+$site_columns=array( "site_id", "name", "login_base" );
+$local_sites= $api->GetSites( array("peer_id"=>NULL, '-SORT'=>'name'), $site_columns );
+function site_selector($site) { return array('display'=>$site['name'],"value"=>$site['site_id']); }
+$site_selector = array_map ("site_selector",$local_sites);
+$site_select = $form->select_html("site_id", $site_selector, array('id'=>'site_id'));
+$details->th_td("Site",
+ $site_select,
+ "site_id",
+ array('input_type'=>'select','value'=>$interface['site_id']));
+
+$details->th_td("Hostname",$hostname,"hostname");
+$details->th_td("Model",$model,"model");
+$node_type_select = $form->select_html ("node_type",
+ node_type_selectors($api,$node_type),
+ array('id'=>'node_type'));
+$details->th_td("Reservation",$node_type_select,"node_type",
+ array('input_type'=>'select','value'=>$node_type));
+$method_select = $form->select_html ("method",
+ interface_method_selectors($api,$method,true),
+ array('id'=>'method',
+ 'onChange'=>'updateMethodFields()'));
+$details->th_td("Method",$method_select,"method",
+ array('input_type'=>'select','value'=>$interface['method']));
+
+// dont display the 'type' selector as it contains only ipv4
+//>>> GetNetworkTypes()
+//[u'ipv4']
+
+$details->th_td("IP address",$ip,"ip",array('width'=>15,
+ 'onKeyup'=>'networkHelper()',
+ 'onChange'=>'networkHelper()'));
+$details->th_td("Netmask",$netmask,"netmask",array('width'=>15,
+ 'onKeyup'=>'networkHelper()',
+ 'onChange'=>'networkHelper()'));
+$details->th_td("Network",$network,"network",array('width'=>15));
+$details->th_td("Broadcast",$broadcast,"broadcast",array('width'=>15));
+$details->th_td("Gateway",$gateway,"gateway",array('width'=>15,
+ 'onChange'=>'subnetChecker("gateway",false)'));
+$details->th_td("DNS 1",$dns1,"dns1",array('width'=>15,
+ 'onChange'=>'subnetChecker("dns1",false)'));
+$details->th_td("DNS 2",$dns2,"dns2",array('width'=>15,
+ 'onChange'=>'subnetChecker("dns2",true)'));
+$details->space();
+$details->th_td("BW limit (bps)",$bwlimit,"bwlimit",array('width'=>11));
+
+// the buttons
+$add_button = $form->submit_html ("add-node","Add New Node");
+$details->tr($add_button,"right");
+
+$form->end();
+$details->end();
+$toggle->end();
// Print footer
include 'plc_footer.php';