Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

remove manual return Unimplemented #1241

Merged
merged 1 commit into from
Dec 19, 2024
Merged

remove manual return Unimplemented #1241

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
10 changes: 0 additions & 10 deletions pkg/disk/controllerserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,13 +995,3 @@ func (cs *controllerServer) deleteUntagAutoSnapshot(snapshotID, diskID string) {
klog.Errorf("ControllerExpandVolume:: failed to untag volumeExpandAutoSnapshot: %s", err.Error())
}
}

func (cs *controllerServer) ControllerGetVolume(ctx context.Context, req *csi.ControllerGetVolumeRequest,
) (*csi.ControllerGetVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (cs *controllerServer) ControllerModifyVolume(ctx context.Context, req *csi.ControllerModifyVolumeRequest,
) (*csi.ControllerModifyVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}
10 changes: 0 additions & 10 deletions pkg/ens/controllerserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,3 @@ func (cs *controllerServer) ValidateVolumeCapabilities(ctx context.Context, req
},
}, nil
}

func (cs *controllerServer) ControllerGetVolume(ctx context.Context, req *csi.ControllerGetVolumeRequest,
) (*csi.ControllerGetVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (cs *controllerServer) ControllerModifyVolume(ctx context.Context, req *csi.ControllerModifyVolumeRequest,
) (*csi.ControllerModifyVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}
37 changes: 0 additions & 37 deletions pkg/nas/controllerserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,40 +159,3 @@ func (cs *controllerServer) ControllerGetCapabilities(ctx context.Context, req *
csi.ControllerServiceCapability_RPC_EXPAND_VOLUME,
)}, nil
}

func (cs *controllerServer) ControllerPublishVolume(ctx context.Context, req *csi.ControllerPublishVolumeRequest) (*csi.ControllerPublishVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (cs *controllerServer) ControllerUnpublishVolume(ctx context.Context, req *csi.ControllerUnpublishVolumeRequest) (*csi.ControllerUnpublishVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (cs *controllerServer) ListVolumes(ctx context.Context, req *csi.ListVolumesRequest) (*csi.ListVolumesResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (cs *controllerServer) GetCapacity(ctx context.Context, req *csi.GetCapacityRequest) (*csi.GetCapacityResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}
func (cs *controllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (cs *controllerServer) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshotRequest) (*csi.DeleteSnapshotResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (cs *controllerServer) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (cs *controllerServer) ControllerGetVolume(ctx context.Context, req *csi.ControllerGetVolumeRequest,
) (*csi.ControllerGetVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (cs *controllerServer) ControllerModifyVolume(ctx context.Context, req *csi.ControllerModifyVolumeRequest,
) (*csi.ControllerModifyVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}
58 changes: 0 additions & 58 deletions pkg/nas/controllerserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import (
mytesting "github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/testing"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
corev1 "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes/fake"
)
Expand Down Expand Up @@ -272,59 +270,3 @@ func TestControllerServer_ControllerGetCapabilities(t *testing.T) {
assert.NoError(t, err)
assert.NotNil(t, resp)
}

func TestControllerServer_ControllerPublishVolume(t *testing.T) {
cs := newMockControllerServer()
assert.NotNil(t, cs)
resp, err := cs.ControllerPublishVolume(context.Background(), &csi.ControllerPublishVolumeRequest{})
assert.Nil(t, resp)
assert.Equal(t, status.Error(codes.Unimplemented, ""), err)
}

func TestControllerServer_ControllerUnpublishVolume(t *testing.T) {
cs := newMockControllerServer()
assert.NotNil(t, cs)
resp, err := cs.ControllerUnpublishVolume(context.Background(), &csi.ControllerUnpublishVolumeRequest{})
assert.Nil(t, resp)
assert.Equal(t, status.Error(codes.Unimplemented, ""), err)
}

func TestControllerServer_ListVolumes(t *testing.T) {
cs := newMockControllerServer()
assert.NotNil(t, cs)
resp, err := cs.ListVolumes(context.Background(), &csi.ListVolumesRequest{})
assert.Nil(t, resp)
assert.Equal(t, status.Error(codes.Unimplemented, ""), err)
}

func TestControllerServer_GetCapacity(t *testing.T) {
cs := newMockControllerServer()
assert.NotNil(t, cs)
resp, err := cs.GetCapacity(context.Background(), &csi.GetCapacityRequest{})
assert.Nil(t, resp)
assert.Equal(t, status.Error(codes.Unimplemented, ""), err)
}

func TestControllerServer_CreateSnapshot(t *testing.T) {
cs := newMockControllerServer()
assert.NotNil(t, cs)
resp, err := cs.CreateSnapshot(context.Background(), &csi.CreateSnapshotRequest{})
assert.Nil(t, resp)
assert.Equal(t, status.Error(codes.Unimplemented, ""), err)
}

func TestControllerServer_DeleteSnapshot(t *testing.T) {
cs := newMockControllerServer()
assert.NotNil(t, cs)
resp, err := cs.DeleteSnapshot(context.Background(), &csi.DeleteSnapshotRequest{})
assert.Nil(t, resp)
assert.Equal(t, status.Error(codes.Unimplemented, ""), err)
}

func TestControllerServer_ListSnapshots(t *testing.T) {
cs := newMockControllerServer()
assert.NotNil(t, cs)
resp, err := cs.ListSnapshots(context.Background(), &csi.ListSnapshotsRequest{})
assert.Nil(t, resp)
assert.Equal(t, status.Error(codes.Unimplemented, ""), err)
}
14 changes: 0 additions & 14 deletions pkg/nas/nodeserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,20 +608,6 @@ func (ns *nodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpu
return &csi.NodeUnpublishVolumeResponse{}, nil
}

func (ns *nodeServer) NodeStageVolume(
ctx context.Context,
req *csi.NodeStageVolumeRequest) (
*csi.NodeStageVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (ns *nodeServer) NodeUnstageVolume(
ctx context.Context,
req *csi.NodeUnstageVolumeRequest) (
*csi.NodeUnstageVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (ns *nodeServer) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandVolumeRequest) (
*csi.NodeExpandVolumeResponse, error) {
klog.Infof("NodeExpandVolume: nas expand volume with %v", req)
Expand Down
20 changes: 0 additions & 20 deletions pkg/oss/controllerserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,28 +184,8 @@ func (cs *controllerServer) ControllerPublishVolume(ctx context.Context, req *cs
}, nil
}

func (cs *controllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
klog.Infof("CreateSnapshot is called, do nothing now")
return &csi.CreateSnapshotResponse{}, nil
}

func (cs *controllerServer) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshotRequest) (*csi.DeleteSnapshotResponse, error) {
klog.Infof("DeleteSnapshot is called, do nothing now")
return &csi.DeleteSnapshotResponse{}, nil
}

func (cs *controllerServer) ControllerExpandVolume(ctx context.Context, req *csi.ControllerExpandVolumeRequest,
) (*csi.ControllerExpandVolumeResponse, error) {
klog.Infof("ControllerExpandVolume is called, do nothing now")
return &csi.ControllerExpandVolumeResponse{}, nil
}

func (cs *controllerServer) ControllerGetVolume(ctx context.Context, req *csi.ControllerGetVolumeRequest,
) (*csi.ControllerGetVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (cs *controllerServer) ControllerModifyVolume(ctx context.Context, req *csi.ControllerModifyVolumeRequest,
) (*csi.ControllerModifyVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}
5 changes: 0 additions & 5 deletions pkg/oss/nodeserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,6 @@ func (ns *nodeServer) NodeUnstageVolume(
return &csi.NodeUnstageVolumeResponse{}, nil
}

func (ns *nodeServer) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandVolumeRequest) (
*csi.NodeExpandVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

type publishRequest interface {
GetVolumeCapability() *csi.VolumeCapability
GetReadonly() bool
Expand Down
36 changes: 0 additions & 36 deletions pkg/pov/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,6 @@ func (d *controllerService) ControllerGetCapabilities(ctx context.Context, req *
}, nil
}

func (d *controllerService) ControllerExpandVolume(ctx context.Context, req *csi.ControllerExpandVolumeRequest) (*csi.ControllerExpandVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (d *controllerService) ControllerPublishVolume(ctx context.Context, req *csi.ControllerPublishVolumeRequest) (*csi.ControllerPublishVolumeResponse, error) {
pvs, err := getPVBympId(req.GetVolumeId())
if err != nil {
Expand Down Expand Up @@ -385,35 +381,3 @@ func (d *controllerService) ControllerUnpublishVolume(ctx context.Context, req *

return &csi.ControllerUnpublishVolumeResponse{}, nil
}

func (d *controllerService) ValidateVolumeCapabilities(ctx context.Context, req *csi.ValidateVolumeCapabilitiesRequest) (*csi.ValidateVolumeCapabilitiesResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (d *controllerService) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (d *controllerService) GetCapacity(ctx context.Context, req *csi.GetCapacityRequest) (*csi.GetCapacityResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (d *controllerService) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshotRequest) (*csi.DeleteSnapshotResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (d *controllerService) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (d *controllerService) ListVolumes(ctx context.Context, req *csi.ListVolumesRequest) (*csi.ListVolumesResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (d *controllerService) ControllerGetVolume(ctx context.Context, req *csi.ControllerGetVolumeRequest) (*csi.ControllerGetVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}

func (d *controllerService) ControllerModifyVolume(ctx context.Context, req *csi.ControllerModifyVolumeRequest) (*csi.ControllerModifyVolumeResponse, error) {
return nil, status.Error(codes.Unimplemented, "")
}