diff --git a/test-tool/test_preventallow_2_itnexuses.c b/test-tool/test_preventallow_2_itnexuses.c index 40cedf2..e7fa2d3 100644 --- a/test-tool/test_preventallow_2_itnexuses.c +++ b/test-tool/test_preventallow_2_itnexuses.c @@ -23,12 +23,13 @@ #include "scsi-lowlevel.h" #include "iscsi-support.h" #include "iscsi-test-cu.h" +#include "iscsi-multipath.h" void test_preventallow_2_itnexuses(void) { int ret; - struct scsi_device sd2; + struct scsi_device *sd2; CHECK_FOR_SBC; CHECK_FOR_REMOVABLE; @@ -59,24 +60,16 @@ test_preventallow_2_itnexuses(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Create a second connection to the target"); - memset(&sd2, 0, sizeof(sd2)); - sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd->iscsi_lun); - if (sd2.iscsi_ctx == NULL) { - logging(LOG_VERBOSE, "Failed to login to target"); - return; - } + ret = mpath_sd2_get_or_clone(sd, &sd2); + CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Try to eject the medium on the second connection"); - ret = startstopunit(&sd2, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd2, 0, 0, 0, 0, 1, 0, EXPECT_REMOVAL_PREVENTED); CU_ASSERT_EQUAL(ret, 0); - logging(LOG_VERBOSE, "Logout the second connection from target"); - iscsi_logout_sync(sd2.iscsi_ctx); - iscsi_destroy_context(sd2.iscsi_ctx); - - + mpath_sd2_put(sd2); logging(LOG_VERBOSE, "Clear PREVENT and load medium in case target failed"); logging(LOG_VERBOSE, "Test we can clear PREVENT flag");