From 02bbaa7007e4107fb4fc338930dd714b07a5dd82 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Wed, 2 May 2012 21:48:01 +1000 Subject: [PATCH] TESTS: We have proper tests for READ12/16 now so we can remove the old rdprotect tests --- Makefile.am | 2 - test-tool/0143_read12_rdprotect.c | 125 ------------------------------ test-tool/0153_read16_rdprotect.c | 125 ------------------------------ test-tool/iscsi-test.c | 6 -- test-tool/iscsi-test.h | 4 - 5 files changed, 262 deletions(-) delete mode 100644 test-tool/0143_read12_rdprotect.c delete mode 100644 test-tool/0153_read16_rdprotect.c diff --git a/Makefile.am b/Makefile.am index 3a61925..7cf2516 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,8 +61,6 @@ bin_iscsi_test_SOURCES = test-tool/iscsi-test.c \ test-tool/0121_read6_beyond_eol.c test-tool/0122_read6_invalid.c \ test-tool/0130_verify10_simple.c test-tool/0131_verify10_mismatch.c \ test-tool/0132_verify10_mismatch_no_cmp.c \ - test-tool/0143_read12_rdprotect.c \ - test-tool/0153_read16_rdprotect.c \ test-tool/0160_readcapacity16_simple.c \ test-tool/0170_unmap_simple.c test-tool/0171_unmap_zero.c \ test-tool/0180_writesame10_unmap.c test-tool/0181_writesame10_unmap_unaligned.c \ diff --git a/test-tool/0143_read12_rdprotect.c b/test-tool/0143_read12_rdprotect.c deleted file mode 100644 index e174be5..0000000 --- a/test-tool/0143_read12_rdprotect.c +++ /dev/null @@ -1,125 +0,0 @@ -/* - Copyright (C) 2010 by Ronnie Sahlberg - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . -*/ - -#include -#include -#include -#include "iscsi.h" -#include "scsi-lowlevel.h" -#include "iscsi-test.h" - -int T0143_read12_rdprotect(const char *initiator, const char *url) -{ - struct iscsi_context *iscsi; - struct scsi_task *task; - int full_size; - struct scsi_inquiry_standard *inq; - int ret, i, lun; - - iscsi = iscsi_context_login(initiator, url, &lun); - if (iscsi == NULL) { - printf("Failed to login to target\n"); - return -1; - } - - /* See how big this inquiry data is */ - task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64); - if (task == NULL || task->status != SCSI_STATUS_GOOD) { - printf("Inquiry command failed : %s\n", iscsi_get_error(iscsi)); - return -1; - } - full_size = scsi_datain_getfullsize(task); - if (full_size > task->datain.size) { - scsi_free_scsi_task(task); - - /* we need more data for the full list */ - if ((task = iscsi_inquiry_sync(iscsi, lun, 0, 0, full_size)) == NULL) { - printf("Inquiry command failed : %s\n", iscsi_get_error(iscsi)); - return -1; - } - } - - inq = scsi_datain_unmarshall(task); - if (inq == NULL) { - printf("failed to unmarshall inquiry datain blob\n"); - scsi_free_scsi_task(task); - return -1; - } - - if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { - printf("LUN is not SBC device. Skipping test\n"); - scsi_free_scsi_task(task); - return -1; - } - - if (inq->protect) { - printf("LUN is formatted with protection information. Skipping test\n"); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - - - ret = 0; - - /* Try out Different non-zero values for RDPROTECT. They should all fail */ - printf("Read12 with non-zero RDPROTECT ... "); - for (i = 1; i < 8; i++) { - - task = malloc(sizeof(struct scsi_task)); - - if (task == NULL) { - printf("Failed to allocate task structure\n"); - ret = -1; - goto finished; - } - - memset(task, 0, sizeof(struct scsi_task)); - task->cdb[0] = SCSI_OPCODE_READ12; - task->cdb[1] = (i<<5)&0xe0; - task->cdb[9] = 1; - task->cdb_size = 12; - task->xfer_dir = SCSI_XFER_READ; - task->expxferlen = 512; - - if (iscsi_scsi_command_sync(iscsi, lun, task, NULL) == NULL) { - printf("[FAILED]\n"); - printf("Failed to send read12 command: %s\n", iscsi_get_error(iscsi)); - ret = -1; - scsi_free_scsi_task(task); - goto finished; - } - if (task->status != SCSI_STATUS_CHECK_CONDITION - || task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST - || task->sense.ascq != SCSI_SENSE_ASCQ_INVALID_FIELD_IN_CDB) { - printf("[FAILED]\n"); - printf("Read12 with rdprotect should fail with ILLEGAL REQUEST/INVALID OPCODE\n"); - ret = -1; - scsi_free_scsi_task(task); - goto finished; - } - scsi_free_scsi_task(task); - } - printf("[OK]\n"); - - -finished: - iscsi_logout_sync(iscsi); - iscsi_destroy_context(iscsi); - return ret; -} diff --git a/test-tool/0153_read16_rdprotect.c b/test-tool/0153_read16_rdprotect.c deleted file mode 100644 index 61c4bf5..0000000 --- a/test-tool/0153_read16_rdprotect.c +++ /dev/null @@ -1,125 +0,0 @@ -/* - Copyright (C) 2010 by Ronnie Sahlberg - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . -*/ - -#include -#include -#include -#include "iscsi.h" -#include "scsi-lowlevel.h" -#include "iscsi-test.h" - -int T0153_read16_rdprotect(const char *initiator, const char *url) -{ - struct iscsi_context *iscsi; - struct scsi_task *task; - int full_size; - struct scsi_inquiry_standard *inq; - int ret, i, lun; - - iscsi = iscsi_context_login(initiator, url, &lun); - if (iscsi == NULL) { - printf("Failed to login to target\n"); - return -1; - } - - /* See how big this inquiry data is */ - task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64); - if (task == NULL || task->status != SCSI_STATUS_GOOD) { - printf("Inquiry command failed : %s\n", iscsi_get_error(iscsi)); - return -1; - } - full_size = scsi_datain_getfullsize(task); - if (full_size > task->datain.size) { - scsi_free_scsi_task(task); - - /* we need more data for the full list */ - if ((task = iscsi_inquiry_sync(iscsi, lun, 0, 0, full_size)) == NULL) { - printf("Inquiry command failed : %s\n", iscsi_get_error(iscsi)); - return -1; - } - } - - inq = scsi_datain_unmarshall(task); - if (inq == NULL) { - printf("failed to unmarshall inquiry datain blob\n"); - scsi_free_scsi_task(task); - return -1; - } - - if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { - printf("LUN is not SBC device. Skipping test\n"); - scsi_free_scsi_task(task); - return -1; - } - - if (inq->protect) { - printf("LUN is formatted with protection information. Skipping test\n"); - scsi_free_scsi_task(task); - return -1; - } - - scsi_free_scsi_task(task); - - - ret = 0; - - /* Try out Different non-zero values for RDPROTECT. They should all fail */ - printf("Read12 with non-zero RDPROTECT ... "); - for (i = 1; i < 8; i++) { - - task = malloc(sizeof(struct scsi_task)); - - if (task == NULL) { - printf("Failed to allocate task structure\n"); - ret = -1; - goto finished; - } - - memset(task, 0, sizeof(struct scsi_task)); - task->cdb[0] = SCSI_OPCODE_READ16; - task->cdb[1] = (i<<5)&0xe0; - task->cdb[13] = 1; - task->cdb_size = 16; - task->xfer_dir = SCSI_XFER_READ; - task->expxferlen = 512; - - if (iscsi_scsi_command_sync(iscsi, lun, task, NULL) == NULL) { - printf("[FAILED]\n"); - printf("Failed to send read16 command: %s\n", iscsi_get_error(iscsi)); - ret = -1; - scsi_free_scsi_task(task); - goto finished; - } - if (task->status != SCSI_STATUS_CHECK_CONDITION - || task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST - || task->sense.ascq != SCSI_SENSE_ASCQ_INVALID_FIELD_IN_CDB) { - printf("[FAILED]\n"); - printf("Read16 with rdprotect should fail with ILLEGAL REQUEST/INVALID OPCODE\n"); - ret = -1; - scsi_free_scsi_task(task); - goto finished; - } - scsi_free_scsi_task(task); - } - printf("[OK]\n"); - - -finished: - iscsi_logout_sync(iscsi); - iscsi_destroy_context(iscsi); - return ret; -} diff --git a/test-tool/iscsi-test.c b/test-tool/iscsi-test.c index 0789e65..0b3b96e 100644 --- a/test-tool/iscsi-test.c +++ b/test-tool/iscsi-test.c @@ -59,12 +59,6 @@ struct scsi_test tests[] = { { "T0131_verify10_mismatch", T0131_verify10_mismatch }, { "T0132_verify10_mismatch_no_cmp", T0132_verify10_mismatch_no_cmp }, -/* read12 */ -{ "T0143_read12_rdprotect", T0143_read12_rdprotect }, - -/* read16 */ -{ "T0153_read16_rdprotect", T0153_read16_rdprotect }, - /* readcapacity16*/ { "T0160_readcapacity16_simple", T0160_readcapacity16_simple }, diff --git a/test-tool/iscsi-test.h b/test-tool/iscsi-test.h index d784958..6ea9605 100644 --- a/test-tool/iscsi-test.h +++ b/test-tool/iscsi-test.h @@ -39,10 +39,6 @@ int T0130_verify10_simple(const char *initiator, const char *url); int T0131_verify10_mismatch(const char *initiator, const char *url); int T0132_verify10_mismatch_no_cmp(const char *initiator, const char *url); -int T0143_read12_rdprotect(const char *initiator, const char *url); - -int T0153_read16_rdprotect(const char *initiator, const char *url); - int T0160_readcapacity16_simple(const char *initiator, const char *url); int T0170_unmap_simple(const char *initiator, const char *url);