From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 25 Mar 2011 10:57:37 +0000 (+0100)
Subject: same issue as yesterday; RSpec behaves oddly with multi-networks
X-Git-Tag: sfa-1.0-21-ckp1~74^2~47
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a77dff258df81137d430ea0e7d67c9cdfb3ea67c;p=sfa.git

same issue as yesterday; RSpec behaves oddly with multi-networks
rspecs; fix for the multi-myplcs sfa tests to work
---

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