X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfahelper.py;fp=sface%2Fsfahelper.py;h=0000000000000000000000000000000000000000;hp=9e2a1b93dff07e1bc518500f5fe2fb7cfb76aa1d;hb=76b7956ab05ec9a16b460115928d16b5d12f0a2a;hpb=40bea90fb2dab39013768cb2701b8303b7c44bc9 diff --git a/sface/sfahelper.py b/sface/sfahelper.py deleted file mode 100644 index 9e2a1b9..0000000 --- a/sface/sfahelper.py +++ /dev/null @@ -1,27 +0,0 @@ - -# These functions are going to be merged in sfa and we'll get rid of -# this sfahelper module. - baris - -from sfa.util.rspecHelper import RSpec - - -# TODO: already merged in sfa-trunk. Use the one there -def rspec_get_networks(rspec_string): - rspec = RSpec (rspec_string) - return rspec.rspec.xpath("./network[@name]/@name") - - -# TODO: already merged in sfa-trunk. Use the one there -def rspec_get_nodes_from_network(rspec_string, network): - rspec = RSpec (rspec_string) - return rspec.rspec.xpath("./network[@name='%s']/site/node/hostname/text()" % network) - - -def rspec_get_sliver_nodes_from_network(rspec_string, network): - rspec = RSpec (rspec_string) - return rspec.rspec.xpath("./network[@name='%s']/site/node[sliver]/hostname/text()" % network) - -def rspec_get_other_nodes_from_network(rspec_string, network): - rspec = RSpec (rspec_string) - # xxx todo - could not find the xpath syntax for 'does not have the sliver attribute' - return rspec.rspec.xpath("./network[@name='%s']/site/node[~sliver]/hostname/text()" % network)