From: Martin Schwenke <martin@meltin.net>
Date: Tue, 20 Oct 2015 01:28:16 +0000 (+1100)
Subject: ctdb-tests: Change "ctdb ip -n all" to "ctdb ip all"
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=f7c414d4c972d388c8281f7306636db85d9fa1c4;p=obnox%2Fsamba%2Fsamba-obnox.git

ctdb-tests: Change "ctdb ip -n all" to "ctdb ip all"

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

diff --git a/ctdb/tests/complex/18_ctdb_reloadips.sh b/ctdb/tests/complex/18_ctdb_reloadips.sh
index 71f997cda56..9a408353901 100755
--- a/ctdb/tests/complex/18_ctdb_reloadips.sh
+++ b/ctdb/tests/complex/18_ctdb_reloadips.sh
@@ -46,11 +46,11 @@ select_test_node_and_ips
 # The initial search is for a 10.B.0.0/16 network since some
 # configurations may use a whole class B for the private network.
 # Check that there are no public IP addresses (as reported by "ctdb ip
-# -n -all") or other IP addresses (as reported by "ip addr show") with
+# all") or other IP addresses (as reported by "ip addr show") with
 # the provided prefix.  Note that this is an IPv4-specific test.
 
 echo "Getting public IP information from CTDB..."
-try_command_on_node any "$CTDB ip -X -v -n all"
+try_command_on_node any "$CTDB ip -X -v all"
 ctdb_ip_info=$(echo "$out" | awk -F'|' 'NR > 1 { print $2, $3, $5 }')
 
 echo "Getting IP information from interfaces..."
@@ -70,7 +70,7 @@ for b in $(seq 0 255) ; do
 	fi
     done <<<"$ip_addr_info"
 
-    # Does the prefix match any public IP address "ctdb ip -n all"?
+    # Does the prefix match any public IP address "ctdb ip all"?
     while read ip pnn iface ; do
 	if [ "${ip#${prefix}.}" != "$ip" ] ; then
 	    prefix=""
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index a4d1de64085..e3fb3d4e1c7 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -169,7 +169,7 @@ all_ips_on_node()
 _select_test_node_and_ips ()
 {
     try_command_on_node any \
-	"$CTDB ip -X -n all | awk -F'|' 'NR > 1 { print \$2, \$3 }'"
+	"$CTDB ip -X all | awk -F'|' 'NR > 1 { print \$2, \$3 }'"
 
     test_node=""  # this matches no PNN
     test_node_ips=""
diff --git a/ctdb/tests/simple/11_ctdb_ip.sh b/ctdb/tests/simple/11_ctdb_ip.sh
index 0e02b5e8171..8bca2c608c5 100755
--- a/ctdb/tests/simple/11_ctdb_ip.sh
+++ b/ctdb/tests/simple/11_ctdb_ip.sh
@@ -32,7 +32,7 @@ set -e
 cluster_is_healthy
 
 echo "Getting list of public IPs..."
-try_command_on_node -v 1 "$CTDB ip -n all | tail -n +2"
+try_command_on_node -v 1 "$CTDB ip all | tail -n +2"
 ips=$(echo "$out" | sed \
 	-e 's@ node\[@ @' \
 	-e 's@\].*$@@')
@@ -55,7 +55,7 @@ fi
 
 [ "$testfailures" != 1 ] && echo "Looks good!"
 
-cmd="$CTDB -X ip -n all | tail -n +2"
+cmd="$CTDB -X ip all | tail -n +2"
 echo "Checking that \"$cmd\" produces expected output..."
 
 try_command_on_node 1 "$cmd"
diff --git a/ctdb/tests/simple/20_delip_iface_gc.sh b/ctdb/tests/simple/20_delip_iface_gc.sh
index 83de49595ab..23d1d6babfd 100755
--- a/ctdb/tests/simple/20_delip_iface_gc.sh
+++ b/ctdb/tests/simple/20_delip_iface_gc.sh
@@ -19,7 +19,7 @@ cluster_is_healthy
 ctdb_restart_when_done
 
 echo "Getting public IPs information..."
-try_command_on_node -v any "$CTDB ip -v -n all -X | tail -n +2"
+try_command_on_node -v any "$CTDB ip -v all -X | tail -n +2"
 ip_info="$out"
 
 # Select the first node and find out its interfaces