git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2427b69
)
make sure to specify peer_id = None so we are only looking at local data
author
Tony Mack
<tmack@cs.princeton.edu>
Thu, 11 Jun 2009 15:21:51 +0000
(15:21 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Thu, 11 Jun 2009 15:21:51 +0000
(15:21 +0000)
geni/util/nodes.py
patch
|
blob
|
history
diff --git
a/geni/util/nodes.py
b/geni/util/nodes.py
index
a372cb5
..
1def419
100644
(file)
--- a/
geni/util/nodes.py
+++ b/
geni/util/nodes.py
@@
-151,7
+151,7
@@
class Nodes(SimpleStorage):
# Get the required nodes
if not hrn:
# Get the required nodes
if not hrn:
- nodes = self.api.plshell.GetNodes(self.api.plauth)
+ nodes = self.api.plshell.GetNodes(self.api.plauth
, {'peer_id': None}
)
try: linkspecs = self.api.plshell.GetLinkSpecs() # if call is supported
except: linkspecs = []
else:
try: linkspecs = self.api.plshell.GetLinkSpecs() # if call is supported
except: linkspecs = []
else:
@@
-162,7
+162,7
@@
class Nodes(SimpleStorage):
else:
slice = slices[0]
node_ids = slice['node_ids']
else:
slice = slices[0]
node_ids = slice['node_ids']
- nodes = self.api.plshell.GetNodes(self.api.plauth,
node_ids
)
+ nodes = self.api.plshell.GetNodes(self.api.plauth,
{'peer_id': None, 'node_ids': node_ids}
)
# Filter out whitelisted nodes
public_nodes = lambda n: n.has_key('slice_ids_whitelist') and not n['slice_ids_whitelist']
# Filter out whitelisted nodes
public_nodes = lambda n: n.has_key('slice_ids_whitelist') and not n['slice_ids_whitelist']