Commit ed23b207 authored by Konrad Sztyber's avatar Konrad Sztyber
Browse files

test/unit: use valid v4 UUID in NQN tests 



On FreeBSD spdk_uuid_parse() will fail if the UUID doesn't have the
variant/version fields filled in correctly.  So, use a proper UUID in
the test to make them pass on FreeBSD.

Fixes #2942.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I7c5384086c6828c7380f9d128878578301077b17
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17184


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarArtur Paszkiewicz <artur.paszkiewicz@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent ede1caf0

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

+4 −4
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ nvmf_test_create_subsystem(void) 
	CU_ASSERT(subsystem == NULL);



	/* Valid name using uuid format */

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

	snprintf(nqn, sizeof(nqn), "nqn.2014-08.org.nvmexpress:uuid:ff9b6406-0fc8-4779-80ca-4dca14bda0d2");

	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);
@@ -442,17 +442,17 @@ nvmf_test_create_subsystem(void) 


	/* Invalid uuid (too long) */

	snprintf(nqn, sizeof(nqn),

		 "nqn.2014-08.org.nvmexpress:uuid:11111111-aaaa-bbdd-FFEE-123456789abcdef");

		 "nqn.2014-08.org.nvmexpress:uuid:ff9b6406-0fc8-4779-80ca-4dca14bda0d2aaaa");

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

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);



	/* Invalid uuid (dashes placed incorrectly) */

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

	snprintf(nqn, sizeof(nqn), "nqn.2014-08.org.nvmexpress:uuid:ff9b64-060fc8-4779-80ca-4dca14bda0d2");

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

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);



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

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

	snprintf(nqn, sizeof(nqn), "nqn.2014-08.org.nvmexpress:uuid:ff9hg406-0fc8-4779-80ca-4dca14bda0d2");

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

	SPDK_CU_ASSERT_FATAL(subsystem == NULL);