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

test/sanitize: use multipath session if available

Browse Source 
These tests currently reconnect to the base sd for multi-initiator
testing. Use the secondary multipath device instead, if available.

Signed-off-by: David Disseldorp <ddiss@suse.de>
This commit is contained in:
David Disseldorp
2015-09-21 15:52:40 +02:00
parent 638d58dd57
commit 69d9a77f14
2 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test-tool/test_sanitize_readonly.c
View File

@@ -25,6 +25,7 @@
#include "iscsi.h" #include "iscsi.h"
#include "scsi-lowlevel.h" #include "scsi-lowlevel.h"
#include "iscsi-test-cu.h" #include "iscsi-test-cu.h"
#include "iscsi-multipath.h"
void void
test_sanitize_readonly(void) test_sanitize_readonly(void)
@@ -32,7 +33,7 @@ test_sanitize_readonly(void)
int ret; int ret;
struct iscsi_data data; struct iscsi_data data;
struct scsi_command_descriptor *cd; struct scsi_command_descriptor *cd;
struct scsi_device sd2; struct scsi_device *sd2;
logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, LOG_BLANK_LINE);
logging(LOG_VERBOSE, "Test SANITIZE with READONLY devices"); logging(LOG_VERBOSE, "Test SANITIZE with READONLY devices");
@@ -49,17 +50,11 @@ test_sanitize_readonly(void)
} }
logging(LOG_VERBOSE, "Create a second connection to the target"); logging(LOG_VERBOSE, "Create a second connection to the target");
memset(&sd2, 0, sizeof(sd2)); ret = mpath_sd2_get_or_clone(sd, &sd2);
sd2.iscsi_url = sd->iscsi_url; CU_ASSERT_EQUAL(ret, 0);
sd2.iscsi_lun = sd->iscsi_lun;
sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd2.iscsi_url, &sd2.iscsi_lun);
if (sd2.iscsi_ctx == NULL) {
logging(LOG_VERBOSE, "Failed to login to target");
return;
}
logging(LOG_VERBOSE, "Set Software Write Protect on the second connection"); logging(LOG_VERBOSE, "Set Software Write Protect on the second connection");
ret = set_swp(&sd2); ret = set_swp(sd2);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
if (ret != 0) { if (ret != 0) {
return; return;
@@ -126,7 +121,7 @@ test_sanitize_readonly(void)
logging(LOG_VERBOSE, "Clear Software Write Protect on the second connection"); logging(LOG_VERBOSE, "Clear Software Write Protect on the second connection");
ret = clear_swp(&sd2); ret = clear_swp(sd2);
logging(LOG_VERBOSE, "Use TESTUNITREADY to clear unit attention on " logging(LOG_VERBOSE, "Use TESTUNITREADY to clear unit attention on "
"first connection"); "first connection");
@@ -134,5 +129,5 @@ test_sanitize_readonly(void)
sleep(1); sleep(1);
} }
iscsi_destroy_context(sd2.iscsi_ctx); mpath_sd2_put(sd2);
} }

17
test-tool/test_sanitize_reservations.c
View File

@@ -25,6 +25,7 @@
#include "iscsi.h" #include "iscsi.h"
#include "scsi-lowlevel.h" #include "scsi-lowlevel.h"
#include "iscsi-test-cu.h" #include "iscsi-test-cu.h"
#include "iscsi-multipath.h"
void void
test_sanitize_reservations(void) test_sanitize_reservations(void)
@@ -32,7 +33,7 @@ test_sanitize_reservations(void)
int ret; int ret;
struct iscsi_data data; struct iscsi_data data;
struct scsi_command_descriptor *cd; struct scsi_command_descriptor *cd;
struct scsi_device sd2; struct scsi_device *sd2;
logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, LOG_BLANK_LINE);
logging(LOG_VERBOSE, "Test SANITIZE with RESERVATIONS"); logging(LOG_VERBOSE, "Test SANITIZE with RESERVATIONS");
@@ -49,18 +50,12 @@ test_sanitize_reservations(void)
} }
logging(LOG_VERBOSE, "Create a second connection to the target"); logging(LOG_VERBOSE, "Create a second connection to the target");
memset(&sd2, 0, sizeof(sd2)); ret = mpath_sd2_get_or_clone(sd, &sd2);
sd2.iscsi_url = sd->iscsi_url; CU_ASSERT_EQUAL(ret, 0);
sd2.iscsi_lun = sd->iscsi_lun;
sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd2.iscsi_url, &sd2.iscsi_lun);
if (sd2.iscsi_ctx == NULL) {
logging(LOG_VERBOSE, "Failed to login to target");
return;
}
logging(LOG_VERBOSE, "Take out a RESERVE6 from the second " logging(LOG_VERBOSE, "Take out a RESERVE6 from the second "
"initiator"); "initiator");
ret = reserve6(&sd2); ret = reserve6(sd2);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
@@ -117,5 +112,5 @@ test_sanitize_reservations(void)
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);
} }
iscsi_destroy_context(sd2.iscsi_ctx); mpath_sd2_put(sd2);
} }