X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fslices%2Fslice.php;h=af265b6e00100a2925f9d2a66e3eb5caccfc3fc8;hb=1ce86fd37ce8da9b475847a59394c0241a8dbbff;hp=3975fbb736b54c18e192aa9ce02d210b756f8996;hpb=bbdd2d949c4f1dc8db02dcc184d651f534a7b2a5;p=plewww.git diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php index 3975fbb..af265b6 100644 --- a/planetlab/slices/slice.php +++ b/planetlab/slices/slice.php @@ -1,7 +1,5 @@ - '); // -------------------- admins potentially need to get full list of users -ini_set('memory_limit','32M'); +//error_reporting(0); $profiling=false; if ($_GET['profiling']) $profiling=true; @@ -58,7 +55,7 @@ if (empty($slices)) { $slice=$slices[0]; -if ($profiling) plc_debug_prof('2: slice',count($slices)); +if ($profiling) plc_debug_prof('1: slice',count($slices)); // pull all node info to vars $name= $slice['name']; $expires = date( "d/m/Y", $slice['expires'] ); @@ -71,7 +68,7 @@ $peer_id= $slice['peer_id']; $peers=new Peers ($api); $local_peer = ! $peer_id; -if ($profiling) plc_debug_prof('3: peers',count($peers)); +if ($profiling) plc_debug_prof('2: peers',count($peers)); // gets site info $sites= $api->GetSites( array( $site_id ) ); @@ -79,7 +76,7 @@ $site=$sites[0]; $site_name= $site['name']; $max_slices = $site['max_slices']; -if ($profiling) plc_debug_prof('4: sites',count($sites)); +if ($profiling) plc_debug_prof('3: sites',count($sites)); //////////////////////////////////////// building blocks for the renew area // Constants global $DAY; $DAY = 24*60*60; @@ -88,7 +85,7 @@ global $MAX_WEEKS; $MAX_WEEKS= 8; // weeks from today global $GRACE_DAYS; $GRACE_DAYS=10; // days for renewal promoted on top global $NOW; $NOW=mktime(); -//////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////// utility for the renew tab // make the renew area on top and open if the expiration time is less than 10 days from now function renew_needed ($slice) { global $DAY, $NOW, $GRACE_DAYS; @@ -231,19 +228,12 @@ if ($local_peer ) { } -//////////////////// details -// default for opening the details section or not ? -if ($local_peer) { - $default_show_details = true; - } else { - $default_show_details = ! $renew_visible; - } - +//////////////////////////////////////////////////////////// tab:details $toggle = new PlekitToggle ('my-slice-details',"Details", array('bubble'=> 'Display and modify details for that slice', - 'visible'=>get_arg('show_details',$default_show_details))); + 'visible'=>get_arg('show_details'))); $toggle->start(); $details=new PlekitDetails($privileges); @@ -275,7 +265,7 @@ $details->end(); $details->form_end(); $toggle->end(); -//////////////////// persons +//////////////////////////////////////////////////////////// tab:persons $person_columns = array('email','person_id','first_name','last_name','roles'); // get persons in slice if (!empty($person_ids)) @@ -295,7 +285,7 @@ $toggle= new PlekitToggle ('my-slice-persons',"$count users", array('bubble'=> 'Manage accounts attached to this slice', - 'visible'=>get_arg('show_persons',false))); + 'visible'=>get_arg('show_persons'))); $toggle->start(); ////////// people currently in @@ -305,7 +295,7 @@ $toggle->start(); // show otherwise $toggle_persons = new PlekitToggle ('my-slice-persons-current', "$count people currently in $name", - array('visible'=>get_arg('show_persons_current',!$privileges))); + array('visible'=>get_arg('show_persons_current'))); $toggle_persons->start(); $headers=array(); @@ -347,7 +337,7 @@ if ($privileges) { $count=count($potential_persons); $toggle_persons = new PlekitToggle ('my-slice-persons-add', "$count people may be added to $name", - array('visible'=>get_arg('show_persons_add',false))); + array('visible'=>get_arg('show_persons_add'))); $toggle_persons->start(); if ( ! $potential_persons ) { // xxx improve style @@ -391,7 +381,7 @@ if ($privileges) { } $toggle->end(); -//////////////////////////////////////////////////////////// Nodes +//////////////////////////////////////////////////////////// tab:nodes // the nodes details to display here // (1) we search for the tag types for which 'category' matches 'node*/ui*' // all these tags will then be tentatively displayed in this area @@ -429,13 +419,51 @@ $visibletags = new VisibleTags ($api, 'node'); $visibletags->columns(); $tag_columns = $visibletags->headers(); +//columns that are not defined as extra myslice tags $extra_columns = array(); -$extra_columns[]=array('tagname'=>'sitename', 'header'=>'SN', 'type'=>'string', 'title'=>'Site name', 'fetched'=>true); -$extra_columns[]=array('tagname'=>'domain', 'header'=>'DN', 'type'=>'string', 'title'=>'Toplevel domain name', 'fetched'=>true); -$extra_columns[]=array('tagname'=>'ipaddress', 'header'=>'IP', 'type'=>'string', 'title'=>'IP Address', 'fetched'=>true); -$extra_columns[]=array('tagname'=>'fcdistro', 'header'=>'OS', 'type'=>'string', 'title'=>'Operating system', 'fetched'=>false); -$extra_columns[]=array('tagname'=>'uptime', 'header'=>'UT', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Continuous uptime until now', 'fetched'=>false); +//MyPLC columns +$extra_columns[]=array('tagname'=>'sitename', 'header'=>'SN', 'type'=>'string', 'title'=>'Site name', 'fetched'=>true, 'source'=>'myplc'); +$extra_columns[]=array('tagname'=>'domain', 'header'=>'DN', 'type'=>'string', 'title'=>'Toplevel domain name', 'fetched'=>true, 'source'=>'myplc'); +$extra_columns[]=array('tagname'=>'ipaddress', 'header'=>'IP', 'type'=>'string', 'title'=>'IP Address', 'fetched'=>true, 'source'=>'myplc'); +$extra_columns[]=array('tagname'=>'fcdistro', 'header'=>'OS', 'type'=>'string', 'title'=>'Operating system', 'fetched'=>false, 'source'=>'myplc'); $extra_columns[]=array('tagname'=>'date_created', 'header'=>'DA', 'source'=>'myplc', 'type'=>'date', 'title'=>'Date added', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'arch', 'header'=>'A', 'source'=>'myplc', 'type'=>'string', 'title'=>'Architecture', 'fetched'=>false); +if (plc_is_admin()) { +$extra_columns[]=array('tagname'=>'deployment', 'header'=>'DL', 'source'=>'myplc', 'type'=>'string', 'title'=>'Deployment', 'fetched'=>false); +} + +//CoMon Live data + +if (MYSLICE_COMON_AVAILABLE) +{ +$extra_columns[]=array('tagname'=>'bwlimit', 'header'=>'BW', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Bandwidth limit', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'numcores', 'header'=>'CC', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Number of CPU Cores', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'cpuspeed', 'header'=>'CR', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'CPU clock rate', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'disksize', 'header'=>'DS', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Disk size', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'gbfree', 'header'=>'DF', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Currently available disk space', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'memsize', 'header'=>'MS', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Memory size', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'numslices', 'header'=>'SM', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Number of slices in memory', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'uptime', 'header'=>'UT', 'source'=>'comon', 'type'=>'sortAlphaNumericTop', 'title'=>'Continuous uptime until now', 'fetched'=>false); +} + +//TopHat Live data + +if (MYSLICE_TOPHAT_AVAILABLE) +{ +$extra_columns[]=array('tagname'=>'asn', 'header'=>'AS', 'source'=>'tophat', 'type'=>'string', 'title'=>'AS Number', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'city', 'header'=>'LCY', 'source'=>'tophat', 'type'=>'string', 'title'=>'City', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'region', 'header'=>'LRN', 'source'=>'tophat', 'type'=>'string', 'title'=>'Region', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'country', 'header'=>'LCN', 'source'=>'tophat', 'type'=>'string', 'title'=>'Country', 'fetched'=>false); +$extra_columns[]=array('tagname'=>'continent', 'header'=>'LCT', 'source'=>'tophat', 'type'=>'string', 'title'=>'Continent', 'fetched'=>false); +//$extra_columns[]=array('tagname'=>'hopcount', 'header'=>'HC', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Hop count from reference node', 'fetched'=>false); +////$extra_columns[]=array('tagname'=>'rtt', 'header'=>'RTT', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Round trip time from reference node', 'fetched'=>false); +//////$extra_columns[]=array('tagname'=>'agents', 'header'=>'MA', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located measurement agents', 'fetched'=>true); +////$extra_columns[]=array('tagname'=>'agents_sonoma', 'header'=>'MAS', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located SONoMA agents', 'fetched'=>true); +////$extra_columns[]=array('tagname'=>'agents_etomic', 'header'=>'MAE', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located ETOMIC agents', 'fetched'=>true); +////$extra_columns[]=array('tagname'=>'agents_tdmi', 'header'=>'MAT', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located TDMI agents', 'fetched'=>true); +////$extra_columns[]=array('tagname'=>'agents_dimes', 'header'=>'MAD', 'source'=>'tophat', 'type'=>'sortAlphaNumericTop', 'title'=>'Co-located DIMES agents', 'fetched'=>true); +} + //Get user's column configuration @@ -447,64 +475,46 @@ $column_configuration = ""; $slice_column_configuration = ""; $show_configuration = ""; -$show_reservable_message = '1'; -$show_columns_message = '1'; - -//$PersonTags=$api->GetPersonTags (array('person_id'=>$plc->person['person_id'])); $PersonTags=$api->GetPersonTags (array('person_id'=>$plc->person['person_id'])); -//print_r($PersonTags); +//plc_debug('ptags',$PersonTags); foreach ($PersonTags as $ptag) { - if ($ptag['tagname'] == 'columnconf') - { - $column_configuration = $ptag['value']; - $conf_tag_id = $ptag['person_tag_id']; - } - if ($ptag['tagname'] == 'showconf') - { - $show_configuration = $ptag['value']; - $show_tag_id = $ptag['person_tag_id']; - } + if ($ptag['tagname'] == 'columnconf') { + $column_configuration = $ptag['value']; + $conf_tag_id = $ptag['person_tag_id']; + } else if ($ptag['tagname'] == 'showconf') { + $show_configuration = $ptag['value']; + $show_tag_id = $ptag['person_tag_id']; + } } -//print("
person column configuration = ".$column_configuration); -//print("
person show configuration = ".$show_configuration); - $sliceconf_exists = false; -if ($column_configuration == "") -{ - $first_time_configuration = true; - $column_configuration = $slice_id.";default"; - $sliceconf_exists = true; -} -else { - $slice_conf = explode(";",$column_configuration); - for ($i=0; $islice configuration = ".$slice_column_configuration); - + $column_configuration = $column_configuration.";".$slice_id.";default"; if ($slice_column_configuration == "") - $full_configuration = $default_configuration; + $full_configuration = $default_configuration; else - $full_configuration = $default_configuration."|".$slice_column_configuration; + $full_configuration = $default_configuration."|".$slice_column_configuration; //instantiate the column configuration class, which prepares the headers array @@ -513,23 +523,20 @@ $ConfigureColumns =new PlekitColumns($full_configuration, $fix_columns, $tag_col $visiblecolumns = $ConfigureColumns->node_tags(); $node_columns=array_merge($node_fixed_columns,$visiblecolumns); -//print_r($node_columns); $all_nodes=$api->GetNodes(NULL,$node_columns); $ConfigureColumns->fetch_live_data($all_nodes); -//print("
person show configuration = ".$show_configuration); - +$show_reservable_info = TRUE; +$show_layout_info = '1'; $show_conf = explode(";",$show_configuration); foreach ($show_conf as $ss) { - if ($ss =="reservable") - $show_reservable_message = '0'; - if ($ss =="columns") - $show_columns_message = '0'; + if ($ss =="reservable") + $show_reservable_info = FALSE; + else if ($ss =="columns") + $show_layout_info = '0'; } -//print("res:".$show_reservable_message." - cols:".$show_columns_message); - $slice_nodes=array(); $potential_nodes=array(); $reservable_nodes=array(); @@ -549,125 +556,72 @@ if (count($reservable_nodes)) $nodes_message .= " (" . count($reservable_nodes) $toggle=new PlekitToggle ('my-slice-nodes',$nodes_message, array('bubble'=> 'Manage nodes attached to this slice', - 'visible'=>get_arg('show_nodes',false))); + 'visible'=>get_arg('show_nodes'))); $toggle->start(); //////////////////// reservable nodes area - +$leases_info=" +You have attached one or more reservable nodes to your slice. +Reservable nodes show up with the '$mark' mark. +Your slivers will be available only during timeslots +where you have obtained leases. +You can manage your leases in the tab below. +
+This feature is still experimental; feedback is appreciated at devel@planet-lab.org +"; $count=count($reservable_nodes); if ($count && $privileges) { + // include leases.js only if needed + drupal_set_html_head(''); + // having reservable nodes in white lists looks a bit off scope for now... $toggle_nodes=new PlekitToggle('my-slice-nodes-reserve', "Leases - " . count($reservable_nodes) . " reservable node(s)", - array('visible'=>$show_reservable_message, 'info_div'=>'note_reservable_div')); + array('visible'=>get_arg('show_nodes_resa'), + 'info-text'=>$leases_info, + 'info-visible'=>$show_reservable_info)); $toggle_nodes->start(); -if ($show_reservable_message) -$note_display = ""; -else -$note_display = "display:none;"; - -////////// show a notice to people having attached a reservable node -if (count($reservable_nodes) && $privileges) { - $mark=reservable_mark(); - print << -
-
-You have attached one or more reservable nodes to your slice. -Reservable nodes show up with the '$mark' mark. -Your slivers will be available only during timeslots -where you have obtained leases. -You can manage your leases in the tab below. -
-Please note that as of August 2010 this feature is experimental. -Feedback is appreciated at devel@planet-lab.org -		hide message -
-
-EOF; -} - - $grain=$api->GetLeaseGranularity(); - if ($profiling) plc_debug_prof('6 granul',$grain); - // where to start from, expressed as an offset in hours from now - $resa_offset=$_GET['resa_offset']; - if ( ! $resa_offset ) $resa_offset=0; - $rough_start=time()+$resa_offset*3600; - // xxx should be configurable - $resa_slots=$_GET['resa_slots']; - if ( ! $resa_slots ) $resa_slots = 36; - // for now, show the next 72 hours, or 72 grains, which ever is smaller - $duration=$resa_slots*$grain; - $steps=$duration/$grain; - $start=intval($rough_start/$grain)*$grain; - $end=$rough_start+$duration; - $lease_columns=array('lease_id','name','t_from','t_until','hostname','name'); - $leases=$api->GetLeases(array(']t_until'=>$rough_start,'[t_from'=>$end,'-SORT'=>'t_from'),$lease_columns); - if ($profiling) plc_debug_prof('7 leases',count($leases)); - // hash nodes -> leases - $host_hash=array(); - foreach ($leases as $lease) { - $hostname=$lease['hostname']; - if ( ! $host_hash[$hostname] ) { - $host_hash[$hostname]=array(); - } - // resync within the table - $lease['nfrom']=($lease['t_from']-$start)/$grain; - $lease['nuntil']=($lease['t_until']-$start)/$grain; - $host_hash[$hostname] []= $lease; - } - # leases_data is the name used by leases.js to locate this table - echo ""; - # pass (slice_id,slicename) as the [0,0] coordinate as thead>tr>td - echo ""; - # the timeslot headers read (timestamp,label) - $day_names=array('Su','M','Tu','W','Th','F','Sa'); - for ($i=0; $i<$steps; $i++) { - $timestamp=($start+$i*$grain); - $day=$day_names[intval(strftime("%w",$timestamp))]; - $label=$day . strftime(" %H:%M",$timestamp); - // expose in each header cell the full timestamp, and how to display it - use & as a separator*/ - echo ""; - } - echo ""; - // todo - sort on hostnames - function sort_hostname ($a,$b) { return ($a['hostname']<$b['hostname'])?-1:1;} - usort($reservable_nodes,sort_hostname); - foreach ($reservable_nodes as $node) { - echo ""; - $hostname=$node['hostname']; - $leases=$host_hash[$hostname]; - $counter=0; - while ($counter<$steps) { - if ($leases && ($leases[0]['nfrom']<=$counter)) { - $lease=array_shift($leases); - /* nicer display, merge two consecutive leases for the same slice - avoid doing that for now, as it might makes things confusing */ - /* while ($leases && ($leases[0]['name']==$lease['name']) && ($leases[0]['nfrom']==$lease['nuntil'])) { - $lease['nuntil']=$leases[0]['nuntil']; - array_shift($leases); - }*/ - $duration=$lease['nuntil']-$counter; - echo ""; - $counter=$lease['nuntil']; - } else { - echo ""; - $counter+=1; - } - } - echo ""; - } - echo "
" . $slice['slice_id'] . '&' . $slice['name'] . "" . implode("&",array($timestamp,$label)) . "
". $node['hostname'] . "" . $lease['lease_id'] . '&' . $lease['name'] . "
\n"; + // get settings from environment, otherwise set to defaults + // when to start, in hours in the future from now + $leases_offset=$_GET['leases_offset']; + if ( ! $leases_offset ) $leases_offset=0; + // how many timeslots to show + $leases_slots=$_GET['leases_slots']; + if ( ! $leases_slots ) $leases_slots = 36; + // offset in hours (in the future) from now + $leases_w = $_GET['leases_w']; + if ( ! $leases_w) $leases_w=18; + // number of timeslots to display + + $granularity=$api->GetLeaseGranularity(); + + // these elements are for passing data to the javascript layer + echo ""; + echo ""; + echo ""; + // ditto, and editable - very rough for now + echo "
"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "
"; + + // leases_data is the name used by leases.js to locate this place + // first population will be triggered by init_scheduler from leases.js + echo ""; // the general layout for the scheduler echo <<< EOF
- - + +
EOF; @@ -676,16 +630,25 @@ EOF; //////////////////// node configuration panel - if ($first_time_configuration) $column_conf_visible = '1'; else $column_conf_visible = '0'; - +$layout_info=' +This tab allows you to customize the columns in the node tables, +below. Information on the nodes comes from a variety of monitoring +sources. If you, as either a user or a provider of monitoring data, +would like to see additional columns made available, please send us +your request in mail to support@myslice.info. You can +find more information about the MySlice project at http://trac.myslice.info. +'; $toggle_nodes=new PlekitToggle('my-slice-nodes-configuration', "Node table layout", - array('visible'=>$column_conf_visible, 'info_div'=>'note_columns_div')); + array('info-text'=>$layout_info, + 'info-visible'=>$show_layout_info)); $toggle_nodes->start(); //usort ($table_headers, create_function('$col1,$col2','return strcmp($col1["header"],$col2["header"]);')); @@ -700,23 +663,8 @@ print(""); print(""); print(""); print("
"); -print(""); -print(""); - -//print ("showing column message = ".$show_columns_message); -if ($show_columns_message == '0') -$note_display = "display:none;"; -else -$note_display = ""; - - print << -
-This tab allows you to customize the columns in the node tables, below. Information on the nodes comes from a variety of monitoring sources. If you, as either a user or a provider of monitoring data, would like to see additional columns made available, please send us your request in mail to support@myslice.info. You can find more information about the MySlice project at http://trac.myslice.info. -hide message permanently -
- -EOF; +print(""); +print(""); $ConfigureColumns->configuration_panel_html(true); @@ -743,7 +691,7 @@ foreach ($interfaces as $interface) $interface_hash[$interface['node_id']]=$inte //////////////////// nodes currently in $toggle_nodes=new PlekitToggle('my-slice-nodes-current', count_english($slice_nodes,"node") . " currently in $name", - array('visible'=>get_arg('show_nodes_current',!$privileges))); + array('visible'=>get_arg('show_nodes_current'))); $toggle_nodes->start(); $headers=array(); @@ -839,7 +787,7 @@ if ($privileges) { $count=count($potential_nodes); $toggle_nodes=new PlekitToggle('my-slice-nodes-add', count_english($potential_nodes,"more node") . " available", - array('visible'=>get_arg('show_nodes_add',false))); + array('visible'=>get_arg('show_nodes_add'))); $toggle_nodes->start(); if ( $potential_nodes ) { @@ -910,18 +858,143 @@ $table->cell($node['node_id'], array('display'=>'none')); $toggle->end(); +//////////////////////////////////////// retrieve all slice tags +$tags=$api->GetSliceTags (array('slice_id'=>$slice_id)); +//////////////////////////////////////////////////////////// tab:initscripts +// xxx fixme +// * add a message on how to use this: +// * explain the 2 mechanisms (initscript_code, initscript) +// * explain the interface : initscript start|stop|restart slicename +// xxx fixme + +$initscript_info=" +There are two ways to attach an initscript to a slice:
    + +
  • Shared initscripts are global to the +MyPLC, and managed by the Operations Team. For that reason, regular +users cannot change these scripts, but can reference one of the +available names in the drop down below.
    • + +
  • You also have the option to provide your own +code , with the following conventions:
      + +
    • Like regular initscripts, your script must except to receive as a +first argument start , +stop or restart . It is important +to honor this argument, as your slice may be stopped and restarted at +any time; also this is used whenever the installed code gets changed. +
      • + +
    • As a second argument, you will receive the slicename; in most +cases this can be safely ignored.
      • + +
    +
    • +
+The slice-specific setting has precedence on a shared initscript. +"; + +$shared_initscripts=$api->GetInitScripts(array('-SORT'=>'name'),array('name')); +//$shared_initscripts=$api->GetInitScripts(); +if ($profiling) plc_debug_prof('6 initscripts',count($initscripts)); +// xxx expose this even on foreign slices for now +if ($local_peer) { + $initscript=''; + $initscript_code=''; + if ($tags) foreach ($tags as $tag) { + if ($tag['tagname']=='initscript') { + if ($initscript!='') drupal_set_error("multiple occurrences of 'initscript' tag"); + $initscript=$tag['value']; + } + if ($tag['tagname']=='initscript_code') { + if ($initscript_code!='') drupal_set_error("multiple occurrences of 'initscript_code' tag"); + $initscript_code=$tag['value']; + // plc_debug_txt('retrieved body',$initscript_code); + } + } + $label="No initscript"; + $trimmed=trim($initscript_code); + if (!empty($trimmed)) $label="Initscript : slice-specific (" . substr($initscript_code,0,20) . " ...)"; + else if (!empty($initscript)) $label="Initscript: shared " . $initscript; + + $toggle = new PlekitToggle('slice-initscripts',$label, + array('bubble'=>'Manage initscript on that slice', + 'visible'=>get_arg('show_initscripts'), + 'info-text'=>$initscript_info + // not messing with persontags to guess whether this should be displayed or not + // hopefully some day toggle will know how to handle that using web storage + )); + $toggle->start(); + + $details=new PlekitDetails(TRUE); + // we expose the previous values so that actions.php can know if changes are really needed + // the code needs to be encoded as it may contain any character + // as far as the code, this does not work too well b/c what actions.php receives + // seems to have spurrious \r chars, and the comparison between old and new values + // is not reliable, which results in changes being made although the code hasn't changed + // hve spent too much time on this, good enough for now... + $details->form_start(l_actions(),array('action'=>'update-initscripts', + 'slice_id'=>$slice_id, + 'name'=>$name, + 'previous-initscript'=>$initscript, + 'previous-initscript-code'=>htmlentities($initscript_code))); + $details->start(); + // comppute a pulldown with available names + $selectors=array(); + $is_found=FALSE; + if ($shared_initscripts) foreach ($shared_initscripts as $is) { + $is_selector=array('display'=>$is['name'],'value'=>$is['name']); + if ($is['name']==$initscript) { + $is_selector['selected']=TRUE; + $is_found=TRUE; + } + $selectors[]=$is_selector; + } + // display a warning when initscript references an unknown script + $details->tr_submit('unused','Update initscripts'); + ////////// by name + $details->th_td("shared initscript name", + $details->form()->select_html('initscript',$selectors,array('label'=>'none')), + 'initscript', + array('input_type'=>'select')); + if ($initscript && ! $is_found) + // xxx better rendering ? + $details->th_td('WARNING',plc_warning_html("Current name '" . $initscript . "' is not a known shared initscript name")); + ////////// by contents + $script_height=8; + $script_width=60; + if ($initscript_code) { + $text=explode("\n",$initscript_code); + $script_height=count($text); + $script_width=10; + foreach ($text as $line) $script_width=max($script_width,strlen($line)); + } + $details->th_td('slice initscript',$initscript_code,'initscript-code', + array('input_type'=>'textarea', 'width'=>$script_width,'height'=>$script_height)); + $details->tr_submit('unused','Update initscripts'); + $details->form_end(); + $details->end(); + $toggle->end(); +} + +//////////////////////////////////////////////////////////// tab:tags // very wide values get abbreviated $tag_value_threshold=24; -//////////////////////////////////////////////////////////// Tags +// xxx fixme +// * this area could use a help message about some special tags: +// * initscript-related should be taken out +// * sliverauth-related (ssh_key & hmac) should have a toggle to hide or show +// xxx fixme + +// xxx expose this even on foreign slices for now //if ( $local_peer ) { - $tags=$api->GetSliceTags (array('slice_id'=>$slice_id)); - if ($profiling) plc_debug_prof('8 slice tags',count($tags)); + if ($profiling) plc_debug_prof('7 slice tags',count($tags)); function get_tagname ($tag) { return $tag['tagname'];} $tagnames = array_map ("get_tagname",$tags); $toggle = new PlekitToggle ('slice-tags',count_english_warning($tags,'tag'), - array('bubble'=>'Inspect and set tags on tat slice', - 'visible'=>get_arg('show_tags',false))); + array('bubble'=>'Inspect and set tags on that slice', + 'visible'=>get_arg('show_tags'))); $toggle->start(); $headers=array( @@ -960,7 +1033,7 @@ $tag_value_threshold=24; $nodegroup_name="n/a"; if ($tag['nodegroup_id']) { $nodegroups=$api->GetNodeGroups(array('nodegroup_id'=>$tag['nodegroup_id'])); - if ($profiling) plc_debug_prof('10 nodegroup for slice tag',$nodegroup); + if ($profiling) plc_debug_prof('8 nodegroup for slice tag',$nodegroup); if ($nodegroup) { $nodegroup = $nodegroups[0]; $nodegroup_name = $nodegroup['groupname']; @@ -987,8 +1060,8 @@ $tag_value_threshold=24; function tag_selector ($tag) { return array("display"=>$tag['tagname'],"value"=>$tag['tag_type_id']); } - $all_tags= $api->GetTagTypes( array ("category"=>"slice*","-SORT"=>"+tagname"), array("tagname","tag_type_id")); - if ($profiling) plc_debug_prof('11 tagtypes',count($all_tags)); + $all_tags= $api->GetTagTypes( array ("category"=>"*slice*","-SORT"=>"+tagname"), array("tagname","tag_type_id")); + if ($profiling) plc_debug_prof('9 tagtypes',count($all_tags)); $selector_tag=array_map("tag_selector",$all_tags); function node_selector($node) { @@ -1000,7 +1073,7 @@ $tag_value_threshold=24; return array("display"=>$ng["groupname"],"value"=>$ng['nodegroup_id']); } $all_nodegroups = $api->GetNodeGroups( array("groupname"=>"*"), array("groupname","nodegroup_id")); - if ($profiling) plc_debug_prof('13 nodegroups',count($all_nodegroups)); + if ($profiling) plc_debug_prof('10 nodegroups',count($all_nodegroups)); $selector_nodegroup=array_map("nodegroup_selector",$all_nodegroups); $table->cell($form->select_html("tag_type_id",$selector_tag,array('label'=>"Choose Tag"))); @@ -1017,9 +1090,9 @@ $tag_value_threshold=24; //} -//////////////////////// renew slice +//////////////////////////////////////////////////////////// tab:renew if ($local_peer ) { - if ( ! $renew_visible) renew_area ($slice,$site,false); + if ( ! $renew_visible) renew_area ($slice,$site,NULL); } $peers->block_end($peer_id);