Add the nm-controller instantiation to support delegated slivers.

[plewww.git] / planetlab / slices / slice_add.php

diff --git a/planetlab/slices/slice_add.php b/planetlab/slices/slice_add.php
index 6a056b1..f5158b2 100644 (file)
--- a/planetlab/slices/slice_add.php
+++ b/planetlab/slices/slice_add.php
@@ -129,7 +129,9 @@ if ( ! $_POST['name'])
 
 // propose to add all 'reachable' persons 
 $site_person_ids=$site['person_ids'];
-$persons=$api->GetPersons($site_person_ids,array('email','enabled','first_name','last_name','person_id'));
+$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 . '"');
 
@@ -220,6 +222,7 @@ $details->th_td("Description",$description,"description",
                      '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);