From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 10 Oct 2007 18:25:49 +0000 (+0000)
Subject: do not cache whitelisted nodes
X-Git-Tag: PLCAPI-4.2-0~65
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6d80e390a1ed478fd84c87e34a90a5f4b768670c;p=plcapi.git

do not cache whitelisted nodes
---

diff --git a/PLC/Methods/GetPeerData.py b/PLC/Methods/GetPeerData.py
index 1dcee31..346331a 100644
--- a/PLC/Methods/GetPeerData.py
+++ b/PLC/Methods/GetPeerData.py
@@ -1,7 +1,7 @@
 #
 # Thierry Parmentelat - INRIA
 # 
-# $Id$
+# $Id: GetPeerData.py 904 2007-10-08 14:28:06Z thierry $
 
 import time
 
@@ -49,6 +49,10 @@ class GetPeerData(Method):
         node_fields = filter(lambda field: field not in \
                              ['boot_nonce', 'key', 'session', 'root_person_ids'],
                              Node.fields)
+        nodes = Nodes(self.api, {'peer_id': None}, node_fields);
+        # filter out whitelisted nodes
+        nodes = [ n for n in nodes if not n['slice_ids_whitelist']] 
+        
 
         person_fields = filter(lambda field: field not in \
                                ['password', 'verification_key', 'verification_expires'],
@@ -70,7 +74,7 @@ class GetPeerData(Method):
         result = {
             'Sites': Sites(self.api, {'peer_id': None}),
             'Keys': Keys(self.api, {'peer_id': None}),
-            'Nodes': Nodes(self.api, {'peer_id': None}, node_fields),
+            'Nodes': nodes,
             'Persons': persons,
             'Slices': slices,
             }