Skip to content

Commit b59394c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #582 from jusjin-org/user/jusjin/updatecsicommon
chore: update csicommon to csi spec v1.5
2 parents a105f35 + 849e78d commit b59394c

File tree

4 files changed

+150
-25
lines changed

4 files changed

+150
-25
lines changed

‎pkg/csi-common/controllerserver-default.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ func (cs *DefaultControllerServer) ValidateVolumeCapabilities(ctx context.Contex
5353
}
5454
if !found {
5555
return &csi.ValidateVolumeCapabilitiesResponse{
56-
Message: "Driver doesnot support mode:" + c.GetAccessMode().GetMode().String(),
57-
}, status.Error(codes.InvalidArgument, "Driver doesnot support mode:"+c.GetAccessMode().GetMode().String())
56+
Message: "Driver does not support mode:" + c.GetAccessMode().GetMode().String(),
57+
}, status.Error(codes.InvalidArgument, "Driver does not support mode:"+c.GetAccessMode().GetMode().String())
5858
}
5959
// TODO: Ignoring mount & block tyeps for now.
6060
}
@@ -89,3 +89,11 @@ func (cs *DefaultControllerServer) DeleteSnapshot(ctx context.Context, req *csi.
8989
func (cs *DefaultControllerServer) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {
9090
return nil, status.Error(codes.Unimplemented, "")
9191
}
92+
93+
func (cs *DefaultControllerServer) ControllerExpandVolume(ctx context.Context, req *csi.ControllerExpandVolumeRequest) (*csi.ControllerExpandVolumeResponse, error) {
94+
return nil, status.Error(codes.Unimplemented, "")
95+
}
96+
97+
func (cs *DefaultControllerServer) ControllerGetVolume(ctx context.Context, req *csi.ControllerGetVolumeRequest) (*csi.ControllerGetVolumeResponse, error) {
98+
return nil, status.Error(codes.Unimplemented, "")
99+
}

‎pkg/csi-common/controllerserver-default_test.go

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,37 +48,37 @@ func TestValidateVolumeCapabilities(t *testing.T) {
4848
{AccessMode: NewVolumeCapabilityAccessMode(csi.VolumeCapability_AccessMode_MULTI_NODE_SINGLE_WRITER)},
4949
}
5050

51-
ns := NewDefaultControllerServer(d)
51+
cs := NewDefaultControllerServer(d)
5252

5353
// Test when there are common capabilities
5454
req := csi.ValidateVolumeCapabilitiesRequest{VolumeCapabilities: capability}
55-
resp, err := ns.ValidateVolumeCapabilities(context.Background(), &req)
55+
resp, err := cs.ValidateVolumeCapabilities(context.Background(), &req)
5656
assert.NoError(t, err)
5757
assert.Equal(t, resp.XXX_sizecache, int32(0))
5858

5959
// Test when there are no common capabilities
6060
req = csi.ValidateVolumeCapabilitiesRequest{VolumeCapabilities: capabilityDisjoint}
61-
resp, err = ns.ValidateVolumeCapabilities(context.Background(), &req)
61+
resp, err = cs.ValidateVolumeCapabilities(context.Background(), &req)
6262
assert.NotNil(t, resp)
6363
assert.Error(t, err)
6464
}
6565

6666
func TestControllerGetCapabilities(t *testing.T) {
6767
d := NewFakeDriver()
68-
ns := NewDefaultControllerServer(d)
68+
cs := NewDefaultControllerServer(d)
6969

7070
// Test valid request
7171
req := csi.ControllerGetCapabilitiesRequest{}
72-
resp, err := ns.ControllerGetCapabilities(context.Background(), &req)
72+
resp, err := cs.ControllerGetCapabilities(context.Background(), &req)
7373
assert.NoError(t, err)
7474
assert.Equal(t, resp.XXX_sizecache, int32(0))
7575
}
7676

7777
func TestCreateVolume(t *testing.T) {
7878
d := NewFakeDriver()
79-
ns := NewDefaultControllerServer(d)
79+
cs := NewDefaultControllerServer(d)
8080
req := csi.CreateVolumeRequest{}
81-
resp, err := ns.CreateVolume(context.Background(), &req)
81+
resp, err := cs.CreateVolume(context.Background(), &req)
8282
assert.Nil(t, resp)
8383
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
8484
t.Errorf("Unexpected error: %v", err)
@@ -87,9 +87,9 @@ func TestCreateVolume(t *testing.T) {
8787

8888
func TestDeleteVolume(t *testing.T) {
8989
d := NewFakeDriver()
90-
ns := NewDefaultControllerServer(d)
90+
cs := NewDefaultControllerServer(d)
9191
req := csi.DeleteVolumeRequest{}
92-
resp, err := ns.DeleteVolume(context.Background(), &req)
92+
resp, err := cs.DeleteVolume(context.Background(), &req)
9393
assert.Nil(t, resp)
9494
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
9595
t.Errorf("Unexpected error: %v", err)
@@ -98,9 +98,9 @@ func TestDeleteVolume(t *testing.T) {
9898

9999
func TestControllerPublishVolume(t *testing.T) {
100100
d := NewFakeDriver()
101-
ns := NewDefaultControllerServer(d)
101+
cs := NewDefaultControllerServer(d)
102102
req := csi.ControllerPublishVolumeRequest{}
103-
resp, err := ns.ControllerPublishVolume(context.Background(), &req)
103+
resp, err := cs.ControllerPublishVolume(context.Background(), &req)
104104
assert.Nil(t, resp)
105105
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
106106
t.Errorf("Unexpected error: %v", err)
@@ -109,9 +109,9 @@ func TestControllerPublishVolume(t *testing.T) {
109109

110110
func TestControllerUnpublishVolume(t *testing.T) {
111111
d := NewFakeDriver()
112-
ns := NewDefaultControllerServer(d)
112+
cs := NewDefaultControllerServer(d)
113113
req := csi.ControllerUnpublishVolumeRequest{}
114-
resp, err := ns.ControllerUnpublishVolume(context.Background(), &req)
114+
resp, err := cs.ControllerUnpublishVolume(context.Background(), &req)
115115
assert.Nil(t, resp)
116116
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
117117
t.Errorf("Unexpected error: %v", err)
@@ -120,9 +120,9 @@ func TestControllerUnpublishVolume(t *testing.T) {
120120

121121
func TestGetCapacity(t *testing.T) {
122122
d := NewFakeDriver()
123-
ns := NewDefaultControllerServer(d)
123+
cs := NewDefaultControllerServer(d)
124124
req := csi.GetCapacityRequest{}
125-
resp, err := ns.GetCapacity(context.Background(), &req)
125+
resp, err := cs.GetCapacity(context.Background(), &req)
126126
assert.Nil(t, resp)
127127
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
128128
t.Errorf("Unexpected error: %v", err)
@@ -131,9 +131,9 @@ func TestGetCapacity(t *testing.T) {
131131

132132
func TestListVolumes(t *testing.T) {
133133
d := NewFakeDriver()
134-
ns := NewDefaultControllerServer(d)
134+
cs := NewDefaultControllerServer(d)
135135
req := csi.ListVolumesRequest{}
136-
resp, err := ns.ListVolumes(context.Background(), &req)
136+
resp, err := cs.ListVolumes(context.Background(), &req)
137137
assert.Nil(t, resp)
138138
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
139139
t.Errorf("Unexpected error: %v", err)
@@ -142,9 +142,9 @@ func TestListVolumes(t *testing.T) {
142142

143143
func TestCreateSnapshot(t *testing.T) {
144144
d := NewFakeDriver()
145-
ns := NewDefaultControllerServer(d)
145+
cs := NewDefaultControllerServer(d)
146146
req := csi.CreateSnapshotRequest{}
147-
resp, err := ns.CreateSnapshot(context.Background(), &req)
147+
resp, err := cs.CreateSnapshot(context.Background(), &req)
148148
assert.Nil(t, resp)
149149
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
150150
t.Errorf("Unexpected error: %v", err)
@@ -153,9 +153,9 @@ func TestCreateSnapshot(t *testing.T) {
153153

154154
func TestDeleteSnapshot(t *testing.T) {
155155
d := NewFakeDriver()
156-
ns := NewDefaultControllerServer(d)
156+
cs := NewDefaultControllerServer(d)
157157
req := csi.DeleteSnapshotRequest{}
158-
resp, err := ns.DeleteSnapshot(context.Background(), &req)
158+
resp, err := cs.DeleteSnapshot(context.Background(), &req)
159159
assert.Nil(t, resp)
160160
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
161161
t.Errorf("Unexpected error: %v", err)
@@ -164,9 +164,31 @@ func TestDeleteSnapshot(t *testing.T) {
164164

165165
func TestListSnapshots(t *testing.T) {
166166
d := NewFakeDriver()
167-
ns := NewDefaultControllerServer(d)
167+
cs := NewDefaultControllerServer(d)
168168
req := csi.ListSnapshotsRequest{}
169-
resp, err := ns.ListSnapshots(context.Background(), &req)
169+
resp, err := cs.ListSnapshots(context.Background(), &req)
170+
assert.Nil(t, resp)
171+
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
172+
t.Errorf("Unexpected error: %v", err)
173+
}
174+
}
175+
176+
func TestControllerExpandVolume(t *testing.T) {
177+
d := NewFakeDriver()
178+
cs := NewDefaultControllerServer(d)
179+
req := csi.ControllerExpandVolumeRequest{}
180+
resp, err := cs.ControllerExpandVolume(context.Background(), &req)
181+
assert.Nil(t, resp)
182+
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
183+
t.Errorf("Unexpected error: %v", err)
184+
}
185+
}
186+
187+
func TestControllerGetVolume(t *testing.T) {
188+
d := NewFakeDriver()
189+
cs := NewDefaultControllerServer(d)
190+
req := csi.ControllerGetVolumeRequest{}
191+
resp, err := cs.ControllerGetVolume(context.Background(), &req)
170192
assert.Nil(t, resp)
171193
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
172194
t.Errorf("Unexpected error: %v", err)

‎pkg/csi-common/nodeserver-default.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ package csicommon
1919
import (
2020
"github.com/container-storage-interface/spec/lib/go/csi"
2121
"golang.org/x/net/context"
22+
"google.golang.org/grpc/codes"
23+
"google.golang.org/grpc/status"
2224
)
2325

2426
type DefaultNodeServer struct {
@@ -36,3 +38,27 @@ func (ns *DefaultNodeServer) NodeGetCapabilities(ctx context.Context, req *csi.N
3638
Capabilities: ns.Driver.NSCap,
3739
}, nil
3840
}
41+
42+
func (ns *DefaultNodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) {
43+
return nil, status.Error(codes.Unimplemented, "")
44+
}
45+
46+
func (ns *DefaultNodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {
47+
return nil, status.Error(codes.Unimplemented, "")
48+
}
49+
50+
func (ns *DefaultNodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
51+
return nil, status.Error(codes.Unimplemented, "")
52+
}
53+
54+
func (ns *DefaultNodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {
55+
return nil, status.Error(codes.Unimplemented, "")
56+
}
57+
58+
func (ns *DefaultNodeServer) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGetVolumeStatsRequest) (*csi.NodeGetVolumeStatsResponse, error) {
59+
return nil, status.Error(codes.Unimplemented, "")
60+
}
61+
62+
func (ns *DefaultNodeServer) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandVolumeRequest) (*csi.NodeExpandVolumeResponse, error) {
63+
return nil, status.Error(codes.Unimplemented, "")
64+
}

‎pkg/csi-common/nodeserver-default_test.go

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ package csicommon
1818

1919
import (
2020
"context"
21+
"reflect"
2122
"testing"
2223

2324
"github.com/container-storage-interface/spec/lib/go/csi"
2425
"github.com/stretchr/testify/assert"
26+
"google.golang.org/grpc/codes"
27+
"google.golang.org/grpc/status"
2528
)
2629

2730
func TestNodeGetInfo(t *testing.T) {
@@ -46,3 +49,69 @@ func TestNodeGetCapabilities(t *testing.T) {
4649
_, err := ns.NodeGetCapabilities(context.Background(), &req)
4750
assert.NoError(t, err)
4851
}
52+
53+
func TestNodeStageVolume(t *testing.T) {
54+
d := NewFakeDriver()
55+
ns := NewDefaultNodeServer(d)
56+
req := csi.NodeStageVolumeRequest{}
57+
resp, err := ns.NodeStageVolume(context.Background(), &req)
58+
assert.Nil(t, resp)
59+
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
60+
t.Errorf("Unexpected error: %v", err)
61+
}
62+
}
63+
64+
func TestNodeUnstageVolume(t *testing.T) {
65+
d := NewFakeDriver()
66+
ns := NewDefaultNodeServer(d)
67+
req := csi.NodeUnstageVolumeRequest{}
68+
resp, err := ns.NodeUnstageVolume(context.Background(), &req)
69+
assert.Nil(t, resp)
70+
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
71+
t.Errorf("Unexpected error: %v", err)
72+
}
73+
}
74+
75+
func TestNodePublishVolume(t *testing.T) {
76+
d := NewFakeDriver()
77+
ns := NewDefaultNodeServer(d)
78+
req := csi.NodePublishVolumeRequest{}
79+
resp, err := ns.NodePublishVolume(context.Background(), &req)
80+
assert.Nil(t, resp)
81+
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
82+
t.Errorf("Unexpected error: %v", err)
83+
}
84+
}
85+
86+
func TestNodeUnpublishVolume(t *testing.T) {
87+
d := NewFakeDriver()
88+
ns := NewDefaultNodeServer(d)
89+
req := csi.NodeUnpublishVolumeRequest{}
90+
resp, err := ns.NodeUnpublishVolume(context.Background(), &req)
91+
assert.Nil(t, resp)
92+
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
93+
t.Errorf("Unexpected error: %v", err)
94+
}
95+
}
96+
97+
func TestNodeGetVolumeStats(t *testing.T) {
98+
d := NewFakeDriver()
99+
ns := NewDefaultNodeServer(d)
100+
req := csi.NodeGetVolumeStatsRequest{}
101+
resp, err := ns.NodeGetVolumeStats(context.Background(), &req)
102+
assert.Nil(t, resp)
103+
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
104+
t.Errorf("Unexpected error: %v", err)
105+
}
106+
}
107+
108+
func TestNodeExpandVolume(t *testing.T) {
109+
d := NewFakeDriver()
110+
ns := NewDefaultNodeServer(d)
111+
req := csi.NodeExpandVolumeRequest{}
112+
resp, err := ns.NodeExpandVolume(context.Background(), &req)
113+
assert.Nil(t, resp)
114+
if !reflect.DeepEqual(err, status.Error(codes.Unimplemented, "")) {
115+
t.Errorf("Unexpected error: %v", err)
116+
}
117+
}

0 commit comments

Comments
 (0)