From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 24 Mar 2011 21:49:23 +0000 (+0100)
Subject: fix sfiListNodes with rspecs that mix several networks
X-Git-Tag: sfa-1.0-21-ckp1~74^2~50
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=51a6e7b12ad8752bcfcd8c80b02836f9cbc3f03a;p=sfa.git

fix sfiListNodes with rspecs that mix several networks
---

diff --git a/sfa/util/rspecHelper.py b/sfa/util/rspecHelper.py
index 6cac3b3c..599a1c83 100755
--- a/sfa/util/rspecHelper.py
+++ b/sfa/util/rspecHelper.py
@@ -88,11 +88,14 @@ class RSpec:
                 return name.getparent()
         return None
         
+    # Thierry : I need this to return all nodes in all networks
     def get_node_list(self, network=None):
-        if network == None:
+        if network == None and self.network:
             network = self.network
-        result = self.rspec.xpath("./network[@name='%s']/site/node/hostname/text()" % network)
-        return result
+        if network != None:
+            return self.rspec.xpath("./network[@name='%s']/site/node/hostname/text()" % network)
+        else:
+            return self.rspec.xpath("./network/site/node/hostname/text()")
 
     def get_network_list(self):
         return self.rspec.xpath("./network[@name]/@name")