[LTP] [PATCH v2 1/2] tst_net.sh: Allow test to force netns

[Petr Vorel]

Add $TST_NET_FORCE_NETNS variable for tests which test network
namespaces therefore they should not use as rhost the real 2nd host
configured when using 2 hosts setup.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
New in v2 to fix chicken and egg problem pointed out the agent.

 testcases/lib/tst_net.sh  | 7 +++++++
 testcases/lib/tst_test.sh | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh
index 4e7fc26fa0..7b7656dae0 100644
--- a/testcases/lib/tst_net.sh
+++ b/testcases/lib/tst_net.sh
@@ -1144,6 +1144,13 @@ tst_net_detect_ipv6
 
 [ -n "$TST_NET_SKIP_VARIABLE_INIT" ] && return 0
 
+
+# Force use of nested net namespace
+if [ "$TST_NET_FORCE_NETNS" = 1 ]; then
+	unset IPV4_LHOST IPV4_RHOST IPV6_LHOST IPV6_RHOST LHOST_HWADDRS \
+		LHOST_IFACES RHOST RHOST_HWADDRS RHOST_IFACES
+fi
+
 # Management Link
 [ -z "$RHOST" ] && TST_USE_NETNS="yes"
 export RHOST="$RHOST"
diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh
index b3e7e29bbf..f83b096a27 100644
--- a/testcases/lib/tst_test.sh
+++ b/testcases/lib/tst_test.sh
@@ -699,7 +699,7 @@ tst_run()
 			CHECKPOINT_WAKE2|CHECKPOINT_WAKE_AND_WAIT);;
 			DEV_EXTRA_OPTS|DEV_FS_OPTS|FORMAT_DEVICE|MOUNT_DEVICE);;
 			SKIP_FILESYSTEMS|SKIP_IN_LOCKDOWN|SKIP_IN_SECUREBOOT);;
-			DEVICE_SIZE|USR_UID|USR_GID);;
+			DEVICE_SIZE|USR_UID|USR_GID|NET_FORCE_NETNS);;
 			*) tst_res TWARN "Reserved variable TST_$_tst_i used!";;
 			esac
 		done
-- 
2.56.0