From: Andy Bavier <acb@acb-imac.cs.princeton.edu>
Date: Thu, 17 Feb 2011 16:21:30 +0000 (-0500)
Subject: Obsoleted; use sfa.util.rspecHelper directly
X-Git-Tag: sface-0.1-5~10
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=76b7956ab05ec9a16b460115928d16b5d12f0a2a;ds=sidebyside

Obsoleted; use sfa.util.rspecHelper directly

Removed this module because its functionality has been subsumed by sfa.util.rspecHelper.
---

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)