[1/2] lib/tst_net.sh: don't init ltp_ns if custom is used

Message ID 1523549352-1794-1-git-send-email-alexey.kodanev@oracle.com
State Accepted
Delegated to: Alexey Kodanev
Headers show
Series
  • [1/2] lib/tst_net.sh: don't init ltp_ns if custom is used
Related show

Commit Message

Alexey Kodanev April 12, 2018, 4:09 p.m.
We can define our own LTP_NETNS with custom setup, don't setup
the default one in that particular case.

Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
---
 testcases/lib/tst_net.sh |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Comments

Alexey Kodanev April 12, 2018, 4:45 p.m. | #1
On 12.04.2018 19:09, Alexey Kodanev wrote:
> We can define our own LTP_NETNS with custom setup, don't setup
> the default one in that particular case.
> 
...
> -	if [ ! -f /var/run/netns/ltp_ns ]; then
> +	if [ ! -f /var/run/netns/ltp_ns -a -z "$LTP_NETNS" ]; then
>  		ROD ip li add name ltp_ns_veth1 type veth peer name ltp_ns_veth2
>  		pid="$(ROD ns_create net,mnt)"
>  		mkdir -p /var/run/netns
> @@ -112,6 +112,8 @@ init_ltp_netspace()
>  		ROD ns_exec $pid net,mnt mount -t sysfs none /sys
>  		ROD ns_ifmove ltp_ns_veth1 $pid
>  		ROD ns_exec $pid net,mnt ip li set lo up
> +	else

It should have been 'elif [ -n "$LTP_NETNS" ] ...' here instead.
Otherwise the info will be printed if "/var/run/netns/ltp_ns"
already exists.

> +		tst_res_ TINFO "using not default LTP netns: '$LTP_NETNS'"
>  	fi
>  
>  	LHOST_IFACES="${LHOST_IFACES:-ltp_ns_veth2}"
>
Alexey Kodanev April 19, 2018, 1:32 p.m. | #2
On 04/12/2018 07:45 PM, Alexey Kodanev wrote:
...
>> -	if [ ! -f /var/run/netns/ltp_ns ]; then
>> +	if [ ! -f /var/run/netns/ltp_ns -a -z "$LTP_NETNS" ]; then
>>  		ROD ip li add name ltp_ns_veth1 type veth peer name ltp_ns_veth2
>>  		pid="$(ROD ns_create net,mnt)"
>>  		mkdir -p /var/run/netns
>> @@ -112,6 +112,8 @@ init_ltp_netspace()
>>  		ROD ns_exec $pid net,mnt mount -t sysfs none /sys
>>  		ROD ns_ifmove ltp_ns_veth1 $pid
>>  		ROD ns_exec $pid net,mnt ip li set lo up
>> +	else
> 
> It should have been 'elif [ -n "$LTP_NETNS" ] ...' here instead.
> Otherwise the info will be printed if "/var/run/netns/ltp_ns"
> already exists.
> 
>> +		tst_res_ TINFO "using not default LTP netns: '$LTP_NETNS'"
>>  	fi
>>  

Applied the patch series with the above changes.

Patch

diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh
index bbef12a..53f6277 100644
--- a/testcases/lib/tst_net.sh
+++ b/testcases/lib/tst_net.sh
@@ -103,7 +103,7 @@  init_ltp_netspace()
 
 	local pid=
 
-	if [ ! -f /var/run/netns/ltp_ns ]; then
+	if [ ! -f /var/run/netns/ltp_ns -a -z "$LTP_NETNS" ]; then
 		ROD ip li add name ltp_ns_veth1 type veth peer name ltp_ns_veth2
 		pid="$(ROD ns_create net,mnt)"
 		mkdir -p /var/run/netns
@@ -112,6 +112,8 @@  init_ltp_netspace()
 		ROD ns_exec $pid net,mnt mount -t sysfs none /sys
 		ROD ns_ifmove ltp_ns_veth1 $pid
 		ROD ns_exec $pid net,mnt ip li set lo up
+	else
+		tst_res_ TINFO "using not default LTP netns: '$LTP_NETNS'"
 	fi
 
 	LHOST_IFACES="${LHOST_IFACES:-ltp_ns_veth2}"