Commit fc2854de authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

test/nvmf: Fix veth cleanup 



Change-Id: I91b1f2fe5dccd53286a9215814dc58131bd9e796
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24412


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 915dc5d6

test/nvmf/common.sh

+3 −2
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ function nvmf_veth_fini() { 
	ip link set $NVMF_TARGET_BRIDGE2 down

	ip link delete $NVMF_BRIDGE type bridge

	ip link delete $NVMF_INITIATOR_INTERFACE

	ip link delete $NVMF_INITIATOR_INTERFACE2

	"${NVMF_TARGET_NS_CMD[@]}" ip link delete $NVMF_TARGET_INTERFACE

	"${NVMF_TARGET_NS_CMD[@]}" ip link delete $NVMF_TARGET_INTERFACE2

	remove_spdk_ns
@@ -289,7 +290,7 @@ function nvmf_tcp_init() { 
}



function nvmf_tcp_fini() {

	if [[ "$NVMF_TARGET_NAMESPACE" == "nvmf_tgt_ns" ]]; then

	if [[ "$NVMF_TARGET_NAMESPACE" == "nvmf_tgt_ns_spdk" ]]; then

		nvmf_veth_fini

		return 0

	fi
@@ -620,7 +621,7 @@ function _remove_spdk_ns() { 
		# from its own ifindex.

		ns_net_devs=($(

			ip netns exec "$ns" bash <<- 'IN_NS'

				shopt -s extglob

				shopt -s extglob nullglob

				for dev in /sys/class/net/!(lo|bond*); do

					(($(< "$dev/ifindex") == $(< "$dev/iflink"))) || continue

					echo "${dev##*/}"