Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Mon, 28 Mar 2011 21:04:44 +0000 (23:04 +0200)
committerroot <root@blitz.inria.fr>
Mon, 28 Mar 2011 21:04:44 +0000 (23:04 +0200)
sfa/plc/network.py

index d0e0e08..c84ffa5 100644 (file)
@@ -570,10 +570,8 @@ class Network:
         tmp = []
         for node in api.plshell.GetNodes(api.plauth, {'peer_id': None}):
             try:
-                nodeObj = Node(self, node)
-                if nodeObj.site != None:
-                    t = node['node_id'], nodeObj
-                    tmp.append(t)
+                t = node['node_id'], Node(self, node)
+                tmp.append(t)
             except:
                 self.api.logger.error("Failed to add node %s (%s) to RSpec" % (node['hostname'], node['node_id']))