From a77dff258df81137d430ea0e7d67c9cdfb3ea67c Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 25 Mar 2011 11:57:37 +0100 Subject: [PATCH] same issue as yesterday; RSpec behaves oddly with multi-networks rspecs; fix for the multi-myplcs sfa tests to work --- sfa/util/rspecHelper.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sfa/util/rspecHelper.py b/sfa/util/rspecHelper.py index 599a1c83..f6c860b4 100755 --- a/sfa/util/rspecHelper.py +++ b/sfa/util/rspecHelper.py @@ -79,16 +79,20 @@ class RSpec: if len(networks) == 1: self.network = networks[0] + # Thierry : need this to locate hostname even if several networks def get_node_element(self, hostname, network=None): - if network == None: + if network == None and self.network: network = self.network - names = self.rspec.iterfind("./network[@name='%s']/site/node/hostname" % network) + if network != None: + names = self.rspec.iterfind("./network[@name='%s']/site/node/hostname" % network) + else: + names = self.rspec.iterfind("./network/site/node/hostname") for name in names: if name.text == hostname: return name.getparent() return None - # Thierry : I need this to return all nodes in all networks + # Thierry : need this to return all nodes in all networks def get_node_list(self, network=None): if network == None and self.network: network = self.network -- 2.47.0