Skip to content

Commit a2485c0

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #269 from alexander-ding/enh/rename-api-groups
Rename iqn to IQN
2 parents bc1eb23 + 3649e19 commit a2485c0

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

‎integrationtests/iscsi_ps_scripts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Restart-Service WinTarget
3131
`
3232

3333
type iSCSISetupConfig struct {
34-
Iqn string `json:"iqn"`
34+
IQN string `json:"iqn"`
3535
Ip string `json:"ip"`
3636
}
3737

‎integrationtests/iscsi_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ func e2eTest(t *testing.T) {
8585
discReq := &iscsi.DiscoverTargetPortalRequest{TargetPortal: tp}
8686
discResp, err := iSCSIClient.DiscoverTargetPortal(context.TODO(), discReq)
8787
if assert.Nil(t, err) {
88-
assert.Contains(t, discResp.Iqns, config.Iqn)
88+
assert.Contains(t, discResp.IQNs, config.IQN)
8989
}
9090

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

95-
tgtDisksReq := &iscsi.GetTargetDisksRequest{TargetPortal: tp, Iqn: config.Iqn}
95+
tgtDisksReq := &iscsi.GetTargetDisksRequest{TargetPortal: tp, IQN: config.IQN}
9696
tgtDisksResp, err := iSCSIClient.GetTargetDisks(context.TODO(), tgtDisksReq)
9797
require.Nil(t, err)
9898
require.Len(t, tgtDisksResp.DiskIDs, 1)
@@ -144,14 +144,14 @@ func targetTest(t *testing.T) {
144144
discReq := &iscsi.DiscoverTargetPortalRequest{TargetPortal: tp}
145145
discResp, err := iSCSIClient.DiscoverTargetPortal(context.TODO(), discReq)
146146
if assert.Nil(t, err) {
147-
assert.Contains(t, discResp.Iqns, config.Iqn)
147+
assert.Contains(t, discResp.IQNs, config.IQN)
148148
}
149149

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

154-
disconReq := &iscsi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
154+
disconReq := &iscsi.DisconnectTargetRequest{TargetPortal: tp, IQN: config.IQN}
155155
_, err = iSCSIClient.DisconnectTarget(context.TODO(), disconReq)
156156
assert.Nil(t, err)
157157
}
@@ -193,20 +193,20 @@ func targetChapTest(t *testing.T) {
193193
discReq := &iscsi.DiscoverTargetPortalRequest{TargetPortal: tp}
194194
discResp, err := iSCSIClient.DiscoverTargetPortal(context.TODO(), discReq)
195195
if assert.Nil(t, err) {
196-
assert.Contains(t, discResp.Iqns, config.Iqn)
196+
assert.Contains(t, discResp.IQNs, config.IQN)
197197
}
198198

199199
connectReq := &iscsi.ConnectTargetRequest{
200200
TargetPortal: tp,
201-
Iqn: config.Iqn,
201+
IQN: config.IQN,
202202
ChapUsername: username,
203203
ChapSecret: password,
204204
AuthType: iscsi.ONE_WAY_CHAP,
205205
}
206206
_, err = iSCSIClient.ConnectTarget(context.TODO(), connectReq)
207207
assert.Nil(t, err)
208208

209-
disconReq := &iscsi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
209+
disconReq := &iscsi.DisconnectTargetRequest{TargetPortal: tp, IQN: config.IQN}
210210
_, err = iSCSIClient.DisconnectTarget(context.TODO(), disconReq)
211211
assert.Nil(t, err)
212212
}
@@ -259,7 +259,7 @@ func targetMutualChapTest(t *testing.T) {
259259
req := &iscsi.DiscoverTargetPortalRequest{TargetPortal: tp}
260260
resp, err := iSCSIClient.DiscoverTargetPortal(context.TODO(), req)
261261
if assert.Nil(t, err) && assert.NotNil(t, resp) {
262-
assert.Contains(t, resp.Iqns, config.Iqn)
262+
assert.Contains(t, resp.IQNs, config.IQN)
263263
}
264264
}
265265

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

274274
connectReq := &iscsi.ConnectTargetRequest{
275275
TargetPortal: tp,
276-
Iqn: config.Iqn,
276+
IQN: config.IQN,
277277
ChapUsername: username,
278278
ChapSecret: password,
279279
AuthType: iscsi.MUTUAL_CHAP,
@@ -293,7 +293,7 @@ func targetMutualChapTest(t *testing.T) {
293293
assert.Nil(t, err)
294294

295295
{
296-
req := &iscsi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
296+
req := &iscsi.DisconnectTargetRequest{TargetPortal: tp, IQN: config.IQN}
297297
resp, err := iSCSIClient.DisconnectTarget(context.TODO(), req)
298298
assert.Nil(t, err)
299299
assert.NotNil(t, resp)

‎pkg/iscsi/api/api.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (iscsiAPI) DiscoverTargetPortal(portal *TargetPortal) ([]string, error) {
6262
var iqns []string
6363
err = json.Unmarshal(out, &iqns)
6464
if err != nil {
65-
return nil, fmt.Errorf("failed parsing iqn list. cmd: %s output: %s, err: %w", cmdLine, string(out), err)
65+
return nil, fmt.Errorf("failed parsing IQN list. cmd: %s output: %s, err: %w", cmdLine, string(out), err)
6666
}
6767

6868
return iqns, nil

‎pkg/iscsi/iscsi.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func AuthTypeToString(authType AuthenticationType) (string, error) {
9595
func (ic *ISCSI) ConnectTarget(context context.Context, req *ConnectTargetRequest) (*ConnectTargetResponse, error) {
9696
klog.V(4).Infof("calling ConnectTarget with portal %s:%d and iqn %s"+
9797
" auth=%v chapuser=%v", req.TargetPortal.TargetAddress,
98-
req.TargetPortal.TargetPort, req.Iqn, req.AuthType, req.ChapUsername)
98+
req.TargetPortal.TargetPort, req.IQN, req.AuthType, req.ChapUsername)
9999

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

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

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

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

140-
response.Iqns = iqns
140+
response.IQNs = iqns
141141
return response, nil
142142
}
143143

144144
func (ic *ISCSI) GetTargetDisks(context context.Context, request *GetTargetDisksRequest) (*GetTargetDisksResponse, error) {
145145
klog.V(4).Infof("calling GetTargetDisks with portal %s:%d and iqn %s",
146-
request.TargetPortal.TargetAddress, request.TargetPortal.TargetPort, request.Iqn)
146+
request.TargetPortal.TargetAddress, request.TargetPortal.TargetPort, request.IQN)
147147
response := &GetTargetDisksResponse{}
148-
disks, err := ic.hostAPI.GetTargetDisks(ic.requestTPtoAPITP(request.TargetPortal), request.Iqn)
148+
disks, err := ic.hostAPI.GetTargetDisks(ic.requestTPtoAPITP(request.TargetPortal), request.IQN)
149149
if err != nil {
150150
klog.Errorf("failed GetTargetDisks %v", err)
151151
return response, err

‎pkg/iscsi/types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type ConnectTargetRequest struct {
2828
TargetPortal *TargetPortal
2929

3030
// IQN of the iSCSI Target
31-
Iqn string
31+
IQN string
3232

3333
// Connection authentication type, None by default
3434
//
@@ -54,7 +54,7 @@ type DisconnectTargetRequest struct {
5454
// Target portal from which initiator will disconnect
5555
TargetPortal *TargetPortal
5656
// IQN of the iSCSI Target
57-
Iqn string
57+
IQN string
5858
}
5959

6060
type DisconnectTargetResponse struct {
@@ -69,15 +69,15 @@ type DiscoverTargetPortalRequest struct {
6969
type DiscoverTargetPortalResponse struct {
7070
// List of discovered IQN addresses
7171
// follows IQN format: iqn.yyyy-mm.naming-authority:unique-name
72-
Iqns []string
72+
IQNs []string
7373
}
7474

7575
type GetTargetDisksRequest struct {
7676
// Target portal whose disks will be queried
7777
TargetPortal *TargetPortal
7878

7979
// IQN of the iSCSI Target
80-
Iqn string
80+
IQN string
8181
}
8282

8383
type GetTargetDisksResponse struct {

0 commit comments

Comments
 (0)