From 51a6e7b12ad8752bcfcd8c80b02836f9cbc3f03a Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 24 Mar 2011 22:49:23 +0100 Subject: [PATCH] fix sfiListNodes with rspecs that mix several networks --- sfa/util/rspecHelper.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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") -- 2.43.0