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

Merge remote-tracking branch 'jongrimm/master'

Browse Source
This commit is contained in:
Peter Lieven
2012-10-30 11:09:38 +01:00
parent d989474a36 f97cd4f816
commit e10a5a97be
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test-tool/0430_report_all_supported_ops.c
View File

@@ -60,6 +60,16 @@ int T0430_report_all_supported_ops(const char *initiator, const char *url, int d
ret = -1; ret = -1;
goto finished; goto finished;
} }
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
printf("[SKIPPED]\n");
printf("REPORT SUPPORTED OPCODES command failed : %s\n",
iscsi_get_error(iscsi));
scsi_free_scsi_task(task);
ret = -2;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) { if (task->status != SCSI_STATUS_GOOD) {
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("REPORT SUPPORTED OPCODES command failed : %s\n", printf("REPORT SUPPORTED OPCODES command failed : %s\n",
@@ -83,7 +93,7 @@ int T0430_report_all_supported_ops(const char *initiator, const char *url, int d
rsoc = scsi_datain_unmarshall(task); rsoc = scsi_datain_unmarshall(task);
if (rsoc == NULL) { if (rsoc == NULL) {
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("failed to unmarshall inquiry datain blob\n"); printf("failed to unmarshall REPORT SUPPORTED OPCODES datain blob\n");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
ret = -1; ret = -1;
goto finished; goto finished;
@@ -114,6 +124,17 @@ test2:
ret = -1; ret = -1;
goto finished; goto finished;
} }
if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_ILLEGAL_REQUEST
&& (task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE
|| task->sense.ascq == SCSI_SENSE_ASCQ_INVALID_FIELD_IN_CDB)) {
printf("[SKIPPED]\n");
printf("REPORT SUPPORTED OPCODES command failed : %s\n",
iscsi_get_error(iscsi));
scsi_free_scsi_task(task);
ret = -2;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) { if (task->status != SCSI_STATUS_GOOD) {
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("REPORT SUPPORTED OPCODES command failed : %s\n", printf("REPORT SUPPORTED OPCODES command failed : %s\n",
@@ -128,7 +149,7 @@ test2:
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
/* we need more data for the full list */ /* we need more data for the full list */
if ((task = iscsi_report_supported_opcodes_sync(iscsi, lun, 0, full_size)) == NULL) { if ((task = iscsi_report_supported_opcodes_sync(iscsi, lun, 1, full_size)) == NULL) {
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("REPORT SUPPORTED OPCODES failed : %s\n", iscsi_get_error(iscsi)); printf("REPORT SUPPORTED OPCODES failed : %s\n", iscsi_get_error(iscsi));
ret = -1; ret = -1;
@@ -138,7 +159,7 @@ test2:
rsoc = scsi_datain_unmarshall(task); rsoc = scsi_datain_unmarshall(task);
if (rsoc == NULL) { if (rsoc == NULL) {
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("failed to unmarshall inquiry datain blob\n"); printf("failed to unmarshall REPORT SUPPORTED OPCODES datain blob\n");
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
ret = -1; ret = -1;
goto finished; goto finished;
@@ -150,7 +171,7 @@ test2:
+ sizeof (struct scsi_op_timeout_descriptor); + sizeof (struct scsi_op_timeout_descriptor);
desc = &rsoc->descriptors[0]; desc = &rsoc->descriptors[0];
for (i=0; i < rsoc->num_descriptors; i++) { for (i=0; i < rsoc->num_descriptors; i++) {
printf("op:%x\tsa:%x\tcdb_length:%d\ttimout info: length:%d\tcommand specific:%x\tnominal processing%d\trecommended%d\n", printf("op:%x\tsa:%x\tcdb_length:%d\ttimeout info: length:%d\tcommand specific:%x\tnominal processing%d\trecommended%d\n",
desc->op_code, desc->op_code,
desc->service_action, desc->service_action,
desc->cdb_length, desc->cdb_length,