ctdb-tests: Don't set FAKE_ETHTOOL_LINK_DOWN globally

This variable doesn't need to be set in a generic function and can be
set by the ethtool support functions

This is now a subdirectory of FAKE_NETWORK_STATE.

The down/up functions get reindented because the new 1st line should
be indented according to the new script indent-with-tabs style.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 3f237d0d8421ceaab37cbf6a8d7d6d34c265e5a7..f03935b3981f92efb80ce4df26703f48185149d5 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -81,10 +81,6 @@ setup_generic ()
     mkdir -p "$FAKE_PROC_NET_BONDING"
     rm -f "$FAKE_PROC_NET_BONDING"/*
 
-    export FAKE_ETHTOOL_LINK_DOWN="$EVENTSCRIPTS_TESTS_VAR_DIR/ethtool-link-down"
-    mkdir -p "$FAKE_ETHTOOL_LINK_DOWN"
-    rm -f "$FAKE_ETHTOOL_LINK_DOWN"/*
-
     export CTDB_DBDIR="${EVENTSCRIPTS_TESTS_VAR_DIR}/db"
     export CTDB_DBDIR_PERSISTENT="${CTDB_DBDIR}/persistent"
     export CTDB_DBDIR_STATE="${CTDB_DBDIR}/state"
@@ -197,20 +193,31 @@ MII Status: $_mii_subs
 EOF
 }
 
+_ethtool_setup ()
+{
+       FAKE_ETHTOOL_LINK_DOWN="${FAKE_NETWORK_STATE}/ethtool-link-down"
+       export FAKE_ETHTOOL_LINK_DOWN
+       mkdir -p "$FAKE_ETHTOOL_LINK_DOWN"
+}
+
 ethtool_interfaces_down ()
 {
-    for _i ; do
-       echo "Marking interface $_i DOWN for ethtool"
-       touch "${FAKE_ETHTOOL_LINK_DOWN}/${_i}"
-    done
+       _ethtool_setup
+
+       for _i ; do
+               echo "Marking interface $_i DOWN for ethtool"
+               touch "${FAKE_ETHTOOL_LINK_DOWN}/${_i}"
+       done
 }
 
 ethtool_interfaces_up ()
 {
-    for _i ; do
-       echo "Marking interface $_i UP for ethtool"
-       rm -f "${FAKE_ETHTOOL_LINK_DOWN}/${_i}"
-    done
+       _ethtool_setup
+
+       for _i ; do
+               echo "Marking interface $_i UP for ethtool"
+               rm -f "${FAKE_ETHTOOL_LINK_DOWN}/${_i}"
+       done
 }
 
 dump_routes ()