Commit 02d4c2b3 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

ut/iscsi: remove unused legacy config files 



The tests did not use the legacy files anyway.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Icffedb7cc7a8574f0f801883b2d9655515cab687
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4855


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent dec533bf

test/unit/lib/iscsi/init_grp.c/init_grp.conf

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
[IG_Valid0]

# Success is expected.

  InitiatorName iqn.2017-10.spdk.io:0001

  Netmask 192.168.2.0



[IG_Valid1]

# Success is expected.

  InitiatorName iqn.2017-10.spdk.io:0001

  Netmask 192.168.2.0

  Netmask 192.168.2.1



[IG_Valid2]

# Success is expected.

  InitiatorName iqn.2017-10.spdk.io:0001

  InitiatorName iqn.2017-10.spdk.io:0002

  Netmask 192.168.2.0



[IG_Valid3]

# Success is expected.

  InitiatorName iqn.2017-10.spdk.io:0001

  InitiatorName iqn.2017-10.spdk.io:0002

  Netmask 192.168.2.0

  Netmask 192.168.2.1



[IG_Invalid0]

# Failure is expected.

  InitiatorName iqn.2017-10.spdk.io:0001



[IG_Invalid1]

# Failure is expected.

  Netmask 192.168.2.0

test/unit/lib/iscsi/init_grp.c/init_grp_ut.c

+0 −9
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ SPDK_LOG_REGISTER_COMPONENT(iscsi) 


struct spdk_iscsi_globals g_iscsi;



const char *config_file;



static int

test_setup(void)

{
@@ -583,16 +581,9 @@ main(int argc, char **argv) 
	CU_pSuite	suite = NULL;

	unsigned int	num_failures;



	if (argc < 2) {

		fprintf(stderr, "usage: %s <config file>\n", argv[0]);

		exit(1);

	}



	CU_set_error_action(CUEA_ABORT);

	CU_initialize_registry();



	config_file = argv[1];



	suite = CU_add_suite("init_grp_suite", test_setup, NULL);



	CU_ADD_TEST(suite, create_initiator_group_success_case);

test/unit/lib/iscsi/tgt_node.c/tgt_node.conf

deleted100644 → 0
+0 −95
Original line number Diff line number Diff line 
[Global]



# Test that parsing fails if there is no TargetName

[Failure0]

  TargetAlias "Data Disk1"

  Mapping PortalGroup1 InitiatorGroup1

  AuthMethod Auto

  AuthGroup AuthGroup1

  UseDigest Auto

  QueueDepth 128

  LUN0 Malloc0

  LUN1 Malloc1



# Test that parsing fails if there is no Mapping

[Failure1]

  TargetName target1

  TargetAlias "Data Disk1"

  AuthMethod Auto

  AuthGroup AuthGroup1

  UseDigest Auto

  QueueDepth 128

  LUN0 Malloc0

  LUN1 Malloc1



# Test that parsing fails if Mapping does not define Portal or InitiatorGroup

[Failure2]

  TargetName target1

  TargetAlias "Data Disk1"

  Mapping

  AuthMethod Auto

  AuthGroup AuthGroup1

  UseDigest Auto

  QueueDepth 128

  LUN0 Malloc0

  LUN1 Malloc1



# Test that parsing fails if Mapping does not define InitiatorGroup

[Failure3]

  TargetName target1

  TargetAlias "Data Disk1"

  Mapping PortalGroup1

  AuthMethod Auto

  AuthGroup AuthGroup1

  UseDigest Auto

  QueueDepth 128

  LUN0 Malloc0

  LUN1 Malloc1



# Test that parsing fails if Mapping switches PortalGroup/InitiatorGroup order

[Failure4]

  TargetName target1

  TargetAlias "Data Disk1"

  Mapping InitiatorGroup1 PortalGroup1

  AuthMethod Auto

  AuthGroup AuthGroup1

  UseDigest Auto

  QueueDepth 128

  LUN0 Malloc0

  LUN1 Malloc1



# Test that parsing fails if Mapping uses invalid InitiatorGroup0

[Failure5]

  TargetName target1

  TargetAlias "Data Disk1"

  Mapping PortalGroup1 InitiatorGroup0

  AuthMethod Auto

  AuthGroup AuthGroup1

  UseDigest Auto

  QueueDepth 128

  LUN0 Malloc0

  LUN1 Malloc1



# Test that parsing fails if Mapping uses invalid PortalGroup0

[Failure6]

  TargetName target1

  TargetAlias "Data Disk1"

  Mapping PortalGroup0 InitiatorGroup1

  AuthMethod Auto

  AuthGroup AuthGroup1

  UseDigest Auto

  QueueDepth 128

  LUN0 Malloc0

  LUN1 Malloc1



# Test that parsing fails if AuthMethod is invalid

[Failure7]

  TargetName target1

  TargetAlias "Data Disk1"

  Mapping PortalGroup1 InitiatorGroup1

  AuthMethod SomeGarbage

  AuthGroup AuthGroup1

  UseDigest Auto

  QueueDepth 128

  LUN0 Malloc0

  LUN1 Malloc1

test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c

+0 −9
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 


struct spdk_iscsi_globals g_iscsi;



const char *config_file;



DEFINE_STUB(spdk_scsi_dev_get_id,

	    int,

	    (const struct spdk_scsi_dev *dev),
@@ -768,16 +766,9 @@ main(int argc, char **argv) 
	CU_pSuite	suite = NULL;

	unsigned int	num_failures;



	if (argc < 2) {

		fprintf(stderr, "usage: %s <config file>\n", argv[0]);

		exit(1);

	}



	CU_set_error_action(CUEA_ABORT);

	CU_initialize_registry();



	config_file = argv[1];



	suite = CU_add_suite("iscsi_target_node_suite", NULL, NULL);



	CU_ADD_TEST(suite, add_lun_test_cases);

test/unit/unittest.sh

+3 −3
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ function unittest_ftl() { 
function unittest_iscsi() {

	$valgrind $testdir/lib/iscsi/conn.c/conn_ut

	$valgrind $testdir/lib/iscsi/param.c/param_ut

	$valgrind $testdir/lib/iscsi/tgt_node.c/tgt_node_ut $testdir/lib/iscsi/tgt_node.c/tgt_node.conf

	$valgrind $testdir/lib/iscsi/tgt_node.c/tgt_node_ut

	$valgrind $testdir/lib/iscsi/iscsi.c/iscsi_ut

	$valgrind $testdir/lib/iscsi/init_grp.c/init_grp_ut $testdir/lib/iscsi/init_grp.c/init_grp.conf

	$valgrind $testdir/lib/iscsi/portal_grp.c/portal_grp_ut $testdir/lib/iscsi/portal_grp.c/portal_grp.conf

	$valgrind $testdir/lib/iscsi/init_grp.c/init_grp_ut

	$valgrind $testdir/lib/iscsi/portal_grp.c/portal_grp_ut

}



function unittest_json() {