LU-2140 test: add fake nid with proper nettype

The fake nid should be added with proper nettype.

Signed-off-by: Niu Yawei <niu@whamcloud.com>
Change-Id: I490f80328d8210e8eca9ccd8484fa4d7717c7429
Reviewed-on: http://review.whamcloud.com/4247
Tested-by: Hudson
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Yu Jian <yujian@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 9b54ac3..1e2e598 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1706,7 +1706,8 @@ test_35a() { # bug 12459
        log "Set up a fake failnode for the MDS"
        FAKENID="127.0.0.2"
        local device=$(do_facet $SINGLEMDS "lctl get_param -n devices" | awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)
        log "Set up a fake failnode for the MDS"
        FAKENID="127.0.0.2"
        local device=$(do_facet $SINGLEMDS "lctl get_param -n devices" | awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)

-       do_facet mgs $LCTL conf_param ${device}.failover.node=$FAKENID || return 4
+       do_facet mgs "$LCTL conf_param ${device}.failover.node=" \
+               "$(h2$NETTYPE $FAKENID)" || return 4

 
        log "Wait for RECONNECT_INTERVAL seconds (10s)"
        sleep 10
 
        log "Wait for RECONNECT_INTERVAL seconds (10s)"
        sleep 10


@@ -1760,8 +1761,8 @@ test_35b() { # bug 18674
        FAKENID="127.0.0.2"
        local device=$(do_facet $SINGLEMDS "$LCTL get_param -n devices" | \
                        awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)
        FAKENID="127.0.0.2"
        local device=$(do_facet $SINGLEMDS "$LCTL get_param -n devices" | \
                        awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)

-       do_facet mgs "$LCTL conf_param ${device}.failover.node=$FAKENID" || \
-               return 1
+       do_facet mgs "$LCTL conf_param ${device}.failover.node=" \
+               "$(h2$NETTYPE $FAKENID)" || return 1

 
        local at_max_saved=0
        # adaptive timeouts may prevent seeing the issue
 
        local at_max_saved=0
        # adaptive timeouts may prevent seeing the issue