Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Apr 2026 07:29:37 +0000
From:      Johan=?utf-8?Q? S=C3=B6llv?=ander <js@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 6d3401ccf317 - stable/15 - ctladm tests: Only use allowed chars in IQN
Message-ID:  <69f1b361.36bf4.36eb21d3@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by js:

URL: https://cgit.FreeBSD.org/src/commit/?id=6d3401ccf317487b0c60233ce9058e22763ddd30

commit 6d3401ccf317487b0c60233ce9058e22763ddd30
Author:     Johan Söllvander <js@FreeBSD.org>
AuthorDate: 2026-04-22 14:19:42 +0000
Commit:     Johan Söllvander <js@FreeBSD.org>
CommitDate: 2026-04-29 07:28:55 +0000

    ctladm tests: Only use allowed chars in IQN
    
    _ isn't part of the allowed IQN format, but - is.
    
    None functional change.
    
    Reviewed by:            asomers, ngie
    Approved by:            asomers (mentor)
    Sponsored by:           ConnectWise
    Differential Revision:  https://reviews.freebsd.org/D56557
    
    (cherry picked from commit 51b65c6af2e19f1e944c67aa2b5252cd9dc9e2f7)
---
 usr.sbin/ctladm/tests/port.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh
index d966529a85ae..1103a1d7bafb 100644
--- a/usr.sbin/ctladm/tests/port.sh
+++ b/usr.sbin/ctladm/tests/port.sh
@@ -118,7 +118,7 @@ create_iscsi_body()
 {
 	skip_if_ctld
 
-	TARGET=iqn.2018-10.myhost.create_iscsi
+	TARGET=iqn.2018-10.myhost.create-iscsi
 	atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET"
 	echo "target: $TARGET" >> port-create.txt
 	atf_check egrep -q "Port created successfully" port-create.txt
@@ -146,7 +146,7 @@ create_iscsi_alias_body()
 {
 	skip_if_ctld
 
-	TARGET=iqn.2018-10.myhost.create_iscsi_alias
+	TARGET=iqn.2018-10.myhost.create-iscsi-alias
 	ALIAS="foobar"
 	atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" -O cfiscsi_target_alias="$ALIAS"
 	echo "target: $TARGET" >> port-create.txt
@@ -173,7 +173,7 @@ create_iscsi_without_required_args_body()
 {
 	skip_if_ctld
 
-	TARGET=iqn.2018-10.myhost.create_iscsi
+	TARGET=iqn.2018-10.myhost.create-iscsi
 	atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_target" ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG
 	atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_portal_group_tag" ctladm port -c -d "iscsi" -O cfiscsi_target=$TARGET
 }
@@ -288,7 +288,7 @@ remove_iscsi_body()
 {
 	skip_if_ctld
 
-	TARGET=iqn.2018-10.myhost.remove_iscsi
+	TARGET=iqn.2018-10.myhost.remove-iscsi
 	atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET"
 	portnum=`awk '/port:/ {print $2}' port-create.txt`
 	atf_check -o save:portlist.txt ctladm portlist -qf iscsi
@@ -314,7 +314,7 @@ remove_iscsi_without_required_args_body()
 {
 	skip_if_ctld
 
-	TARGET=iqn.2018-10.myhost.remove_iscsi_without_required_args
+	TARGET=iqn.2018-10.myhost.remove-iscsi-without-required-args
 	atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET"
 	echo "target: $TARGET" >> port-create.txt
 	atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_portal_group_tag" ctladm port -r -d iscsi -O cfiscsi_target="$TARGET"


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f1b361.36bf4.36eb21d3>