ctdb-tests: Use setup_script_options() in 13.per_ip_routing tests

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

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.001.sh b/ctdb/tests/eventscripts/13.per_ip_routing.001.sh
index 405ef4c2f781ca1e5a5f6d182e97b162e1ff5e29..55c8c64f5770749b5faa880ad95aef14238996ca 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.001.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.001.sh
@@ -6,7 +6,9 @@ define_test "not configured"
 
 setup
 
+setup_script_options <<EOF
 CTDB_PER_IP_ROUTING_CONF=""
+EOF
 
 ok_null
 simple_test_event "takeip"

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.011.sh b/ctdb/tests/eventscripts/13.per_ip_routing.011.sh
index a02c2273f88596c7e9fafe161224cd0bae52d662..8d96c8df6585b59adea2782468f23f799db51d34 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.011.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.011.sh
@@ -7,7 +7,9 @@ define_test "__auto_link_local__, takeip all on node"
 setup
 
 # do link local fu instead of creating configuration
+setup_script_options <<EOF
 CTDB_PER_IP_ROUTING_CONF="__auto_link_local__"
+EOF
 
 # add routes for all addresses
 ctdb_get_my_public_addresses |

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.021.sh b/ctdb/tests/eventscripts/13.per_ip_routing.021.sh
index f579b7315e4e35b4dbadbb8ea3c0b1680df75cb6..876b600cb21be071e0c1ba467adffb3036b938e8 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.021.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.021.sh
@@ -6,8 +6,10 @@ define_test "Invalid table ID range - includes system tables"
 
 setup
 
+setup_script_options <<EOF
 CTDB_PER_IP_ROUTING_TABLE_ID_LOW=100
 CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=500
+EOF
 
 required_result 1 "error: range CTDB_PER_IP_ROUTING_TABLE_ID_LOW[${CTDB_PER_IP_ROUTING_TABLE_ID_LOW}]..CTDB_PER_IP_ROUTING_TABLE_ID_HIGH[${CTDB_PER_IP_ROUTING_TABLE_ID_HIGH}] must not include 253-255"
 simple_test_event "ipreallocated"

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.022.sh b/ctdb/tests/eventscripts/13.per_ip_routing.022.sh
index 5f3cc7fdcafdf7c4f09c302d935590155ed5c8e4..6f0638eaf8ef8623a60aca676129000561f8a9a1 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.022.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.022.sh
@@ -6,8 +6,10 @@ define_test "Invalid table ID range - reversed"
 
 setup
 
+setup_script_options <<EOF
 CTDB_PER_IP_ROUTING_TABLE_ID_LOW=9000
 CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=1000
+EOF
 
 required_result 1 "error: CTDB_PER_IP_ROUTING_TABLE_ID_LOW[${CTDB_PER_IP_ROUTING_TABLE_ID_LOW}] and/or CTDB_PER_IP_ROUTING_TABLE_ID_HIGH[${CTDB_PER_IP_ROUTING_TABLE_ID_HIGH}] improperly configured"
 simple_test_event "ipreallocated"

diff --git a/ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh b/ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh
index 991c6f00754f591f9b5a31f3cb732face34d7967..e57e91a50c2cc48dbf2913b2d270983de9036c82 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh
+++ b/ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh
@@ -4,10 +4,12 @@ setup ()
 
        service_name="per_ip_routing"
 
-       export CTDB_PER_IP_ROUTING_CONF="${CTDB_BASE}/policy_routing"
-       export CTDB_PER_IP_ROUTING_RULE_PREF=100
-       export CTDB_PER_IP_ROUTING_TABLE_ID_LOW=1000
-       export CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=2000
+       setup_script_options <<EOF
+CTDB_PER_IP_ROUTING_CONF="${CTDB_BASE}/policy_routing"
+CTDB_PER_IP_ROUTING_RULE_PREF=100
+CTDB_PER_IP_ROUTING_TABLE_ID_LOW=1000
+CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=2000
+EOF
 
        # Tests need to create and populate this file
        rm -f "$CTDB_PER_IP_ROUTING_CONF"