Skip to content

Rename iqn to IQN #269

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Oct 20, 2022
Merged

Rename iqn to IQN #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integrationtests/iscsi_ps_scripts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Restart-Service WinTarget
`

type iSCSISetupConfig struct {
Iqn string `json:"iqn"`
IQN string `json:"iqn"`
Ip string `json:"ip"`
}

Expand Down
24 changes: 12 additions & 12 deletions integrationtests/iscsi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ func e2eTest(t *testing.T) {
discReq := &iscsi.DiscoverTargetPortalRequest{TargetPortal: tp}
discResp, err := iSCSIClient.DiscoverTargetPortal(context.TODO(), discReq)
if assert.Nil(t, err) {
assert.Contains(t, discResp.Iqns, config.Iqn)
assert.Contains(t, discResp.IQNs, config.IQN)
}

connectReq := &iscsi.ConnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
connectReq := &iscsi.ConnectTargetRequest{TargetPortal: tp, IQN: config.IQN}
_, err = iSCSIClient.ConnectTarget(context.TODO(), connectReq)
assert.Nil(t, err)

tgtDisksReq := &iscsi.GetTargetDisksRequest{TargetPortal: tp, Iqn: config.Iqn}
tgtDisksReq := &iscsi.GetTargetDisksRequest{TargetPortal: tp, IQN: config.IQN}
tgtDisksResp, err := iSCSIClient.GetTargetDisks(context.TODO(), tgtDisksReq)
require.Nil(t, err)
require.Len(t, tgtDisksResp.DiskIDs, 1)
Expand Down Expand Up @@ -144,14 +144,14 @@ func targetTest(t *testing.T) {
discReq := &iscsi.DiscoverTargetPortalRequest{TargetPortal: tp}
discResp, err := iSCSIClient.DiscoverTargetPortal(context.TODO(), discReq)
if assert.Nil(t, err) {
assert.Contains(t, discResp.Iqns, config.Iqn)
assert.Contains(t, discResp.IQNs, config.IQN)
}

connectReq := &iscsi.ConnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
connectReq := &iscsi.ConnectTargetRequest{TargetPortal: tp, IQN: config.IQN}
_, err = iSCSIClient.ConnectTarget(context.TODO(), connectReq)
assert.Nil(t, err)

disconReq := &iscsi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
disconReq := &iscsi.DisconnectTargetRequest{TargetPortal: tp, IQN: config.IQN}
_, err = iSCSIClient.DisconnectTarget(context.TODO(), disconReq)
assert.Nil(t, err)
}
Expand Down Expand Up @@ -193,20 +193,20 @@ func targetChapTest(t *testing.T) {
discReq := &iscsi.DiscoverTargetPortalRequest{TargetPortal: tp}
discResp, err := iSCSIClient.DiscoverTargetPortal(context.TODO(), discReq)
if assert.Nil(t, err) {
assert.Contains(t, discResp.Iqns, config.Iqn)
assert.Contains(t, discResp.IQNs, config.IQN)
}

connectReq := &iscsi.ConnectTargetRequest{
TargetPortal: tp,
Iqn: config.Iqn,
IQN: config.IQN,
ChapUsername: username,
ChapSecret: password,
AuthType: iscsi.ONE_WAY_CHAP,
}
_, err = iSCSIClient.ConnectTarget(context.TODO(), connectReq)
assert.Nil(t, err)

disconReq := &iscsi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
disconReq := &iscsi.DisconnectTargetRequest{TargetPortal: tp, IQN: config.IQN}
_, err = iSCSIClient.DisconnectTarget(context.TODO(), disconReq)
assert.Nil(t, err)
}
Expand Down Expand Up @@ -259,7 +259,7 @@ func targetMutualChapTest(t *testing.T) {
req := &iscsi.DiscoverTargetPortalRequest{TargetPortal: tp}
resp, err := iSCSIClient.DiscoverTargetPortal(context.TODO(), req)
if assert.Nil(t, err) && assert.NotNil(t, resp) {
assert.Contains(t, resp.Iqns, config.Iqn)
assert.Contains(t, resp.IQNs, config.IQN)
}
}

Expand All @@ -273,7 +273,7 @@ func targetMutualChapTest(t *testing.T) {

connectReq := &iscsi.ConnectTargetRequest{
TargetPortal: tp,
Iqn: config.Iqn,
IQN: config.IQN,
ChapUsername: username,
ChapSecret: password,
AuthType: iscsi.MUTUAL_CHAP,
Expand All @@ -293,7 +293,7 @@ func targetMutualChapTest(t *testing.T) {
assert.Nil(t, err)

{
req := &iscsi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
req := &iscsi.DisconnectTargetRequest{TargetPortal: tp, IQN: config.IQN}
resp, err := iSCSIClient.DisconnectTarget(context.TODO(), req)
assert.Nil(t, err)
assert.NotNil(t, resp)
Expand Down
2 changes: 1 addition & 1 deletion pkg/iscsi/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (iscsiAPI) DiscoverTargetPortal(portal *TargetPortal) ([]string, error) {
var iqns []string
err = json.Unmarshal(out, &iqns)
if err != nil {
return nil, fmt.Errorf("failed parsing iqn list. cmd: %s output: %s, err: %w", cmdLine, string(out), err)
return nil, fmt.Errorf("failed parsing IQN list. cmd: %s output: %s, err: %w", cmdLine, string(out), err)
}

return iqns, nil
Expand Down
14 changes: 7 additions & 7 deletions pkg/iscsi/iscsi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func AuthTypeToString(authType AuthenticationType) (string, error) {
func (ic *ISCSI) ConnectTarget(context context.Context, req *ConnectTargetRequest) (*ConnectTargetResponse, error) {
klog.V(4).Infof("calling ConnectTarget with portal %s:%d and iqn %s"+
" auth=%v chapuser=%v", req.TargetPortal.TargetAddress,
req.TargetPortal.TargetPort, req.Iqn, req.AuthType, req.ChapUsername)
req.TargetPortal.TargetPort, req.IQN, req.AuthType, req.ChapUsername)

response := &ConnectTargetResponse{}
authType, err := AuthTypeToString(req.AuthType)
Expand All @@ -104,7 +104,7 @@ func (ic *ISCSI) ConnectTarget(context context.Context, req *ConnectTargetReques
return response, err
}

err = ic.hostAPI.ConnectTarget(ic.requestTPtoAPITP(req.TargetPortal), req.Iqn,
err = ic.hostAPI.ConnectTarget(ic.requestTPtoAPITP(req.TargetPortal), req.IQN,
authType, req.ChapUsername, req.ChapSecret)
if err != nil {
klog.Errorf("failed ConnectTarget %v", err)
Expand All @@ -116,10 +116,10 @@ func (ic *ISCSI) ConnectTarget(context context.Context, req *ConnectTargetReques

func (ic *ISCSI) DisconnectTarget(context context.Context, request *DisconnectTargetRequest) (*DisconnectTargetResponse, error) {
klog.V(4).Infof("calling DisconnectTarget with portal %s:%d and iqn %s",
request.TargetPortal.TargetAddress, request.TargetPortal.TargetPort, request.Iqn)
request.TargetPortal.TargetAddress, request.TargetPortal.TargetPort, request.IQN)

response := &DisconnectTargetResponse{}
err := ic.hostAPI.DisconnectTarget(ic.requestTPtoAPITP(request.TargetPortal), request.Iqn)
err := ic.hostAPI.DisconnectTarget(ic.requestTPtoAPITP(request.TargetPortal), request.IQN)
if err != nil {
klog.Errorf("failed DisconnectTarget %v", err)
return response, err
Expand All @@ -137,15 +137,15 @@ func (ic *ISCSI) DiscoverTargetPortal(context context.Context, request *Discover
return response, err
}

response.Iqns = iqns
response.IQNs = iqns
return response, nil
}

func (ic *ISCSI) GetTargetDisks(context context.Context, request *GetTargetDisksRequest) (*GetTargetDisksResponse, error) {
klog.V(4).Infof("calling GetTargetDisks with portal %s:%d and iqn %s",
request.TargetPortal.TargetAddress, request.TargetPortal.TargetPort, request.Iqn)
request.TargetPortal.TargetAddress, request.TargetPortal.TargetPort, request.IQN)
response := &GetTargetDisksResponse{}
disks, err := ic.hostAPI.GetTargetDisks(ic.requestTPtoAPITP(request.TargetPortal), request.Iqn)
disks, err := ic.hostAPI.GetTargetDisks(ic.requestTPtoAPITP(request.TargetPortal), request.IQN)
if err != nil {
klog.Errorf("failed GetTargetDisks %v", err)
return response, err
Expand Down
8 changes: 4 additions & 4 deletions pkg/iscsi/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type ConnectTargetRequest struct {
TargetPortal *TargetPortal

// IQN of the iSCSI Target
Iqn string
IQN string

// Connection authentication type, None by default
//
Expand All @@ -54,7 +54,7 @@ type DisconnectTargetRequest struct {
// Target portal from which initiator will disconnect
TargetPortal *TargetPortal
// IQN of the iSCSI Target
Iqn string
IQN string
}

type DisconnectTargetResponse struct {
Expand All @@ -69,14 +69,14 @@ type DiscoverTargetPortalRequest struct {
type DiscoverTargetPortalResponse struct {
// List of discovered IQN addresses
// follows IQN format: iqn.yyyy-mm.naming-authority:unique-name
Iqns []string
IQNs []string
}

type GetTargetDisksRequest struct {
// Target portal whose disks will be queried
TargetPortal *TargetPortal
// IQN of the iSCSI Target
Iqn string
IQN string
}

type GetTargetDisksResponse struct {
Expand Down