git://git.onelab.eu
/
plewww.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
72b28fa
)
fix whitelisted node visibility for slices
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Tue, 2 Jun 2009 22:10:10 +0000
(22:10 +0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Tue, 2 Jun 2009 22:10:10 +0000
(22:10 +0000)
planetlab/slices/slice.php
patch
|
blob
|
history
diff --git
a/planetlab/slices/slice.php
b/planetlab/slices/slice.php
index
fd0163a
..
64aef69
100644
(file)
--- a/
planetlab/slices/slice.php
+++ b/
planetlab/slices/slice.php
@@
-375,7
+375,7
@@
$toggle->end();
//////////////////// nodes
// minimal list as a start
//////////////////// nodes
// minimal list as a start
-$node_columns = array('hostname','node_id','arch','peer_id');
+$node_columns = array('hostname','node_id','arch','peer_id'
,'slice_ids_whitelist'
);
$nodes=$api->GetNodes(array('node_id'=>$slice['node_ids']),$node_columns);
$potential_nodes=$api->GetNodes(array('~node_id'=>$slice['node_ids']),$node_columns);
$count=count($nodes);
$nodes=$api->GetNodes(array('node_id'=>$slice['node_ids']),$node_columns);
$potential_nodes=$api->GetNodes(array('~node_id'=>$slice['node_ids']),$node_columns);
$count=count($nodes);
@@
-431,6
+431,15
@@
$toggle_nodes->end();
////////// nodes to add
if ($privileges) {
////////// nodes to add
if ($privileges) {
+ $new_potential_nodes = array();
+ if ($potential_nodes) foreach ($potential_nodes as $node) {
+ $emptywl=empty($node['slice_ids_whitelist']);
+ $inwl = (!emptywl) and in_array($slice['slice_id'],$node['slice_ids_whitelist']);
+ if ($emptywl or $inwl)
+ $new_potential_nodes[]=$node;
+ }
+ $potential_nodes=$new_potential_nodes;
+
$count=count($potential_nodes);
$toggle_nodes=new PlekitToggle('my-slice-nodes-add',
"$count more nodes available",
$count=count($potential_nodes);
$toggle_nodes=new PlekitToggle('my-slice-nodes-add',
"$count more nodes available",