From: Kit Westneat <kit.westneat@gmail.com>
Date: Mon, 3 Nov 2014 03:32:39 +0000 (-0500)
Subject: LU-5842 tests: reduce time to run sanity-sec tests 13 and 14
X-Git-Tag: 2.6.90~34
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;ds=sidebyside;h=c071633f3ae1e2fe4d4231ee9bcdef0a006883f4;p=fs%2Flustre-release.git

LU-5842 tests: reduce time to run sanity-sec tests 13 and 14

For nodemap testing, instead of running through all possible IPs in
a NID range, just test a subset in order to verify functionality.

Signed-off-by: Kit Westneat <kit.westneat@gmail.com>
Change-Id: I4b3ec0b47b81b2d3b5ac6f4b716a13ab34c9a4c3
Reviewed-on: http://review.whamcloud.com/12532
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index eb005ff..b67ef95 100644
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -36,7 +36,7 @@ HOSTNAME_CHECKSUM=$(hostname | sum | awk '{ print $1 }')
 SUBNET_CHECKSUM=$(expr $HOSTNAME_CHECKSUM % 250 + 1)
 NODEMAP_COUNT=16
 NODEMAP_RANGE_COUNT=3
-NODEMAP_IPADDR_COUNT=30
+NODEMAP_IPADDR_LIST="1 10 64 128 200 250"
 NODEMAP_MAX_ID=128
 
 require_dsh_mds || exit 0
@@ -1096,7 +1096,7 @@ test_13() {
 	rc=0
 	for ((i = 0; i < NODEMAP_COUNT; i++)); do
 		for ((j = 0; j < NODEMAP_RANGE_COUNT; j++)); do
-			for ((k = 1; k < 253; k++)); do
+			for k in $NODEMAP_IPADDR_LIST; do
 				if ! test_nid $SUBNET_CHECKSUM.$i.$j.$k	\
 				       ${HOSTNAME_CHECKSUM}_${i}; then
 					rc=$((rc + 1))
@@ -1131,7 +1131,7 @@ test_14() {
 	rc=0
 	for ((i = 0; i < NODEMAP_COUNT; i++)); do
 		for ((j = 0; j < NODEMAP_RANGE_COUNT; j++)); do
-			for ((k = 1; k < 253; k++)); do
+			for k in $NODEMAP_IPADDR_LIST; do
 				if ! test_nid $SUBNET_CHECKSUM.$i.$j.$k \
 					default; then
 					rc=$((rc + 1))