TESTS: Add tests to verify a RESERVE6 is dropped on logout and it-nexus loss

Makefile.am

@@ -247,6 +247,8 @@ bin_iscsi_test_cu_SOURCES = test-tool/iscsi-test-cu.c \
 	test-tool/test_readonly_sbc.c \
 	test-tool/test_reserve6_simple.c \
 	test-tool/test_reserve6_2initiators.c \
+	test-tool/test_reserve6_logout.c \
+	test-tool/test_reserve6_itnexus_loss.c \
 	test-tool/test_startstopunit_simple.c \
 	test-tool/test_startstopunit_pwrcnd.c \
 	test-tool/test_startstopunit_noloej.c \

test-tool/iscsi-test-cu.c

@@ -217,6 +217,8 @@ static CU_TestInfo tests_readonly[] = {
 static CU_TestInfo tests_reserve6[] = {
 	{ (char *)"testReserve6Simple", test_reserve6_simple },
 	{ (char *)"testReserve6_2Initiators", test_reserve6_2initiators },
+	{ (char *)"testReserve6Logout", test_reserve6_logout },
+	{ (char *)"testReserve6ITNexusLoss", test_reserve6_itnexus_loss },
 	CU_TEST_INFO_NULL
 };
 

test-tool/iscsi-test-cu.h

@@ -129,6 +129,8 @@ void test_readonly_sbc(void);
 
 void test_reserve6_simple(void);
 void test_reserve6_2initiators(void);
+void test_reserve6_logout(void);
+void test_reserve6_itnexus_loss(void);
 
 void test_startstopunit_simple(void);
 void test_startstopunit_pwrcnd(void);

test-tool/test_reserve6_itnexus_loss.c

@@ -0,0 +1,76 @@
+/* 
+   Copyright (C) 2013 Ronnie Sahlberg <ronniesahlberg@gmail.com>
+   
+   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 <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdio.h>
+
+#include <CUnit/CUnit.h>
+
+#include "iscsi.h"
+#include "scsi-lowlevel.h"
+#include "iscsi-support.h"
+#include "iscsi-test-cu.h"
+
+
+void
+test_reserve6_itnexus_loss(void)
+{
+	int ret;
+
+
+	logging(LOG_VERBOSE, LOG_BLANK_LINE);
+	logging(LOG_VERBOSE, "Test that RESERVE6 is released on it-nexus loss");
+
+
+	logging(LOG_NORMAL, "Take out a RESERVE6 from the first initiator");
+	ret = reserve6(iscsic, tgt_lun);
+	if (ret == -2) {
+		logging(LOG_VERBOSE, "[SKIPPED] Target does not support RESERVE6. Skipping test");
+		CU_PASS("[SKIPPED] Target does not support RESERVE6. Skipping test");
+		return;
+	}
+	CU_ASSERT_EQUAL(ret, 0);
+
+
+	logging(LOG_VERBOSE, "Create a second connection to the target");
+	iscsic2 = iscsi_context_login(initiatorname1, tgt_url, &tgt_lun);
+	if (iscsic2 == NULL) {
+		logging(LOG_VERBOSE, "Failed to login to target");
+		return;
+	}
+
+	logging(LOG_NORMAL, "Try to take out a RESERVE6 from the second initiator");
+	ret = reserve6_conflict(iscsic2, tgt_lun);
+	CU_ASSERT_EQUAL(ret, 0);
+
+	logging(LOG_VERBOSE, "Disconnect from the target.");
+	iscsi_destroy_context(iscsic);
+
+	logging(LOG_VERBOSE, "Reconnect to target");
+	iscsic = iscsi_context_login(initiatorname1, tgt_url, &tgt_lun);
+	if (iscsic == NULL) {
+		logging(LOG_VERBOSE, "Failed to login to target");
+		return;
+	}
+
+	logging(LOG_NORMAL, "RESERVE6 from the second initiator should work now");
+	ret = reserve6(iscsic2, tgt_lun);
+	CU_ASSERT_EQUAL(ret, 0);
+
+	logging(LOG_NORMAL, "RELEASE6 from the second initiator");
+	ret = release6(iscsic2, tgt_lun);
+	CU_ASSERT_EQUAL(ret, 0);
+}

test-tool/test_reserve6_logout.c

@@ -0,0 +1,76 @@
+/* 
+   Copyright (C) 2013 Ronnie Sahlberg <ronniesahlberg@gmail.com>
+   
+   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 <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdio.h>
+
+#include <CUnit/CUnit.h>
+
+#include "iscsi.h"
+#include "scsi-lowlevel.h"
+#include "iscsi-support.h"
+#include "iscsi-test-cu.h"
+
+
+void
+test_reserve6_logout(void)
+{
+	int ret;
+
+
+	logging(LOG_VERBOSE, LOG_BLANK_LINE);
+	logging(LOG_VERBOSE, "Test that RESERVE6 is released on logout");
+
+
+	logging(LOG_NORMAL, "Take out a RESERVE6 from the first initiator");
+	ret = reserve6(iscsic, tgt_lun);
+	if (ret == -2) {
+		logging(LOG_VERBOSE, "[SKIPPED] Target does not support RESERVE6. Skipping test");
+		CU_PASS("[SKIPPED] Target does not support RESERVE6. Skipping test");
+		return;
+	}
+	CU_ASSERT_EQUAL(ret, 0);
+
+
+	logging(LOG_VERBOSE, "Create a second connection to the target");
+	iscsic2 = iscsi_context_login(initiatorname1, tgt_url, &tgt_lun);
+	if (iscsic2 == NULL) {
+		logging(LOG_VERBOSE, "Failed to login to target");
+		return;
+	}
+
+	logging(LOG_NORMAL, "Try to take out a RESERVE6 from the second initiator");
+	ret = reserve6_conflict(iscsic2, tgt_lun);
+	CU_ASSERT_EQUAL(ret, 0);
+
+	logging(LOG_VERBOSE, "Logout from target");
+	iscsi_logout_sync(iscsic);
+
+	logging(LOG_VERBOSE, "Relogin to target");
+	iscsic = iscsi_context_login(initiatorname1, tgt_url, &tgt_lun);
+	if (iscsic == NULL) {
+		logging(LOG_VERBOSE, "Failed to login to target");
+		return;
+	}
+
+	logging(LOG_NORMAL, "RESERVE6 from the second initiator should work now");
+	ret = reserve6(iscsic2, tgt_lun);
+	CU_ASSERT_EQUAL(ret, 0);
+
+	logging(LOG_NORMAL, "RELEASE6 from the second initiator");
+	ret = release6(iscsic2, tgt_lun);
+	CU_ASSERT_EQUAL(ret, 0);
+}