<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  </head>
  <body text="#000000" bgcolor="#FFFFFF">
    <p><font size="-1">I am really sorry but it happened again :( <br>
      </font></p>
    <p><font size="-1">please ignore this patch , hope it is last time </font><br>
    </p>
    <br>
    <div class="moz-cite-prefix">On 05/14/2018 12:37 PM, Anton
      Smorodskyi wrote:<br>
    </div>
    <blockquote type="cite"
      cite="mid:20180514103709.4632-1-asmorodskyi@suse.com">
      <pre wrap="">Besides all obvious changes for moving to new API,
also was done :
1. more generic variable names
2. add check for del command failure
---
 testcases/network/tcp_cmds/ipneigh/ipneigh01.sh | 64 ++++++++++++-------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/testcases/network/tcp_cmds/ipneigh/ipneigh01.sh b/testcases/network/tcp_cmds/ipneigh/ipneigh01.sh
index 9af3aa31e..da4c07402 100755
--- a/testcases/network/tcp_cmds/ipneigh/ipneigh01.sh
+++ b/testcases/network/tcp_cmds/ipneigh/ipneigh01.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# Copyright (c) 2018 SUSE Linux GmbH
 # Copyright (c) 2016 Oracle and/or its affiliates. All Rights Reserved.
 # Copyright (c) International Business Machines  Corp., 2000
 # This program is free software; you can redistribute it and/or
@@ -18,8 +19,8 @@
 
 TCID=ipneigh01
 NUMLOOPS=${NUMLOOPS:-50}
-TST_TOTAL=2
-TST_USE_LEGACY_API=1
+TST_TESTFUNC=do_test
+TST_CNT=2
 . tst_net.sh
 
 do_setup()
@@ -30,55 +31,52 @@ do_setup()
 
 do_test()
 {
-       local arp_show_cmd="$1"
-       local arp_del_cmd="$2"
+       local rhost=$(tst_ipaddr rhost)
+       case $1 in
+       1)
+               local show_cmd="ip neigh show"
+               local del_cmd="ip neigh del $rhost dev $(tst_iface)"
+       ;;
+       2)
+               if [ -n "$TST_IPV6" ] then
+                       tst_res TCONF "'arp cmd doesn't support IPv6, skipping test-case"
+               fi
+               local show_cmd="arp -a"
+               local del_cmd="arp -d $rhost"
+       ;;
+       esac
 
        local entry_name
        [ "$TST_IPV6" ] && entry_name="NDISC" || entry_name="ARP"
 
-       tst_resm TINFO "Stress auto-creation of $entry_name cache entry"
-       tst_resm TINFO "by pinging '$rhost' and deleting entry again"
-       tst_resm TINFO "with '$arp_del_cmd'"
+       tst_res TINFO "Stress auto-creation of $entry_name cache entry"
+       tst_res TINFO "by pinging '$rhost' and deleting entry again"
+       tst_res TINFO "with '$del_cmd'"
 
        for i in $(seq 1 $NUMLOOPS); do
 
                ping$TST_IPV6 -q -c1 $rhost > /dev/null
 
                local k
-               local ret=1
-               # wait for arp entry at least 3 seconds
                for k in $(seq 1 30); do
-                       $arp_show_cmd | grep -q $rhost
-                       if [ $? -eq 0 ]; then
-                               ret=0
-                               break;
+                       $show_cmd | grep -q $rhost
+                       if [ $? -ne 0 ]; then
+                               tst_brk TFAIL "$entry_name entry '$rhost' not listed"
                        fi
                        tst_sleep 100ms
                done
 
-               [ "$ret" -ne 0 ] && \
-                       tst_brkm TFAIL "$entry_name entry '$rhost' not listed"
+               $del_cmd
+               if [ $? -ne 0 ]; then
+                       tst_brk TFAIL "fail to delete entry"
+               fi
 
-               $arp_del_cmd
-
-               $arp_show_cmd | grep -q "${rhost}.*$(tst_hwaddr rhost)" && \
-                       tst_brkm TFAIL "'$arp_del_cmd' failed, entry has " \
+               $show_cmd | grep -q "${rhost}.*$(tst_hwaddr rhost)" && \
+                       tst_brk TFAIL "'$del_cmd' failed, entry has " \
                                       "$(tst_hwaddr rhost)' $i/$NUMLOOPS"
        done
 
-       tst_resm TPASS "verified adding/removing of $entry_name cache entry"
+       tst_res TPASS "verified adding/removing of $entry_name cache entry"
 }
 
-do_setup
-
-rhost=$(tst_ipaddr rhost)
-
-if [ -z "$TST_IPV6" ]; then
-       do_test "arp -a" "arp -d $rhost"
-else
-       tst_resm TCONF "'arp cmd doesn't support IPv6, skipping test-case"
-fi
-
-do_test "ip neigh show" "ip neigh del $rhost dev $(tst_iface)"
-
-tst_exit
+tst_run
\ No newline at end of file
</pre>
    </blockquote>
    <br>
    <pre class="moz-signature" cols="72">-- 
Anton Smorodskyi <a class="moz-txt-link-rfc2396E" href="mailto:asmorodskyi@suse.com"><asmorodskyi@suse.com></a>
QA Engineer
SUSE Linux GmbH, Maxfeldstr. 5, D-90409 Nürnberg
Tel: +49-911-74053-0; Fax: +49-911-7417755;  <a class="moz-txt-link-freetext" href="https://www.suse.com/">https://www.suse.com/</a>
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard,
Graham Norton, HRB 21284 (AG Nürnberg)
</pre>
  </body>
</html>