From 138939cb0ec95d5386a7c7ec36facba2aeec9964 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Tue, 16 Sep 2014 12:48:38 -0700 Subject: [PATCH] TESTS: change ORWRITE to use a single helper function for all Switch orwrite helpers to use _command_async instead of calling _orwrite_sync() to prepare for switching to non-iscsi targets. Use the new check_result API so that we only need a single helper function for ORWRITE instead of one helper for each expected result. Signed-off-by: Ronnie Sahlberg --- test-tool/iscsi-support.c | 268 +++------------------------- test-tool/iscsi-support.h | 6 +- test-tool/test_nomedia_sbc.c | 5 +- test-tool/test_orwrite_0blocks.c | 22 +-- test-tool/test_orwrite_beyond_eol.c | 28 ++- test-tool/test_orwrite_flags.c | 20 +-- test-tool/test_orwrite_simple.c | 6 +- test-tool/test_orwrite_verify.c | 12 +- test-tool/test_orwrite_wrprotect.c | 7 +- test-tool/test_readonly_sbc.c | 6 +- 10 files changed, 77 insertions(+), 303 deletions(-) diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c index 54260a6..86b6688 100644 --- a/test-tool/iscsi-support.c +++ b/test-tool/iscsi-support.c @@ -19,6 +19,7 @@ */ #define _GNU_SOURCE +#include #include #include #include @@ -285,60 +286,18 @@ iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) int orwrite(struct iscsi_context *iscsi, int lun, uint64_t lba, - uint32_t datalen, int blocksize, int wrprotect, - int dpo, int fua, int fua_nv, int group, - unsigned char *data) + uint32_t datalen, int blocksize, int wrprotect, + int dpo, int fua, int fua_nv, int group, + unsigned char *data, + int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; + struct iscsi_data d; + int ret; - logging(LOG_VERBOSE, "Send ORWRITE LBA:%" PRIu64 " blocks:%d " - "wrprotect:%d dpo:%d fua:%d fua_nv:%d group:%d", - lba, datalen / blocksize, wrprotect, - dpo, fua, fua_nv, group); - - if (!data_loss) { - printf("--dataloss flag is not set in. Skipping write\n"); - return -1; - } - - task = iscsi_orwrite_sync(iscsi, lun, lba, - data, datalen, blocksize, - wrprotect, dpo, fua, fua_nv, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send ORWRITE command: %s", - 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] ORWRITE is not implemented."); - return -2; - } - if (task->status != SCSI_STATUS_GOOD) { - logging(LOG_NORMAL, "[FAILED] ORWRITE command: " - "failed with sense. %s", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - logging(LOG_VERBOSE, "[OK] ORWRITE returned SUCCESS."); - return 0; -} - -int -orwrite_invalidfieldincdb(struct iscsi_context *iscsi, int lun, uint64_t lba, - uint32_t datalen, int blocksize, int wrprotect, - int dpo, int fua, int fua_nv, int group, - unsigned char *data) -{ - struct scsi_task *task; - - logging(LOG_VERBOSE, "Send ORWRITE (Expecting INVALID_FIELD_IN_CDB) " - "LBA:%" PRIu64 " blocks:%d wrprotect:%d " - "dpo:%d fua:%d fua_nv:%d group:%d", + logging(LOG_VERBOSE, "Send ORWRITE (Expecting %s) LBA:%" PRIu64 + " blocks:%d wrprotect:%d dpo:%d fua:%d fua_nv:%d group:%d", + scsi_status_str(status), lba, datalen / blocksize, wrprotect, dpo, fua, fua_nv, group); @@ -347,204 +306,19 @@ orwrite_invalidfieldincdb(struct iscsi_context *iscsi, int lun, uint64_t lba, return -1; } - task = iscsi_orwrite_sync(iscsi, lun, lba, data, datalen, blocksize, - wrprotect, dpo, fua, fua_nv, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send ORWRITE command: %s", - 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) { + task = scsi_cdb_orwrite(lba, datalen, blocksize, wrprotect, + dpo, fua, fua_nv, group); + assert(task != NULL); + + d.data = data; + d.size = datalen; + task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + + ret = check_result("ORWRITE", iscsi, task, status, key, ascq, num_ascq); + if (task) { scsi_free_scsi_task(task); - logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented."); - return -2; } - if (task->status == SCSI_STATUS_GOOD) { - logging(LOG_NORMAL, "[FAILED] ORWRITE successful but should " - "have failed with ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB"); - scsi_free_scsi_task(task); - return -1; - } - if (task->status != SCSI_STATUS_CHECK_CONDITION - || task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST - || task->sense.ascq != SCSI_SENSE_ASCQ_INVALID_FIELD_IN_CDB) { - logging(LOG_NORMAL, "[FAILED] ORWRITE failed with wrong sense. " - "Should have failed with ILLEGAL_REQUEST/" - "INVALID_FIELD_IN_CDB. Sense:%s\n", - iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - logging(LOG_VERBOSE, "[OK] ORWRITE returned ILLEGAL_REQUEST/INVALID_FIELD_IB_CDB."); - return 0; -} - -int -orwrite_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint64_t lba, - uint32_t datalen, int blocksize, int wrprotect, - int dpo, int fua, int fua_nv, int group, - unsigned char *data) -{ - struct scsi_task *task; - - logging(LOG_VERBOSE, "Send ORWRITE (Expecting LBA_OUT_OF_RANGE) " - "LBA:%" PRIu64 " blocks:%d wrprotect:%d " - "dpo:%d fua:%d fua_nv:%d group:%d", - lba, datalen / blocksize, wrprotect, - dpo, fua, fua_nv, group); - - if (!data_loss) { - printf("--dataloss flag is not set in. Skipping write\n"); - return -1; - } - - task = iscsi_orwrite_sync(iscsi, lun, lba, data, datalen, blocksize, - wrprotect, dpo, fua, fua_nv, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send ORWRITE command: %s", - 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] ORWRITE is not implemented."); - return -2; - } - if (task->status == SCSI_STATUS_GOOD) { - logging(LOG_NORMAL, "[FAILED] ORWRITE successful but should " - "have failed with ILLEGAL_REQUEST/LBA_OUT_OF_RANGE"); - scsi_free_scsi_task(task); - return -1; - } - if (task->status != SCSI_STATUS_CHECK_CONDITION - || task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST - || task->sense.ascq != SCSI_SENSE_ASCQ_LBA_OUT_OF_RANGE) { - logging(LOG_NORMAL, "[FAILED] ORWRITE failed with wrong sense. " - "Should have failed with ILLEGAL_REQUEST/" - "LBA_OUT_OF_RANGE. Sense:%s\n", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - logging(LOG_VERBOSE, "[OK] ORWRITE returned ILLEGAL_REQUEST/LBA_OUT_OF_RANGE."); - return 0; -} - -int -orwrite_writeprotected(struct iscsi_context *iscsi, int lun, uint64_t lba, - uint32_t datalen, int blocksize, int wrprotect, - int dpo, int fua, int fua_nv, int group, - unsigned char *data) -{ - struct scsi_task *task; - - logging(LOG_VERBOSE, "Send ORWRITE (Expecting WRITE_PROTECTED) " - "LBA:%" PRIu64 " blocks:%d wrprotect:%d " - "dpo:%d fua:%d fua_nv:%d group:%d", - lba, datalen / blocksize, wrprotect, - dpo, fua, fua_nv, group); - - if (!data_loss) { - printf("--dataloss flag is not set in. Skipping write\n"); - return -1; - } - - task = iscsi_orwrite_sync(iscsi, lun, lba, data, datalen, blocksize, - wrprotect, dpo, fua, fua_nv, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send ORWRITE command: %s", - 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] ORWRITE is not implemented."); - return -2; - } - if (task->status == SCSI_STATUS_GOOD) { - logging(LOG_NORMAL, "[FAILED] ORWRITE successful but should " - "have failed with DATA_PROTECTION/WRITE_PROTECTED"); - scsi_free_scsi_task(task); - return -1; - } - if (task->status != SCSI_STATUS_CHECK_CONDITION - || task->sense.key != SCSI_SENSE_DATA_PROTECTION - || task->sense.ascq != SCSI_SENSE_ASCQ_WRITE_PROTECTED) { - logging(LOG_NORMAL, "[FAILED] ORWRITE failed with wrong sense. " - "Should have failed with DATA_PRTOTECTION/" - "WRITE_PROTECTED. Sense:%s\n", - iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - logging(LOG_VERBOSE, "[OK] ORWRITE returned DATA_PROTECTION/WRITE_PROTECTED."); - return 0; -} - -int -orwrite_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba, - uint32_t datalen, int blocksize, int wrprotect, - int dpo, int fua, int fua_nv, int group, - unsigned char *data) -{ - struct scsi_task *task; - - logging(LOG_VERBOSE, "Send ORWRITE (Expecting MEDIUM_NOT_PRESENT) " - "LBA:%" PRIu64 " blocks:%d wrprotect:%d " - "dpo:%d fua:%d fua_nv:%d group:%d", - lba, datalen / blocksize, wrprotect, - dpo, fua, fua_nv, group); - - if (!data_loss) { - printf("--dataloss flag is not set in. Skipping write\n"); - return -1; - } - - task = iscsi_orwrite_sync(iscsi, lun, lba, data, datalen, blocksize, - wrprotect, dpo, fua, fua_nv, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send ORWRITE command: %s", - 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] ORWRITE is not implemented."); - return -2; - } - if (task->status == SCSI_STATUS_GOOD) { - logging(LOG_NORMAL, "[FAILED] ORWRITE command successful. But should have failed with NOT_READY/MEDIUM_NOT_PRESENT*"); - scsi_free_scsi_task(task); - return -1; - } - if (task->status != SCSI_STATUS_CHECK_CONDITION - || task->sense.key != SCSI_SENSE_NOT_READY - || (task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT - && task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_OPEN - && task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_CLOSED)) { - logging(LOG_NORMAL, "[FAILED] ORWRITE Should have failed " - "with NOT_READY/MEDIUM_NOT_PRESENT* But failed " - "with %s", iscsi_get_error(iscsi)); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - logging(LOG_VERBOSE, "[OK] ORWRITE returned MEDIUM_NOT_PRESENT."); - return 0; + return ret; } int diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h index 1a1805e..cf4070e 100644 --- a/test-tool/iscsi-support.h +++ b/test-tool/iscsi-support.h @@ -255,11 +255,7 @@ int compareandwrite_miscompare(struct iscsi_context *iscsi, int lun, uint64_t lb int get_lba_status(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len, enum scsi_provisioning_type *provisioning0); int get_lba_status_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len); int get_lba_status_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t len); -int orwrite(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data); -int orwrite_invalidfieldincdb(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data); -int orwrite_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data); -int orwrite_writeprotected(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data); -int orwrite_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data); +int orwrite(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); int prefetch10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group); int prefetch10_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group); int prefetch10_nomedium(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group); diff --git a/test-tool/test_nomedia_sbc.c b/test-tool/test_nomedia_sbc.c index 3290341..14bc297 100644 --- a/test-tool/test_nomedia_sbc.c +++ b/test-tool/test_nomedia_sbc.c @@ -208,8 +208,9 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test ORWRITE when medium is ejected."); - ret = orwrite_nomedium(iscsic, tgt_lun, 0, block_size, block_size, - 0, 0, 0, 0, 0, buf); + ret = orwrite(iscsic, tgt_lun, 0, block_size, block_size, + 0, 0, 0, 0, 0, buf, + EXPECT_NO_MEDIUM); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] target does not support " "ORWRITE"); diff --git a/test-tool/test_orwrite_0blocks.c b/test-tool/test_orwrite_0blocks.c index e3151c1..80c099d 100644 --- a/test-tool/test_orwrite_0blocks.c +++ b/test-tool/test_orwrite_0blocks.c @@ -34,8 +34,8 @@ test_orwrite_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test ORWRITE 0-blocks at LBA==0"); ret = orwrite(iscsic, tgt_lun, 0, - 0, block_size, - 0, 0, 0, 0, 0, NULL); + 0, block_size, 0, 0, 0, 0, 0, NULL, + EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented."); CU_PASS("ORWRITE is not implemented."); @@ -44,22 +44,22 @@ test_orwrite_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE 0-blocks one block past end-of-LUN"); - ret = orwrite_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1, - 0, block_size, - 0, 0, 0, 0, 0, NULL); + ret = orwrite(iscsic, tgt_lun, num_blocks + 1, + 0, block_size, 0, 0, 0, 0, 0, NULL, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE 0-blocks at LBA==2^63"); - ret = orwrite_lbaoutofrange(iscsic, tgt_lun, 0x8000000000000000ULL, - 0, block_size, - 0, 0, 0, 0, 0, NULL); + ret = orwrite(iscsic, tgt_lun, 0x8000000000000000ULL, + 0, block_size, 0, 0, 0, 0, 0, NULL, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE 0-blocks at LBA==-1"); - ret = orwrite_lbaoutofrange(iscsic, tgt_lun, -1, - 0, block_size, - 0, 0, 0, 0, 0, NULL); + ret = orwrite(iscsic, tgt_lun, -1, + 0, block_size, 0, 0, 0, 0, 0, NULL, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_orwrite_beyond_eol.c b/test-tool/test_orwrite_beyond_eol.c index 6cbc907..c057dde 100644 --- a/test-tool/test_orwrite_beyond_eol.c +++ b/test-tool/test_orwrite_beyond_eol.c @@ -40,10 +40,9 @@ test_orwrite_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = orwrite_lbaoutofrange(iscsic, tgt_lun, - num_blocks + 1 - i, - i * block_size, block_size, - 0, 0, 0, 0, 0, buf); + ret = orwrite(iscsic, tgt_lun, num_blocks + 1 - i, + i * block_size, block_size, 0, 0, 0, 0, 0, buf, + EXPECT_LBA_OOB); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented."); CU_PASS("ORWRITE is not implemented."); @@ -58,10 +57,9 @@ test_orwrite_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = orwrite_lbaoutofrange(iscsic, tgt_lun, - 0x8000000000000000ULL, - i * block_size, block_size, - 0, 0, 0, 0, 0, buf); + ret = orwrite(iscsic, tgt_lun, 0x8000000000000000ULL, + i * block_size, block_size, 0, 0, 0, 0, 0, buf, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } @@ -71,10 +69,9 @@ test_orwrite_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = orwrite_lbaoutofrange(iscsic, tgt_lun, - -1, - i * block_size, block_size, - 0, 0, 0, 0, 0, buf); + ret = orwrite(iscsic, tgt_lun, -1, + i * block_size, block_size, 0, 0, 0, 0, 0, buf, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } @@ -84,10 +81,9 @@ test_orwrite_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = orwrite_lbaoutofrange(iscsic, tgt_lun, - num_blocks - 1, - i * block_size, block_size, - 0, 0, 0, 0, 0, buf); + ret = orwrite(iscsic, tgt_lun, num_blocks - 1, + i * block_size, block_size, 0, 0, 0, 0, 0, buf, + EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } } diff --git a/test-tool/test_orwrite_flags.c b/test-tool/test_orwrite_flags.c index 123a87b..317f113 100644 --- a/test-tool/test_orwrite_flags.c +++ b/test-tool/test_orwrite_flags.c @@ -40,8 +40,8 @@ test_orwrite_flags(void) logging(LOG_VERBOSE, "Test ORWRITE with DPO==1"); ret = orwrite(iscsic, tgt_lun, 0, - block_size, block_size, - 0, 1, 0, 0, 0, buf); + block_size, block_size, 0, 1, 0, 0, 0, buf, + EXPECT_STATUS_GOOD); if (ret == -2) { CU_PASS("[SKIPPED] Target does not support VERIFY16. Skipping test"); return; @@ -51,28 +51,28 @@ test_orwrite_flags(void) logging(LOG_VERBOSE, "Test ORWRITE with FUA==1 FUA_NV==0"); ret = orwrite(iscsic, tgt_lun, 0, - block_size, block_size, - 0, 0, 1, 0, 0, buf); + block_size, block_size, 0, 0, 1, 0, 0, buf, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE with FUA==1 FUA_NV==1"); ret = orwrite(iscsic, tgt_lun, 0, - block_size, block_size, - 0, 0, 1, 1, 0, buf); + block_size, block_size, 0, 0, 1, 1, 0, buf, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE with FUA==0 FUA_NV==1"); ret = orwrite(iscsic, tgt_lun, 0, - block_size, block_size, - 0, 0, 0, 1, 0, buf); + block_size, block_size, 0, 0, 0, 1, 0, buf, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE with DPO==1 FUA==1 FUA_NV==1"); ret = orwrite(iscsic, tgt_lun, 0, - block_size, block_size, - 0, 1, 1, 1, 0, buf); + block_size, block_size, 0, 1, 1, 1, 0, buf, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_orwrite_simple.c b/test-tool/test_orwrite_simple.c index 4eafb78..394ddd4 100644 --- a/test-tool/test_orwrite_simple.c +++ b/test-tool/test_orwrite_simple.c @@ -43,7 +43,8 @@ test_orwrite_simple(void) break; } ret = orwrite(iscsic, tgt_lun, 0, i * block_size, - block_size, 0, 0, 0, 0, 0, buf); + block_size, 0, 0, 0, 0, 0, buf, + EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented."); CU_PASS("ORWRITE is not implemented."); @@ -58,7 +59,8 @@ test_orwrite_simple(void) break; } ret = orwrite(iscsic, tgt_lun, num_blocks - i, - i * block_size, block_size, 0, 0, 0, 0, 0, buf); + i * block_size, block_size, 0, 0, 0, 0, 0, buf, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_orwrite_verify.c b/test-tool/test_orwrite_verify.c index d4ad014..71aa02c 100644 --- a/test-tool/test_orwrite_verify.c +++ b/test-tool/test_orwrite_verify.c @@ -54,7 +54,8 @@ test_orwrite_verify(void) logging(LOG_VERBOSE, "OrWrite %d blocks with 0xa5", i); memset(buf, 0xa5, block_size * i); ret = orwrite(iscsic, tgt_lun, 0, i * block_size, - block_size, 0, 0, 0, 0, 0, buf); + block_size, 0, 0, 0, 0, 0, buf, + EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented."); CU_PASS("ORWRITE is not implemented."); @@ -74,7 +75,8 @@ test_orwrite_verify(void) logging(LOG_VERBOSE, "OrWrite %d blocks with 0x5a", i); memset(buf, 0x5a, block_size * i); ret = orwrite(iscsic, tgt_lun, 0, i * block_size, - block_size, 0, 0, 0, 0, 0, buf); + block_size, 0, 0, 0, 0, 0, buf, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read %d blocks back", i); @@ -103,7 +105,8 @@ test_orwrite_verify(void) logging(LOG_VERBOSE, "OrWrite %d blocks with 0xa5", i); memset(buf, 0xa5, block_size * i); ret = orwrite(iscsic, tgt_lun, num_blocks - i, i * block_size, - block_size, 0, 0, 0, 0, 0, buf); + block_size, 0, 0, 0, 0, 0, buf, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read %d blocks back", i); @@ -118,7 +121,8 @@ test_orwrite_verify(void) logging(LOG_VERBOSE, "OrWrite %d blocks with 0x5a", i); memset(buf, 0x5a, block_size * i); ret = orwrite(iscsic, tgt_lun, num_blocks - i, i * block_size, - block_size, 0, 0, 0, 0, 0, buf); + block_size, 0, 0, 0, 0, 0, buf, + EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read %d blocks back", i); diff --git a/test-tool/test_orwrite_wrprotect.c b/test-tool/test_orwrite_wrprotect.c index 338f46e..65c9dbd 100644 --- a/test-tool/test_orwrite_wrprotect.c +++ b/test-tool/test_orwrite_wrprotect.c @@ -44,9 +44,10 @@ test_orwrite_wrprotect(void) if (!inq->protect || (rc16 != NULL && !rc16->prot_en)) { logging(LOG_VERBOSE, "Device does not support/use protection information. All commands should fail."); for (i = 1; i < 8; i++) { - ret = orwrite_invalidfieldincdb(iscsic, tgt_lun, 0, - block_size, block_size, - i, 0, 0, 0, 0, buf); + ret = orwrite(iscsic, tgt_lun, 0, block_size, + block_size, i, 0, 0, 0, 0, buf, + EXPECT_INVALID_FIELD_IN_CDB); + if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] ORWRITE is not implemented."); CU_PASS("ORWRITE is not implemented."); diff --git a/test-tool/test_readonly_sbc.c b/test-tool/test_readonly_sbc.c index 7de9320..9844b5e 100644 --- a/test-tool/test_readonly_sbc.c +++ b/test-tool/test_readonly_sbc.c @@ -135,9 +135,9 @@ test_readonly_sbc(void) CU_ASSERT_NOT_EQUAL(ret, -1); logging(LOG_VERBOSE, "Test ORWRITE fails with WRITE_PROTECTED"); - ret = orwrite_writeprotected(iscsic, tgt_lun, 0, - block_size, block_size, - 0, 0, 0, 0, 0, buf); + ret = orwrite(iscsic, tgt_lun, 0, + block_size, block_size, 0, 0, 0, 0, 0, buf, + EXPECT_WRITE_PROTECTED); if (ret == -2) { logging(LOG_VERBOSE, "ORWRITE not supported on target. Skipped."); }