[LTP] [PATCH 1/4] tst_net.sh: Simplify ipver settings code

[LTP] [PATCH 1/4] tst_net.sh: Simplify ipver settings code

[Petr Vorel]

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 testcases/lib/tst_net.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh
index dc612a794..fd2eacf2f 100644
--- a/testcases/lib/tst_net.sh
+++ b/testcases/lib/tst_net.sh
@@ -29,11 +29,12 @@ TST_SETUP="tst_net_setup"
 
 # Blank for an IPV4 test; 6 for an IPV6 test.
 TST_IPV6=${TST_IPV6:-}
+ipver=${TST_IPV6:-4}
 
 tst_net_parse_args()
 {
 	case $1 in
-	6) TST_IPV6=6;;
+	6) TST_IPV6=6 ipver=6;;
 	*) $TST_PARSE_ARGS_CALLER "$1" "$2";;
 	esac
 }
@@ -68,7 +69,6 @@ tst_net_remote_tmpdir()
 
 tst_net_setup()
 {
-	ipver=${TST_IPV6:-4}
 	tst_net_remote_tmpdir
 	[ -n "$TST_SETUP_CALLER" ] && $TST_SETUP_CALLER
 }
@@ -79,7 +79,6 @@ fi
 
 if [ -n "$TST_USE_LEGACY_API" ]; then
 	tst_net_read_opts "$@"
-	ipver=${TST_IPV6:-4}
 fi
 
 # old vs. new API compatibility layer
-- 
2.16.3

[LTP] [PATCH 2/4] net: Allow to overwrite libraries getopts handlers

[Petr Vorel]

Network libraries recently started to use TST_OPTS and TST_PARSE_ARGS:
89a83d8a0 ("net/ipsec_lib.sh: Process getopts parameters with TST_OPTS
and TST_PARSE_ARGS")
ce920a5a4 "network/virt_lib.sh: Process getopts parameters with TST_OPTS
and TST_PARSE_ARGS"
5f088c3f4 ("nfs/nfs_lib.sh: Fix wrong getopts parameter handling")

This allows to test using these libs customize getopts.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Needed for rewriting into new API.
---
 testcases/network/nfs/nfs_stress/nfs_lib.sh        | 4 ++--
 testcases/network/stress/ipsec/ipsec_lib.sh        | 5 +++--
 testcases/network/tcp_fastopen/tcp_fastopen_run.sh | 4 ++--
 testcases/network/virt/virt_lib.sh                 | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/testcases/network/nfs/nfs_stress/nfs_lib.sh b/testcases/network/nfs/nfs_stress/nfs_lib.sh
index 5a3ad04bd..e378c5515 100644
--- a/testcases/network/nfs/nfs_stress/nfs_lib.sh
+++ b/testcases/network/nfs/nfs_stress/nfs_lib.sh
@@ -37,8 +37,8 @@ nfs_parse_args()
 	esac
 }
 
-TST_OPTS="hv:t:"
-TST_PARSE_ARGS=nfs_parse_args
+TST_OPTS="${TST_OPTS:-hv:t:}"
+TST_PARSE_ARGS="${TST_PARSE_ARGS:-nfs_parse_args}"
 
 TST_USE_LEGACY_API=1
 . tst_net.sh
diff --git a/testcases/network/stress/ipsec/ipsec_lib.sh b/testcases/network/stress/ipsec/ipsec_lib.sh
index 480fe064a..28a2de5e8 100644
--- a/testcases/network/stress/ipsec/ipsec_lib.sh
+++ b/testcases/network/stress/ipsec/ipsec_lib.sh
@@ -67,8 +67,9 @@ ipsec_lib_parse_args()
 	esac
 }
 
-TST_OPTS="hl:m:p:s:S:k:A:e:a:c:r:"
-TST_PARSE_ARGS=ipsec_lib_parse_args
+TST_OPTS="${TST_OPTS:-hl:m:p:s:S:k:A:e:a:c:r:}"
+TST_PARSE_ARGS="${TST_PARSE_ARGS:-ipsec_lib_parse_args}"
+
 TST_USE_LEGACY_API=1
 . tst_net.sh
 
diff --git a/testcases/network/tcp_fastopen/tcp_fastopen_run.sh b/testcases/network/tcp_fastopen/tcp_fastopen_run.sh
index 8d6aa8450..45219b95a 100755
--- a/testcases/network/tcp_fastopen/tcp_fastopen_run.sh
+++ b/testcases/network/tcp_fastopen/tcp_fastopen_run.sh
@@ -39,8 +39,8 @@ TST_TOTAL=1
 TCID="tcp_fastopen"
 TST_NEEDS_TMPDIR=1
 
-TST_OPTS="hr:n:R:"
-TST_PARSE_ARGS=tcp_fastopen_parse_args
+TST_OPTS="${TST_OPTS:-hr:n:R:}"
+TST_PARSE_ARGS="${TST_PARSE_ARGS:-tcp_fastopen_parse_args}"
 
 TST_USE_LEGACY_API=1
 . tst_net.sh
diff --git a/testcases/network/virt/virt_lib.sh b/testcases/network/virt/virt_lib.sh
index 00978a062..3523fb663 100644
--- a/testcases/network/virt/virt_lib.sh
+++ b/testcases/network/virt/virt_lib.sh
@@ -48,8 +48,8 @@ virt_lib_parse_args()
 	esac
 }
 
-TST_OPTS="hi:d:"
-TST_PARSE_ARGS=virt_lib_parse_args
+TST_OPTS="${TST_OPTS:-hi:d:}"
+TST_PARSE_ARGS="${TST_PARSE_ARGS:-virt_lib_parse_args}"
 
 TST_USE_LEGACY_API=1
 . tst_net.sh
-- 
2.16.3

[LTP] [PATCH 2/4] net: Allow to overwrite libraries getopts handlers

[Alexey Kodanev]

On 05/26/2018 02:15 PM, Petr Vorel wrote:
> Network libraries recently started to use TST_OPTS and TST_PARSE_ARGS:
> 89a83d8a0 ("net/ipsec_lib.sh: Process getopts parameters with TST_OPTS
> and TST_PARSE_ARGS")
> ce920a5a4 "network/virt_lib.sh: Process getopts parameters with TST_OPTS
> and TST_PARSE_ARGS"
> 5f088c3f4 ("nfs/nfs_lib.sh: Fix wrong getopts parameter handling")
> 
> This allows to test using these libs customize getopts.
> 
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> Needed for rewriting into new API.
> ---

...

> diff --git a/testcases/network/stress/ipsec/ipsec_lib.sh b/testcases/network/stress/ipsec/ipsec_lib.sh
> index 480fe064a..28a2de5e8 100644
> --- a/testcases/network/stress/ipsec/ipsec_lib.sh
> +++ b/testcases/network/stress/ipsec/ipsec_lib.sh
> @@ -67,8 +67,9 @@ ipsec_lib_parse_args()
>  	esac
>  }
>  
> -TST_OPTS="hl:m:p:s:S:k:A:e:a:c:r:"
> -TST_PARSE_ARGS=ipsec_lib_parse_args
> +TST_OPTS="${TST_OPTS:-hl:m:p:s:S:k:A:e:a:c:r:}"

So, to customize these options we would need to implement the original
library options as well or you are going to pass the rest of the options
to the library ipsec_lib_parse_args handler?

I think TST_OPTS should include the library ones and the new options
from the test.

It would be better to show the usage somewhere, i.e. when it is
really needed.

[LTP] [PATCH 2/4] net: Allow to overwrite libraries getopts handlers

[Petr Vorel]

Hi Alexey,

...
> > -TST_OPTS="hl:m:p:s:S:k:A:e:a:c:r:"
> > -TST_PARSE_ARGS=ipsec_lib_parse_args
> > +TST_OPTS="${TST_OPTS:-hl:m:p:s:S:k:A:e:a:c:r:}"

> So, to customize these options we would need to implement the original
> library options as well or you are going to pass the rest of the options
> to the library ipsec_lib_parse_args handler?

> I think TST_OPTS should include the library ones and the new options
> from the test.

> It would be better to show the usage somewhere, i.e. when it is
> really needed.
OK, I'll include this one in patchset, which migrate virt_lib.sh + ipsec_lib.sh into the
new API. I tried to introduce some changes before as the whole patch is going to be quite
big (due other bugs and the need to migrate virt_lib.sh and ipsec_lib.sh altogether.

My idea is if the test which uses any of virt_lib.sh or ipsec_lib.sh needs to change
getopts, it's it's responsibility to add these getopts.


Kind regards,
Petr

[LTP] [PATCH 3/4] net: Allow to skip additional getopts

[Petr Vorel]

Network libraries which use tst_test.sh allow to avoid setting their
additional getopts. With TST_NET_SKIP_PARSE_ARGS=1 only -6 from
tst_net.sh is handled (for both new and legacy API) and -h and -i from
tst_test.sh (for new API only).

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Not sure if this is useful. Meant for next commit.
---
 testcases/lib/tst_net.sh                           | 3 ++-
 testcases/lib/tst_test.sh                          | 2 +-
 testcases/network/nfs/nfs_stress/nfs_lib.sh        | 6 ++++--
 testcases/network/stress/ipsec/ipsec_lib.sh        | 6 ++++--
 testcases/network/tcp_fastopen/tcp_fastopen_run.sh | 6 ++++--
 testcases/network/virt/virt_lib.sh                 | 6 ++++--
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh
index fd2eacf2f..51d02c682 100644
--- a/testcases/lib/tst_net.sh
+++ b/testcases/lib/tst_net.sh
@@ -35,7 +35,8 @@ tst_net_parse_args()
 {
 	case $1 in
 	6) TST_IPV6=6 ipver=6;;
-	*) $TST_PARSE_ARGS_CALLER "$1" "$2";;
+	*) [ -z "$TST_NET_SKIP_PARSE_ARGS" -o "$1" = "i" -o "$1" = "h" ] && \
+		$TST_PARSE_ARGS_CALLER "$1" "$2";;
 	esac
 }
 
diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh
index 779383392..a3d238d88 100644
--- a/testcases/lib/tst_test.sh
+++ b/testcases/lib/tst_test.sh
@@ -255,7 +255,7 @@ tst_run()
 			OPTS|USAGE|PARSE_ARGS|POS_ARGS);;
 			NEEDS_ROOT|NEEDS_TMPDIR|NEEDS_DEVICE|DEVICE);;
 			NEEDS_CMDS|NEEDS_MODULE|MODPATH|DATAROOT);;
-			IPV6);;
+			IPV6|NET_SKIP_PARSE_ARGS);;
 			*) tst_res TWARN "Reserved variable TST_$tst_i used!";;
 			esac
 		done
diff --git a/testcases/network/nfs/nfs_stress/nfs_lib.sh b/testcases/network/nfs/nfs_stress/nfs_lib.sh
index e378c5515..846605ff5 100644
--- a/testcases/network/nfs/nfs_stress/nfs_lib.sh
+++ b/testcases/network/nfs/nfs_stress/nfs_lib.sh
@@ -37,8 +37,10 @@ nfs_parse_args()
 	esac
 }
 
-TST_OPTS="${TST_OPTS:-hv:t:}"
-TST_PARSE_ARGS="${TST_PARSE_ARGS:-nfs_parse_args}"
+if [ -z "$TST_NET_SKIP_PARSE_ARGS" ]; then
+	TST_OPTS="${TST_OPTS:-hv:t:}"
+	TST_PARSE_ARGS="${TST_PARSE_ARGS:-nfs_parse_args}"
+fi
 
 TST_USE_LEGACY_API=1
 . tst_net.sh
diff --git a/testcases/network/stress/ipsec/ipsec_lib.sh b/testcases/network/stress/ipsec/ipsec_lib.sh
index 28a2de5e8..78e36d043 100644
--- a/testcases/network/stress/ipsec/ipsec_lib.sh
+++ b/testcases/network/stress/ipsec/ipsec_lib.sh
@@ -67,8 +67,10 @@ ipsec_lib_parse_args()
 	esac
 }
 
-TST_OPTS="${TST_OPTS:-hl:m:p:s:S:k:A:e:a:c:r:}"
-TST_PARSE_ARGS="${TST_PARSE_ARGS:-ipsec_lib_parse_args}"
+if [ -z "$TST_NET_SKIP_PARSE_ARGS" ]; then
+	TST_OPTS="${TST_OPTS:-hl:m:p:s:S:k:A:e:a:c:r:}"
+	TST_PARSE_ARGS="${TST_PARSE_ARGS:-ipsec_lib_parse_args}"
+fi
 
 TST_USE_LEGACY_API=1
 . tst_net.sh
diff --git a/testcases/network/tcp_fastopen/tcp_fastopen_run.sh b/testcases/network/tcp_fastopen/tcp_fastopen_run.sh
index 45219b95a..4a28bff37 100755
--- a/testcases/network/tcp_fastopen/tcp_fastopen_run.sh
+++ b/testcases/network/tcp_fastopen/tcp_fastopen_run.sh
@@ -39,8 +39,10 @@ TST_TOTAL=1
 TCID="tcp_fastopen"
 TST_NEEDS_TMPDIR=1
 
-TST_OPTS="${TST_OPTS:-hr:n:R:}"
-TST_PARSE_ARGS="${TST_PARSE_ARGS:-tcp_fastopen_parse_args}"
+if [ -z "$TST_NET_SKIP_PARSE_ARGS" ]; then
+	TST_OPTS="${TST_OPTS:-hr:n:R:}"
+	TST_PARSE_ARGS="${TST_PARSE_ARGS:-tcp_fastopen_parse_args}"
+fi
 
 TST_USE_LEGACY_API=1
 . tst_net.sh
diff --git a/testcases/network/virt/virt_lib.sh b/testcases/network/virt/virt_lib.sh
index 3523fb663..0fc299e64 100644
--- a/testcases/network/virt/virt_lib.sh
+++ b/testcases/network/virt/virt_lib.sh
@@ -48,8 +48,10 @@ virt_lib_parse_args()
 	esac
 }
 
-TST_OPTS="${TST_OPTS:-hi:d:}"
-TST_PARSE_ARGS="${TST_PARSE_ARGS:-virt_lib_parse_args}"
+if [ -z "$TST_NET_SKIP_PARSE_ARGS" ]; then
+	TST_OPTS="${TST_OPTS:-hi:d:}"
+	TST_PARSE_ARGS="${TST_PARSE_ARGS:-virt_lib_parse_args}"
+fi
 
 TST_USE_LEGACY_API=1
 . tst_net.sh
-- 
2.16.3

[LTP] [PATCH 4/4] net/macsec0{1, 2}.sh: Use TST_NET_SKIP_PARSE_ARGS=1

[Petr Vorel]

These tests load ipsec_lib.sh and virt_lib.sh.
Currently tst_net.sh doesn't support being used by more libraries, so
when handling getopts the later one wins.
Disabling variables as they aren't used in the runtest file.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Alexey, do you use library variables for debugging?
Or would you prefer to be without this and to have at least one
libraries getopts?


Kind regards,
Petr
---
 testcases/network/virt/macsec01.sh | 1 +
 testcases/network/virt/macsec02.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/testcases/network/virt/macsec01.sh b/testcases/network/virt/macsec01.sh
index 52d6f071a..ddcd4b41c 100755
--- a/testcases/network/virt/macsec01.sh
+++ b/testcases/network/virt/macsec01.sh
@@ -24,6 +24,7 @@ TST_NEEDS_TMPDIR=1
 
 virt_type="macsec"
 VIRT_PERF_THRESHOLD=${VIRT_PERF_THRESHOLD:-100}
+TST_NET_SKIP_PARSE_ARGS=1
 
 . ipsec_lib.sh
 . virt_lib.sh
diff --git a/testcases/network/virt/macsec02.sh b/testcases/network/virt/macsec02.sh
index 617860d41..215973bee 100755
--- a/testcases/network/virt/macsec02.sh
+++ b/testcases/network/virt/macsec02.sh
@@ -24,6 +24,7 @@ TST_NEEDS_TMPDIR=1
 
 virt_type="macsec"
 VIRT_PERF_THRESHOLD=${VIRT_PERF_THRESHOLD:-100}
+TST_NET_SKIP_PARSE_ARGS=1
 
 . ipsec_lib.sh
 . virt_lib.sh
-- 
2.16.3

[LTP] [PATCH 4/4] net/macsec0{1, 2}.sh: Use TST_NET_SKIP_PARSE_ARGS=1

[Alexey Kodanev]

On 05/26/2018 02:15 PM, Petr Vorel wrote:
> These tests load ipsec_lib.sh and virt_lib.sh.
> Currently tst_net.sh doesn't support being used by more libraries, so
> when handling getopts the later one wins.
> Disabling variables as they aren't used in the runtest file.
> 
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> Alexey, do you use library variables for debugging?
> Or would you prefer to be without this and to have at least one
> libraries getopts?
> 


I'm for keeping the IPsec options in macsec test, some of them are not
explicitly defined in the test, therefore can be changed.

For virt_lib.sh library the better fix would be to define the options
only for vxlan/geneve tests, because only those tests are currently
using them.

[LTP] [PATCH 4/4] net/macsec0{1, 2}.sh: Use TST_NET_SKIP_PARSE_ARGS=1

[Petr Vorel]

Hi Alexey,

> On 05/26/2018 02:15 PM, Petr Vorel wrote:
> > These tests load ipsec_lib.sh and virt_lib.sh.
> > Currently tst_net.sh doesn't support being used by more libraries, so
> > when handling getopts the later one wins.
> > Disabling variables as they aren't used in the runtest file.

> > Signed-off-by: Petr Vorel <pvorel@suse.cz>
> > ---
> > Alexey, do you use library variables for debugging?
> > Or would you prefer to be without this and to have at least one
> > libraries getopts?



> I'm for keeping the IPsec options in macsec test, some of them are not
> explicitly defined in the test, therefore can be changed.
OK, thanks for info.

> For virt_lib.sh library the better fix would be to define the options
> only for vxlan/geneve tests, because only those tests are currently
> using them.
Could you please make this change?


Kind regards,
Petr

[LTP] [PATCH 1/4] tst_net.sh: Simplify ipver settings code

[Alexey Kodanev]

On 05/26/2018 02:15 PM, Petr Vorel wrote:
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
>  testcases/lib/tst_net.sh | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh
> index dc612a794..fd2eacf2f 100644
> --- a/testcases/lib/tst_net.sh
> +++ b/testcases/lib/tst_net.sh
> @@ -29,11 +29,12 @@ TST_SETUP="tst_net_setup"
>  
>  # Blank for an IPV4 test; 6 for an IPV6 test.
>  TST_IPV6=${TST_IPV6:-}
> +ipver=${TST_IPV6:-4}

Hi Petr,

Perhaps, we need a prefix TST_.

Shouldn't the same patch remove the setting of 'ipver' in the tests?

Thanks,
Alexey

[LTP] [PATCH 1/4] tst_net.sh: Simplify ipver settings code

[Petr Vorel]

Hi Alexey,

> On 05/26/2018 02:15 PM, Petr Vorel wrote:
> > Signed-off-by: Petr Vorel <pvorel@suse.cz>
> > ---
> >  testcases/lib/tst_net.sh | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)

> > diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh
> > index dc612a794..fd2eacf2f 100644
> > --- a/testcases/lib/tst_net.sh
> > +++ b/testcases/lib/tst_net.sh
> > @@ -29,11 +29,12 @@ TST_SETUP="tst_net_setup"

> >  # Blank for an IPV4 test; 6 for an IPV6 test.
> >  TST_IPV6=${TST_IPV6:-}
> > +ipver=${TST_IPV6:-4}

> Hi Petr,

> Perhaps, we need a prefix TST_.

> Shouldn't the same patch remove the setting of 'ipver' in the tests?
Thanks for comments, both makes sense. I wanted to do it after migrating everything to new
API, but probably better to do it before.

> Thanks,
> Alexey


Kind regards,
Petr