ctdb-tests: 13.per_ip_routing event script setup modularisation

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 8523c1010f127392e322947dbeffdd4381e54588..405ef4c2f781ca1e5a5f6d182e97b162e1ff5e29 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.001.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.001.sh
@@ -4,7 +4,9 @@
 
 define_test "not configured"
 
-setup_ctdb
+setup
+
+CTDB_PER_IP_ROUTING_CONF=""
 
 ok_null
 simple_test_event "takeip"

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.002.sh b/ctdb/tests/eventscripts/13.per_ip_routing.002.sh
index d6320c65d894962f53db714953493aec7f992eb0..6925983bafad2a840528c1c4ebf448e835a3eee9 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.002.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.002.sh
@@ -4,8 +4,7 @@
 
 define_test "missing config file"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 # Error because policy routing is configured but the configuration
 # file is missing.

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.003.sh b/ctdb/tests/eventscripts/13.per_ip_routing.003.sh
index bb2c4b70fb2548f5ca125663668d412ad51df004..4eac9635ce6e3afa99fa384dbe963a547b9ec7e8 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.003.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.003.sh
@@ -4,8 +4,7 @@
 
 define_test "empty config, ipreallocated"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 create_policy_routing_config 0
 

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.004.sh b/ctdb/tests/eventscripts/13.per_ip_routing.004.sh
index 4595313b715e5a58ae16de42a259d4feabaa25cd..3724de04cbeb0ed47dd101b671e99b6c40658c22 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.004.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.004.sh
@@ -4,8 +4,7 @@
 
 define_test "empty config, takeip"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 create_policy_routing_config 0
 

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.005.sh b/ctdb/tests/eventscripts/13.per_ip_routing.005.sh
index 9495cc54ce7690d04100a3c8750928e3a9ceb281..baafbbb8141166c080865b976f5f4241fa6661a0 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.005.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.005.sh
@@ -4,8 +4,7 @@
 
 define_test "1 IP configured, takeip"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 # Configuration for 1 IP
 create_policy_routing_config 1 default

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.006.sh b/ctdb/tests/eventscripts/13.per_ip_routing.006.sh
index b93b6cdea1e422c9bd3ee0c4fa5029c900eea60c..6c4d6862d5817d1f90a065228c48bb6bc492d12a 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.006.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.006.sh
@@ -4,8 +4,7 @@
 
 define_test "1 IP configured, takeip, releaseip"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 # create config for 1 IP
 create_policy_routing_config 1 default

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.007.sh b/ctdb/tests/eventscripts/13.per_ip_routing.007.sh
index 096bc96d99697e7db1eddbefc7c5d10b64a39576..4cf46e6e543940282f293cd0ac400e7930779496 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.007.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.007.sh
@@ -4,8 +4,7 @@
 
 define_test "1 IP configured, ipreallocated"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 # create config for 1 IP
 create_policy_routing_config 1 default

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.008.sh b/ctdb/tests/eventscripts/13.per_ip_routing.008.sh
index 9bb0c195fddd5cccd06e09507ec8d6bac31513a5..889b4c4a7b6a77f85967f618e5dc885d07c9327b 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.008.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.008.sh
@@ -4,8 +4,7 @@
 
 define_test "1 IP configured, takeip twice"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 # create config for 1 IP
 create_policy_routing_config 1 default

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.009.sh b/ctdb/tests/eventscripts/13.per_ip_routing.009.sh
index cbea1ade61cf96f0cc2c9741db9c4f19e7720110..c887febab3cbeda1939abe7faa8da69a04a6df87 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.009.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.009.sh
@@ -4,8 +4,7 @@
 
 define_test "All IPs configured, takeip 1 address"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 # configure all addresses
 create_policy_routing_config all default

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.010.sh b/ctdb/tests/eventscripts/13.per_ip_routing.010.sh
index d11585ec51068851af12d1c8b6fad6ea3642de6d..7297f96402f8d1f3f9485dd7febbf31602e26ca9 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.010.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.010.sh
@@ -4,8 +4,7 @@
 
 define_test "All IPs configured, takeip on all nodes"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 # create config for all IPs
 create_policy_routing_config all default

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.011.sh b/ctdb/tests/eventscripts/13.per_ip_routing.011.sh
index d8ec9ac2106c952470f2e4d0b501c19a1d80880e..a02c2273f88596c7e9fafe161224cd0bae52d662 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.011.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.011.sh
@@ -4,11 +4,10 @@
 
 define_test "__auto_link_local__, takeip all on node"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 # do link local fu instead of creating configuration
-export CTDB_PER_IP_ROUTING_CONF="__auto_link_local__"
+CTDB_PER_IP_ROUTING_CONF="__auto_link_local__"
 
 # add routes for all addresses
 ctdb_get_my_public_addresses |

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.012.sh b/ctdb/tests/eventscripts/13.per_ip_routing.012.sh
index 6c8a6ab4b33b289b74c1085cd10012d416e4d787..48aab217d63d0d96ffdbbe74ec4c50a0cdf12fb6 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.012.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.012.sh
@@ -8,8 +8,7 @@ define_test "1 IP configured, takeip, releaseip, ipreallocated"
 # moveip" doesn't do anything then the IP being released will still be
 # on the node and the ipreallocated event will add the routes back.
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 create_policy_routing_config 1 default
 

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.013.sh b/ctdb/tests/eventscripts/13.per_ip_routing.013.sh
index 567622edd93aae911c4fcc91293f6abf677b5792..226208323b04508438324cc574ed2e5537202e3b 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.013.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.013.sh
@@ -4,8 +4,7 @@
 
 define_test "1 IP configured, releaseip of unassigned"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 create_policy_routing_config 1 default
 

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.014.sh b/ctdb/tests/eventscripts/13.per_ip_routing.014.sh
index ee08c36fa322761cb235279031d55a7f43fae609..a63e134958b7743873af7874a6a74ad3da09abae 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.014.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.014.sh
@@ -7,8 +7,7 @@ define_test "1 IP configured, takeip, moveip, ipreallocated"
 # We move the IP to another node but don't run releaseip.
 # ipreallocated should remove the bogus routes.
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 create_policy_routing_config 1 default
 

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.015.sh b/ctdb/tests/eventscripts/13.per_ip_routing.015.sh
index 2b9ecba05345af5a6d0498463fbb802fb5e5bb0e..742cfd436d7a585547dc256e6ac50ab6d3fc5e37 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.015.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.015.sh
@@ -4,8 +4,7 @@
 
 define_test "1 IP configured, releaseip of unassigned"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 export IP_ROUTE_BAD_TABLE_ID=true
 

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.016.sh b/ctdb/tests/eventscripts/13.per_ip_routing.016.sh
index 85320b65487fd29603b37dcc04d3f265c5b6e5dd..4856ba55c5387cc2ca92dd836b0cd4bcc3ef3fb4 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.016.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.016.sh
@@ -4,8 +4,7 @@
 
 define_test "empty config, reconfigure, NOOP"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 create_policy_routing_config 0
 

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.017.sh b/ctdb/tests/eventscripts/13.per_ip_routing.017.sh
index 8870015501f2a829d0ad13da4a7fd0ec4b7fbac6..d26ab9c0c710ff25b9161e67b721d715306a2aa4 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.017.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.017.sh
@@ -4,8 +4,7 @@
 
 define_test "1 IP configured, reconfigure"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 create_policy_routing_config 1 default
 

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.018.sh b/ctdb/tests/eventscripts/13.per_ip_routing.018.sh
index ce919890c0b60bc7fd4657e371d5d23d357a91cf..4d89dc22e2620ee2c221be13b37c2a95ce440f52 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.018.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.018.sh
@@ -4,8 +4,7 @@
 
 define_test "1 IP configured, ipreallocated, more routes, reconfigure"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 create_policy_routing_config 1
 

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.019.sh b/ctdb/tests/eventscripts/13.per_ip_routing.019.sh
index 072c929d8b4f719bd9e4c315101de02a7bc490da..757546632f62b463e0c6a0065bc28142d460edc5 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.019.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.019.sh
@@ -4,8 +4,7 @@
 
 define_test "1 IP configured, ipreallocated, less routes, reconfigure"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 create_policy_routing_config 1 default
 

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.021.sh b/ctdb/tests/eventscripts/13.per_ip_routing.021.sh
index 609ecadb0630e3fd0354b50b6b3b612287bb8f94..f579b7315e4e35b4dbadbb8ea3c0b1680df75cb6 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.021.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.021.sh
@@ -4,8 +4,7 @@
 
 define_test "Invalid table ID range - includes system tables"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 CTDB_PER_IP_ROUTING_TABLE_ID_LOW=100
 CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=500

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.022.sh b/ctdb/tests/eventscripts/13.per_ip_routing.022.sh
index 28997e3e6cf5f7a2e7e0601cf0c4754328885326..5f3cc7fdcafdf7c4f09c302d935590155ed5c8e4 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.022.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.022.sh
@@ -4,8 +4,7 @@
 
 define_test "Invalid table ID range - reversed"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 CTDB_PER_IP_ROUTING_TABLE_ID_LOW=9000
 CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=1000

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.023.sh b/ctdb/tests/eventscripts/13.per_ip_routing.023.sh
index 336e129d762efa73eab545632a19479b2697ba41..a94b58bcee00ffee21cad2c4e423c4c50283e9d0 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.023.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.023.sh
@@ -4,8 +4,7 @@
 
 define_test "1 IP configured, broken configuration, takeip"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 # Configuration for 1 IP
 create_policy_routing_config 1 default

diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.024.sh b/ctdb/tests/eventscripts/13.per_ip_routing.024.sh
index 7daacbb70fea8b82a7fac8b2a285430c625daf22..61a9b52cb79479e228baa2d99a644a97efa7ced9 100755 (executable)
--- a/ctdb/tests/eventscripts/13.per_ip_routing.024.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.024.sh
@@ -4,8 +4,7 @@
 
 define_test "Single IP, restores original rt_tables"
 
-setup_ctdb
-setup_ctdb_policy_routing
+setup
 
 create_policy_routing_config 1 default
 

diff --git a/ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh b/ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh
index 557fcb67c8304fb3937b53994a90621bde5e9515..991c6f00754f591f9b5a31f3cb732face34d7967 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh
+++ b/ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh
@@ -1,8 +1,10 @@
-setup_ctdb_policy_routing ()
+setup ()
 {
+       setup_public_addresses
+
        service_name="per_ip_routing"
 
-       export CTDB_PER_IP_ROUTING_CONF="$CTDB_BASE/policy_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