Commit 97cbd304 authored by Jim Harris's avatar Jim Harris
Browse files

test/nvmf: use correct names for spdk_nvmf_subsystem_create/destroy 



This fixes b21fad1a (nvmf/subsystem: spdk_nvmf_valid_nqn fits nvme spec).
This patch was not rebased before last revision and some of these functions
had changed.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I0904d962409de280ffbc3c07108815811caf5e26

Reviewed-on: https://review.gerrithub.io/394110


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent edc5610f

test/unit/lib/nvmf/subsystem.c/subsystem_ut.c

+17 −17
Original line number Diff line number Diff line
@@ -246,56 +246,56 @@ nvmf_test_create_subsystem(void) 


	/* valid name with complex reverse domain */

	strncpy(nqn, "nqn.2016-06.io.spdk-full--rev-domain.name:subsystem1", sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem != NULL);

	CU_ASSERT_STRING_EQUAL(subsystem->subnqn, nqn);

	spdk_nvmf_delete_subsystem(subsystem);

	spdk_nvmf_subsystem_destroy(subsystem);



	/* Valid name discovery controller */

	strncpy(nqn, "nqn.2016-06.io.spdk:subsystem1", sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem != NULL);

	CU_ASSERT_STRING_EQUAL(subsystem->subnqn, nqn);

	spdk_nvmf_delete_subsystem(subsystem);

	spdk_nvmf_subsystem_destroy(subsystem);





	/* Invalid name, no user supplied string */

	strncpy(nqn, "nqn.2016-06.io.spdk:", sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);



	/* Valid name, only contains top-level domain name */

	strncpy(nqn, "nqn.2016-06.io:subsystem1", sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem != NULL);

	CU_ASSERT_STRING_EQUAL(subsystem->subnqn, nqn);

	spdk_nvmf_delete_subsystem(subsystem);

	spdk_nvmf_subsystem_destroy(subsystem);



	/* Invalid name, domain label > 63 characters */

	strncpy(nqn,

		"nqn.2016-06.io.abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz:sub",

		sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);



	/* Invalid name, domain label starts with digit */

	strncpy(nqn, "nqn.2016-06.io.3spdk:sub", sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);



	/* Invalid name, domain label starts with - */

	strncpy(nqn, "nqn.2016-06.io.-spdk:subsystem1", sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);



	/* Invalid name, domain label ends with - */

	strncpy(nqn, "nqn.2016-06.io.spdk-:subsystem1", sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);



	/* Invalid name, domain label with multiple consecutive periods */

	strncpy(nqn, "nqn.2016-06.io..spdk:subsystem1", sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);



	/* Longest valid name */
@@ -318,25 +318,25 @@ nvmf_test_create_subsystem(void) 


	/* Valid name using uuid format */

	strncpy(nqn, "nqn.2014-08.org.nvmexpress:uuid:11111111-aaaa-bbdd-FFEE-123456789abc", sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem != NULL);

	CU_ASSERT_STRING_EQUAL(subsystem->subnqn, nqn);

	spdk_nvmf_delete_subsystem(subsystem);

	spdk_nvmf_subsystem_destroy(subsystem);



	/* Invalid uuid (too long) */

	strncpy(nqn, "nqn.2014-08.org.nvmexpress:uuid:11111111-aaaa-bbdd-FFEE-123456789abcdef",

		sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);



	/* Invalid uuid (dashes placed incorrectly) */

	strncpy(nqn, "nqn.2014-08.org.nvmexpress:uuid:111111-11aaaa-bbdd-FFEE-123456789abc", sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);



	/* Invalid uuid (invalid characters in uuid) */

	strncpy(nqn, "nqn.2014-08.org.nvmexpress:uuid:111hg111-aaaa-bbdd-FFEE-123456789abc", sizeof(nqn));

	subsystem = spdk_nvmf_create_subsystem(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	subsystem = spdk_nvmf_subsystem_create(&tgt, nqn, SPDK_NVMF_SUBTYPE_NVME, 0);

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);



	free(tgt.subsystems);