Merge branch 'master' of git.onelab.eu:/git/sface
[sface.git] / sface / sfahelper.py
index dd26f74..9e2a1b9 100644 (file)
@@ -12,9 +12,9 @@ def rspec_get_networks(rspec_string):
 
 
 # TODO: already merged in sfa-trunk. Use the one there
-def rspec_get_xml_nodes_from_network(rspec_string, network):
+def rspec_get_nodes_from_network(rspec_string, network):
     rspec = RSpec (rspec_string)
-    return rspec.rspec.xpath("./network[@name='%s']/site/node" % network)
+    return rspec.rspec.xpath("./network[@name='%s']/site/node/hostname/text()" % network)
 
 
 def rspec_get_sliver_nodes_from_network(rspec_string, network):