git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix merge conflicts
[sface.git]
/
sface
/
sfahelper.py
diff --git
a/sface/sfahelper.py
b/sface/sfahelper.py
index
dd26f74
..
9e2a1b9
100644
(file)
--- a/
sface/sfahelper.py
+++ b/
sface/sfahelper.py
@@
-12,9
+12,9
@@
def rspec_get_networks(rspec_string):
# TODO: already merged in sfa-trunk. Use the one there
# 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)
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):
def rspec_get_sliver_nodes_from_network(rspec_string, network):