admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

TESTS: WRITEVERIFY10/12/16 are all optional.

Browse Source 
Update the helpers to return -2/not supported on invalid operaction code.
Update all tests to accept that the opcode might be missing and abort the test without failing.
This commit is contained in:
Ronnie Sahlberg
2013-04-25 17:41:13 -07:00
parent b5804ee499
commit e33194d94a
18 changed files with 194 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
test-tool/iscsi-support.c
View File

@@ -4692,6 +4692,13 @@ writeverify10(struct iscsi_context *iscsi, int lun, uint32_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
return -2;
}
if (task->status != SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY10 command: "
"failed with sense. %s", iscsi_get_error(iscsi));
@@ -4730,6 +4737,13 @@ writeverify10_invalidfieldincdb(struct iscsi_context *iscsi, int lun, uint32_t l
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY10 successful but should "
"have failed with ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB");
@@ -4778,6 +4792,13 @@ writeverify10_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint32_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY10 successful but should "
"have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE");
@@ -4825,6 +4846,13 @@ writeverify10_writeprotected(struct iscsi_context *iscsi, int lun, uint32_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY10 successful but should "
"have failed with DATA_PROTECTION/WRITE_PROTECTED");
@@ -4873,6 +4901,13 @@ writeverify10_nomedium(struct iscsi_context *iscsi, int lun, uint32_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY10 successful but should "
"have failed with NOT_READY/MEDIUM_NOT_PRESENT*");
@@ -4922,6 +4957,13 @@ writeverify12(struct iscsi_context *iscsi, int lun, uint32_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
return -2;
}
if (task->status != SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY12 command: "
"failed with sense. %s", iscsi_get_error(iscsi));
@@ -4960,6 +5002,13 @@ writeverify12_invalidfieldincdb(struct iscsi_context *iscsi, int lun, uint32_t l
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY12 successful but should "
"have failed with ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB");
@@ -5008,6 +5057,13 @@ writeverify12_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint32_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY12 successful but should "
"have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE");
@@ -5055,6 +5111,13 @@ writeverify12_writeprotected(struct iscsi_context *iscsi, int lun, uint32_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY12 successful but should "
"have failed with DATA_PROTECTION/WRITE_PROTECTED");
@@ -5103,6 +5166,13 @@ writeverify12_nomedium(struct iscsi_context *iscsi, int lun, uint32_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY12 successful but should "
"have failed with NOT_READY/MEDIUM_NOT_PRESENT*");
@@ -5152,6 +5222,13 @@ writeverify16(struct iscsi_context *iscsi, int lun, uint64_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
return -2;
}
if (task->status != SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY16 command: "
"failed with sense. %s", iscsi_get_error(iscsi));
@@ -5190,6 +5267,13 @@ writeverify16_invalidfieldincdb(struct iscsi_context *iscsi, int lun, uint64_t l
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY16 successful but should "
"have failed with ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB");
@@ -5238,6 +5322,13 @@ writeverify16_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint64_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY16 successful but should "
"have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE");
@@ -5285,6 +5376,13 @@ writeverify16_writeprotected(struct iscsi_context *iscsi, int lun, uint64_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY16 successful but should "
"have failed with DATA_PROTECTION/WRITE_PROTECTED");
@@ -5333,6 +5431,13 @@ writeverify16_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba,
iscsi_get_error(iscsi));
return -1;
}
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
scsi_free_scsi_task(task);
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
return -2;
}
if (task->status == SCSI_STATUS_GOOD) {
logging(LOG_NORMAL, "[FAILED] WRITEVERIFY16 successful but should "
"have failed with NOT_READY/MEDIUM_NOT_PRESENT*");

5
test-tool/test_writeverify10_0blocks.c
View File

@@ -39,6 +39,11 @@ test_writeverify10_0blocks(void)
logging(LOG_VERBOSE, "Test WRITEVERIFY10 0-blocks at LBA==0");
ret = writeverify10(iscsic, tgt_lun, 0, 0, block_size,
0, 0, 0, 0, NULL);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
CU_PASS("WRITEVERIFY10 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITEVERIFY10 0-blocks one block past end-of-LUN");

5
test-tool/test_writeverify10_beyond_eol.c
View File

@@ -45,6 +45,11 @@ test_writeverify10_beyond_eol(void)
i * block_size, block_size,
0, 0, 0, 0, buf);
free(buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY10 is not implemented.");
CU_PASS("WRITEVERIFY10 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
}

5
test-tool/test_writeverify10_flags.c
View File

@@ -41,6 +41,11 @@ test_writeverify10_flags(void)
ret = writeverify10(iscsic, tgt_lun, 0,
block_size, block_size,
0, 1, 0, 0, buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
CU_PASS("WRITEVERIFY10 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITEVERIFY10 with BYTCHK==1");

7
test-tool/test_writeverify10_residuals.c
View File

@@ -74,6 +74,13 @@ test_writeverify10_residuals(void)
CU_ASSERT_PTR_NOT_NULL(task_ret);
CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
CU_PASS("WRITEVERIFY10 is not implemented.");
return;
}
logging(LOG_VERBOSE, "Verify that the target returned SUCCESS");
if (task->status != SCSI_STATUS_GOOD) {
logging(LOG_VERBOSE, "[FAILED] Target returned error %s",

5
test-tool/test_writeverify10_wrprotect.c
View File

@@ -44,6 +44,11 @@ test_writeverify10_wrprotect(void)
ret = writeverify10_invalidfieldincdb(iscsic, tgt_lun, 0,
block_size, block_size,
i, 0, 0, 0, buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY10 is not implemented.");
CU_PASS("WRITEVERIFY10 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
}
free(buf);

5
test-tool/test_writeverify12_0blocks.c
View File

@@ -39,6 +39,11 @@ test_writeverify12_0blocks(void)
logging(LOG_VERBOSE, "Test WRITEVERIFY12 0-blocks at LBA==0");
ret = writeverify12(iscsic, tgt_lun, 0, 0, block_size,
0, 0, 0, 0, NULL);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
CU_PASS("WRITEVERIFY12 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITEVERIFY12 0-blocks one block past end-of-LUN");

5
test-tool/test_writeverify12_beyond_eol.c
View File

@@ -45,6 +45,11 @@ test_writeverify12_beyond_eol(void)
i * block_size, block_size,
0, 0, 0, 0, buf);
free(buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
CU_PASS("WRITEVERIFY12 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
}

5
test-tool/test_writeverify12_flags.c
View File

@@ -41,6 +41,11 @@ test_writeverify12_flags(void)
ret = writeverify12(iscsic, tgt_lun, 0,
block_size, block_size,
0, 1, 0, 0, buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
CU_PASS("WRITEVERIFY12 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITEVERIFY12 with BYTCHK==1");

7
test-tool/test_writeverify12_residuals.c
View File

@@ -74,6 +74,13 @@ test_writeverify12_residuals(void)
CU_ASSERT_PTR_NOT_NULL(task_ret);
CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
CU_PASS("WRITEVERIFY12 is not implemented.");
return;
}
logging(LOG_VERBOSE, "Verify that the target returned SUCCESS");
if (task->status != SCSI_STATUS_GOOD) {
logging(LOG_VERBOSE, "[FAILED] Target returned error %s",

5
test-tool/test_writeverify12_simple.c
View File

@@ -42,9 +42,10 @@ test_writeverify12_simple(void)
block_size, 0, 0, 0, 0, buf);
free(buf);
if (ret == -2) {
CU_PASS("[SKIPPED] Target does not support WRITEVERIFY12. Skipping test");
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
CU_PASS("WRITEVERIFY12 is not implemented.");
return;
}
}
CU_ASSERT_EQUAL(ret, 0);
}

5
test-tool/test_writeverify12_wrprotect.c
View File

@@ -44,6 +44,11 @@ test_writeverify12_wrprotect(void)
ret = writeverify12_invalidfieldincdb(iscsic, tgt_lun, 0,
block_size, block_size,
i, 0, 0, 0, buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
CU_PASS("WRITEVERIFY12 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
}
free(buf);

5
test-tool/test_writeverify16_0blocks.c
View File

@@ -36,6 +36,11 @@ test_writeverify16_0blocks(void)
ret = writeverify16(iscsic, tgt_lun, 0,
0, block_size,
0, 0, 0, 0, NULL);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
CU_PASS("WRITEVERIFY16 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITEVERIFY16 0-blocks one block past end-of-LUN");

5
test-tool/test_writeverify16_beyond_eol.c
View File

@@ -42,6 +42,11 @@ test_writeverify16_beyond_eol(void)
i * block_size, block_size,
0, 0, 0, 0, buf);
free(buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
CU_PASS("WRITEVERIFY16 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
}

5
test-tool/test_writeverify16_flags.c
View File

@@ -41,6 +41,11 @@ test_writeverify16_flags(void)
ret = writeverify16(iscsic, tgt_lun, 0,
block_size, block_size,
0, 1, 0, 0, buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
CU_PASS("WRITEVERIFY16 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
logging(LOG_VERBOSE, "Test WRITEVERIFY16 with BYTCHK==1");

7
test-tool/test_writeverify16_residuals.c
View File

@@ -74,6 +74,13 @@ test_writeverify16_residuals(void)
CU_ASSERT_PTR_NOT_NULL(task_ret);
CU_ASSERT_NOT_EQUAL(task->status, SCSI_STATUS_CANCELLED); /* XXX redundant? */
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
CU_PASS("WRITEVERIFY16 is not implemented.");
return;
}
logging(LOG_VERBOSE, "Verify that the target returned SUCCESS");
if (task->status != SCSI_STATUS_GOOD) {
logging(LOG_VERBOSE, "[FAILED] Target returned error %s",

5
test-tool/test_writeverify16_simple.c
View File

@@ -42,6 +42,11 @@ test_writeverify16_simple(void)
ret = writeverify16(iscsic, tgt_lun, 0, i * block_size,
block_size, 0, 0, 0, 0, buf);
free(buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
CU_PASS("WRITEVERIFY16 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
}

5
test-tool/test_writeverify16_wrprotect.c
View File

@@ -45,6 +45,11 @@ test_writeverify16_wrprotect(void)
ret = writeverify16_invalidfieldincdb(iscsic, tgt_lun, 0,
block_size, block_size,
i, 0, 0, 0, buf);
if (ret == -2) {
logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
CU_PASS("WRITEVERIFY16 is not implemented.");
return;
}
CU_ASSERT_EQUAL(ret, 0);
}
free(buf);