nvme/rc: revert nvme-cli context tracking

This feature is not needed anymore, after fixing nvmet-fc. The nvmet
target code is able to handle parallel operations and doesn't crash
anymore. Furthermore, it can't prevent from discovery controller created
by the udev rules, so let's rip it out.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/rc b/tests/nvme/rc
index cdfc738d3aec154f5beb81a20468982ac4d4a253..dfc4c1ef19753e8a5fc98bad2c9e1ddf3a1599a8 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -189,57 +189,6 @@ _nvme_calc_rand_io_size() {
        echo "${io_size_kb}k"
 }
 
-_have_nvme_cli_context() {
-       # ignore all non-fc transports for now
-       if [[ "${nvme_trtype}" != "fc" ]] ||
-          ! nvme connect --help 2>&1 | grep -q -- '--context=<STR>' > /dev/null; then
-               return 1
-       fi
-       return 0
-}
-
-_setup_nvme_cli() {
-       local local_wwnn="${1}"
-       local local_wwpn="${2}"
-       local remote_wwnn="${3}"
-       local remote_wwpn="${4}"
-
-       if ! _have_nvme_cli_context; then
-               return
-       fi
-
-       mkdir -p /run/nvme
-       cat >> /run/nvme/blktests.json <<-EOF
-       [
-         {
-           "hostnqn": "${def_hostnqn}",
-           "hostid": "${def_hostid}",
-           "subsystems": [
-             {
-               "application": "blktests",
-               "nqn": "blktests-subsystem-1",
-               "ports": [
-                 {
-                   "transport": "fc",
-                   "traddr": "nn-${remote_wwnn}:pn-${remote_wwpn}",
-                   "host_traddr": "nn-${local_wwnn}:pn-${local_wwpn}"
-                 }
-               ]
-             }
-           ]
-         }
-       ]
-       EOF
-}
-
-_cleanup_nvme_cli() {
-       if ! _have_nvme_cli_context; then
-               return
-       fi
-
-       rm -f /run/nvme/blktests.json
-}
-
 _nvme_fcloop_add_rport() {
        local local_wwnn="$1"
        local local_wwpn="$2"
@@ -272,9 +221,6 @@ _setup_fcloop() {
        local remote_wwnn="${3:-$def_remote_wwnn}"
        local remote_wwpn="${4:-$def_remote_wwpn}"
 
-       _setup_nvme_cli "${local_wwnn}" "${local_wwpn}" \
-                       "${remote_wwnn}" "${remote_wwpn}"
-
        _nvme_fcloop_add_tport "${remote_wwnn}" "${remote_wwpn}"
        _nvme_fcloop_add_lport "${local_wwnn}" "${local_wwpn}"
        _nvme_fcloop_add_rport "${local_wwnn}" "${local_wwpn}" \
@@ -317,8 +263,6 @@ _cleanup_fcloop() {
        _nvme_fcloop_del_lport "${local_wwnn}" "${local_wwpn}"
        _nvme_fcloop_del_rport "${local_wwnn}" "${local_wwpn}" \
                               "${remote_wwnn}" "${remote_wwpn}"
-
-       _cleanup_nvme_cli
 }
 
 _cleanup_blkdev() {
@@ -544,9 +488,6 @@ _nvme_connect_subsys() {
        subsysnqn="$2"
 
        ARGS=(-t "${trtype}" -n "${subsysnqn}")
-       if _have_nvme_cli_context; then
-               ARGS+=(--context="blktests")
-       fi
        if [[ "${trtype}" == "fc" ]] ; then
                ARGS+=(-a "${traddr}" -w "${host_traddr}")
        elif [[ "${trtype}" != "loop" ]]; then
@@ -618,9 +559,6 @@ _nvme_discover() {
        ARGS=(-t "${trtype}")
        ARGS+=(--hostnqn="${def_hostnqn}")
        ARGS+=(--hostid="${def_hostid}")
-       if _have_nvme_cli_context; then
-               ARGS+=(--context="blktests")
-       fi
        if [[ "${trtype}" = "fc" ]]; then
                ARGS+=(-a "${traddr}" -w "${host_traddr}")
        elif [[ "${trtype}" != "loop" ]]; then