TESTS: move the default url, lun and iscsi context into a structure
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
@@ -66,7 +66,7 @@ test_sanitize_reset(void)
|
||||
data.data[1] = 0x00;
|
||||
data.data[2] = block_size >> 8;
|
||||
data.data[3] = block_size & 0xff;
|
||||
sanitize_task = iscsi_sanitize_task(iscsic, tgt_lun,
|
||||
sanitize_task = iscsi_sanitize_task(sd->iscsi_ctx, sd->iscsi_lun,
|
||||
0, 0, SCSI_SANITIZE_OVERWRITE,
|
||||
data.size, &data,
|
||||
sanitize_cb, NULL);
|
||||
@@ -74,7 +74,7 @@ test_sanitize_reset(void)
|
||||
/* just send something so that we know the sanitize command is sent
|
||||
* to the target
|
||||
*/
|
||||
rl_task = iscsi_reportluns_sync(iscsic, 0, 64);
|
||||
rl_task = iscsi_reportluns_sync(sd->iscsi_ctx, 0, 64);
|
||||
if (rl_task) {
|
||||
scsi_free_scsi_task(rl_task);
|
||||
}
|
||||
@@ -86,83 +86,83 @@ test_sanitize_reset(void)
|
||||
|
||||
logging(LOG_VERBOSE, "Verify that the SANITIZE has started and that "
|
||||
"TESTUNITREADY fails with SANITIZE_IN_PROGRESS");
|
||||
ret = testunitready(iscsic, tgt_lun,
|
||||
ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun,
|
||||
EXPECT_SANITIZE);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
logging(LOG_VERBOSE, "Verify that STARTSTOPUNIT fails with "
|
||||
"SANITIZE_IN_PROGRESS");
|
||||
ret = startstopunit(iscsic, tgt_lun, 1, 0, 1, 0, 1, 0,
|
||||
ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 1, 0, 1, 0, 1, 0,
|
||||
EXPECT_SANITIZE);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
logging(LOG_VERBOSE, "Verify that READ16 fails with "
|
||||
"SANITIZE_IN_PROGRESS");
|
||||
ret = read16(iscsic, tgt_lun, 0, block_size,
|
||||
ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size,
|
||||
block_size, 0, 0, 0, 0, 0, NULL,
|
||||
EXPECT_SANITIZE);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
logging(LOG_VERBOSE, "Verify that INQUIRY is still allowed while "
|
||||
"SANITIZE is in progress");
|
||||
ret = inquiry(iscsic, NULL, tgt_lun, 0, 0, 255,
|
||||
ret = inquiry(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 0, 255,
|
||||
EXPECT_STATUS_GOOD);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
|
||||
logging(LOG_VERBOSE, "Send an ABORT TASK");
|
||||
ret = iscsi_task_mgmt_abort_task_sync(iscsic, sanitize_task);
|
||||
ret = iscsi_task_mgmt_abort_task_sync(sd->iscsi_ctx, sanitize_task);
|
||||
if (ret != 0) {
|
||||
logging(LOG_NORMAL, "ABORT TASK failed. %s",
|
||||
iscsi_get_error(iscsic));
|
||||
iscsi_get_error(sd->iscsi_ctx));
|
||||
}
|
||||
|
||||
logging(LOG_VERBOSE, "Send an ABORT TASK SET");
|
||||
ret = iscsi_task_mgmt_abort_task_set_sync(iscsic, tgt_lun);
|
||||
ret = iscsi_task_mgmt_abort_task_set_sync(sd->iscsi_ctx, sd->iscsi_lun);
|
||||
if (ret != 0) {
|
||||
logging(LOG_NORMAL, "ABORT TASK SET failed. %s",
|
||||
iscsi_get_error(iscsic));
|
||||
iscsi_get_error(sd->iscsi_ctx));
|
||||
}
|
||||
|
||||
logging(LOG_VERBOSE, "Send a LUN Reset");
|
||||
ret = iscsi_task_mgmt_lun_reset_sync(iscsic, tgt_lun);
|
||||
ret = iscsi_task_mgmt_lun_reset_sync(sd->iscsi_ctx, sd->iscsi_lun);
|
||||
if (ret != 0) {
|
||||
logging(LOG_NORMAL, "LUN reset failed. %s", iscsi_get_error(iscsic));
|
||||
logging(LOG_NORMAL, "LUN reset failed. %s", iscsi_get_error(sd->iscsi_ctx));
|
||||
}
|
||||
|
||||
logging(LOG_VERBOSE, "Send a Warm Reset");
|
||||
ret = iscsi_task_mgmt_target_warm_reset_sync(iscsic);
|
||||
ret = iscsi_task_mgmt_target_warm_reset_sync(sd->iscsi_ctx);
|
||||
if (ret != 0) {
|
||||
logging(LOG_NORMAL, "Warm reset failed. %s", iscsi_get_error(iscsic));
|
||||
logging(LOG_NORMAL, "Warm reset failed. %s", iscsi_get_error(sd->iscsi_ctx));
|
||||
}
|
||||
|
||||
logging(LOG_VERBOSE, "Send a Cold Reset");
|
||||
ret = iscsi_task_mgmt_target_cold_reset_sync(iscsic);
|
||||
ret = iscsi_task_mgmt_target_cold_reset_sync(sd->iscsi_ctx);
|
||||
if (ret != 0) {
|
||||
logging(LOG_NORMAL, "Cold reset failed. %s", iscsi_get_error(iscsic));
|
||||
logging(LOG_NORMAL, "Cold reset failed. %s", iscsi_get_error(sd->iscsi_ctx));
|
||||
}
|
||||
|
||||
logging(LOG_VERBOSE, "Disconnect from the target.");
|
||||
iscsi_destroy_context(iscsic);
|
||||
iscsi_destroy_context(sd->iscsi_ctx);
|
||||
|
||||
logging(LOG_VERBOSE, "Sleep for one seconds incase the target is "
|
||||
"slow to reset");
|
||||
sleep(1);
|
||||
|
||||
logging(LOG_VERBOSE, "Reconnect to target");
|
||||
iscsic = iscsi_context_login(initiatorname1, tgt_url, &tgt_lun);
|
||||
if (iscsic == NULL) {
|
||||
sd->iscsi_ctx = iscsi_context_login(initiatorname1, sd->iscsi_url, &sd->iscsi_lun);
|
||||
if (sd->iscsi_ctx == NULL) {
|
||||
logging(LOG_VERBOSE, "Failed to login to target");
|
||||
return;
|
||||
}
|
||||
|
||||
logging(LOG_VERBOSE, "Verify that the SANITIZE is still going.");
|
||||
ret = testunitready(iscsic, tgt_lun,
|
||||
ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun,
|
||||
EXPECT_SANITIZE);
|
||||
CU_ASSERT_EQUAL(ret, 0);
|
||||
|
||||
logging(LOG_VERBOSE, "Wait until the SANITIZE operation has finished");
|
||||
while (testunitready_clear_ua(iscsic, tgt_lun)) {
|
||||
while (testunitready_clear_ua(sd->iscsi_ctx, sd->iscsi_lun)) {
|
||||
sleep(60);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user