Commit c540ca01 authored by Ed Rodriguez's avatar Ed Rodriguez Committed by Jim Harris
Browse files

test: nvmf host test script modifications to support fc hardware 



  This problem was discovered after an lpfc card was installed
  in one of our CIT tetbeds. When an lpfc card is installed the
  modprobe call in identify_kernel_nvmf.sh will load lpfc
  as a side effect of loading nvmet. When this happens, you
  can't unload nvmet until lpfc is unloaded.

Change-Id: I2cf63ea7d20b7dc15d73c7a8c8502fb05bef29f8
Signed-off-by: default avatarJohn Meneghini <johnm@netapp.com>
Reviewed-on: https://review.gerrithub.io/405518


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent cdaf4fd9

test/nvmf/host/identify_kernel_nvmf.sh

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ subsystemname=nqn.2016-06.io.spdk:testnqn 
modprobe null_blk nr_devices=1

modprobe nvmet

modprobe nvmet-rdma

modprobe nvmet-fc

modprobe lpfc



if [ ! -d /sys/kernel/config/nvmet/subsystems/$subsystemname ]; then

	mkdir /sys/kernel/config/nvmet/subsystems/$subsystemname
@@ -63,6 +65,8 @@ rmdir --ignore-fail-on-non-empty /sys/kernel/config/nvmet/subsystems/$subsystemn 
rmdir --ignore-fail-on-non-empty /sys/kernel/config/nvmet/subsystems/$subsystemname

rmdir --ignore-fail-on-non-empty /sys/kernel/config/nvmet/ports/1



rmmod lpfc

rmmod nvmet_fc

rmmod nvmet-rdma

rmmod null_blk

rmmod nvmet