smoke: use hw ports in grout namespace

Since commits 4d5fa1c and 4853d4d grout is running in it's own
namespace. When tests are using hardware ports we should ensure
that the ports are accessible from that namespace.

Signed-off-by: Roman Safronov <[email protected]>

Author: rsafrono

smoke/_init.sh

@@ -3,9 +3,27 @@
 
 set -e -o pipefail
 
+: "${use_hardware_ports:=false}"
+# Usage example
+# export NET_INTERFACES="eno12399v1 eno12409v1"
+# export VFIO_PCI_PORTS="0000:8a:01.0 0000:8a:11.0"
+if [ -n "$NET_INTERFACES" ] && [ -n "$VFIO_PCI_PORTS" ]; then
+	net_interfaces=($NET_INTERFACES)
+        vfio_pci_ports=($VFIO_PCI_PORTS)
+        if [ "${#net_interfaces[@]}" -ne "${#vfio_pci_ports[@]}" ]; then
+		echo "error: NET_INTERFACES and VFIO_PCI_PORTS must have equal length" >&2
+                exit 1
+	fi
+	use_hardware_ports=true
+fi
 if [ -z "$(ip netns identify)" ]; then
 	set -x
 	ip netns add grout 2>/dev/null || :
+	if [ $use_hardware_ports = true ]; then
+		for i in ${net_interfaces[@]}; do
+			ip link set $i netns grout
+		done
+	fi
 	exec ip netns exec grout "$0" "$@"
 fi
 
@@ -23,20 +41,6 @@ else
 	run_grout=true
 fi
 
-: "${use_hardware_ports:=false}"
-# Usage example
-# export NET_INTERFACES="eno12399v1 eno12409v1"
-# export VFIO_PCI_PORTS="0000:8a:01.0 0000:8a:11.0"
-if [ -n "$NET_INTERFACES" ] && [ -n "$VFIO_PCI_PORTS" ]; then
-	net_interfaces=($NET_INTERFACES)
-        vfio_pci_ports=($VFIO_PCI_PORTS)
-        if [ "${#net_interfaces[@]}" -ne "${#vfio_pci_ports[@]}" ]; then
-		echo "error: NET_INTERFACES and VFIO_PCI_PORTS must have equal length" >&2
-                exit 1
-	fi
-	use_hardware_ports=true
-fi
-
 cleanup() {
 	status="$?"
 	set +e
@@ -53,7 +57,7 @@ cleanup() {
 	while read -r name _; do
 		grcli interface del "$name"
 	done
-	[ -s $tmp/restore_interfaces ] && sh -x $tmp/restore_interfaces
+	[ -s $tmp/restore_interfaces ] && nsenter -t 1 -n sh -x $tmp/restore_interfaces
 
 	kill %?grcli
 	wait %?grcli