fix csi test case and bring back return string

Author: aniruddha2000

pkg/csi/blockstorage/controllerserver.go

@@ -629,7 +629,7 @@ func (cs *controllerServer) createSnapshot(ctx context.Context, name, volumeID s
 	filters["Name"] = name
 
 	// List existing snapshots with the same name
-	snapshots, err := cs.Instance.ListSnapshots(ctx, filters)
+	snapshots, _, err := cs.Instance.ListSnapshots(ctx, filters)
 	if err != nil {
 		klog.Errorf("Failed to query for existing Snapshot during CreateSnapshot: %v", err)
 		return nil, status.Error(codes.Internal, "Failed to get snapshots")
@@ -792,7 +792,7 @@ func (cs *controllerServer) ListSnapshots(ctx context.Context, req *csi.ListSnap
 
 	// Only retrieve snapshots that are available
 	filters["Status"] = stackitclient.SnapshotReadyStatus
-	slist, err = cloud.ListSnapshots(ctx, filters)
+	slist, nextPageToken, err = cloud.ListSnapshots(ctx, filters)
 	if err != nil {
 		klog.Errorf("Failed to ListSnapshots: %v", err)
 		return nil, status.Errorf(codes.Internal, "ListSnapshots failed with error %v", err)

pkg/csi/blockstorage/controllerserver_test.go

@@ -772,7 +772,7 @@ var _ = Describe("ControllerServer test", Ordered, func() {
 				iaasClient.EXPECT().ListBackups(gomock.Any(), gomock.Any()).Return([]iaas.Backup{}, nil)
 
 				// Backups are created from snapshots
-				iaasClient.EXPECT().ListSnapshots(gomock.Any(), gomock.Any()).Return([]iaas.Snapshot{}, nil)
+				iaasClient.EXPECT().ListSnapshots(gomock.Any(), gomock.Any()).Return([]iaas.Snapshot{}, "", nil)
 				iaasClient.EXPECT().CreateSnapshot(gomock.Any(), gomock.Any()).Return(expectedSnap, nil)
 				iaasClient.EXPECT().WaitSnapshotReady(gomock.Any(), "fake-snapshot").Return(expectedSnap.Status, nil)
 
@@ -865,7 +865,7 @@ var _ = Describe("ControllerServer test", Ordered, func() {
 				iaasClient.EXPECT().ListBackups(gomock.Any(), gomock.Any()).Return([]iaas.Backup{}, nil)
 
 				// Backups are created from snapshots
-				iaasClient.EXPECT().ListSnapshots(gomock.Any(), gomock.Any()).Return([]iaas.Snapshot{}, nil)
+				iaasClient.EXPECT().ListSnapshots(gomock.Any(), gomock.Any()).Return([]iaas.Snapshot{}, "", nil)
 				iaasClient.EXPECT().CreateSnapshot(gomock.Any(), gomock.Any()).Return(expectedSnap, nil)
 				iaasClient.EXPECT().WaitSnapshotReady(gomock.Any(), "fake-snapshot").Return(expectedSnap.Status, nil)
 
@@ -899,7 +899,7 @@ var _ = Describe("ControllerServer test", Ordered, func() {
 					CreatedAt: new(time.Now()),
 				}
 				// TODO: Again filters are not implemented yet by the API
-				iaasClient.EXPECT().ListSnapshots(gomock.Any(), gomock.Any()).Return([]iaas.Snapshot{}, nil)
+				iaasClient.EXPECT().ListSnapshots(gomock.Any(), gomock.Any()).Return([]iaas.Snapshot{}, "", nil)
 				iaasClient.EXPECT().CreateSnapshot(gomock.Any(), gomock.Any()).Return(expectedSnap, nil)
 				iaasClient.EXPECT().WaitSnapshotReady(gomock.Any(), "fake-snapshot").Return(expectedSnap.Status, nil)
 				_, err := fakeCs.CreateSnapshot(context.Background(), req)
@@ -916,7 +916,7 @@ var _ = Describe("ControllerServer test", Ordered, func() {
 				}
 
 				// TODO: Again filters are not implemented yet by the API
-				iaasClient.EXPECT().ListSnapshots(gomock.Any(), gomock.Any()).Return([]iaas.Snapshot{*expectedSnap}, nil)
+				iaasClient.EXPECT().ListSnapshots(gomock.Any(), gomock.Any()).Return([]iaas.Snapshot{*expectedSnap}, "", nil)
 				iaasClient.EXPECT().WaitSnapshotReady(gomock.Any(), "fake-snapshot").Return(new("AVAILABLE"), nil)
 				_, err := fakeCs.CreateSnapshot(context.Background(), req)
 				Expect(err).ToNot(HaveOccurred())
@@ -930,7 +930,7 @@ var _ = Describe("ControllerServer test", Ordered, func() {
 					{
 						Id: new("fake-snapshot2"),
 					},
-				}, nil)
+				}, "", nil)
 				_, err := fakeCs.CreateSnapshot(context.Background(), req)
 				Expect(err).To(HaveOccurred())
 				Expect(status.Convert(err).Code()).To(Equal(codes.Internal))
@@ -943,7 +943,7 @@ var _ = Describe("ControllerServer test", Ordered, func() {
 						Id:       new("fake-snapshot"),
 						VolumeId: "something-different",
 					},
-				}, nil)
+				}, "", nil)
 				_, err := fakeCs.CreateSnapshot(context.Background(), req)
 				Expect(err).To(HaveOccurred())
 				Expect(status.Convert(err).Code()).To(Equal(codes.AlreadyExists))
@@ -1001,7 +1001,7 @@ var _ = Describe("ControllerServer test", Ordered, func() {
 				VolumeId:  "something-different",
 				Size:      new(int64(10)),
 				CreatedAt: new(snapShotCreationTime),
-			}}, nil)
+			}}, "", nil)
 			resp, err := fakeCs.ListSnapshots(context.Background(), req)
 			Expect(err).To(Not(HaveOccurred()))
 			Expect(resp.GetEntries()).Should(Equal(expectedSnapshotListResponse))

pkg/csi/blockstorage/sanity_test.go

@@ -189,7 +189,7 @@ var _ = Describe("CSI sanity test", Ordered, func() {
 			iaasClient.EXPECT().ListSnapshots(
 				gomock.Any(), // context
 				gomock.Any(), // filters
-			).DoAndReturn(func(_ context.Context, filters map[string]string) ([]iaas.Snapshot, error) {
+			).DoAndReturn(func(_ context.Context, filters map[string]string) ([]iaas.Snapshot, string, error) {
 				var snapshots []iaas.Snapshot
 
 				markerFilter := filters["Marker"]
@@ -223,14 +223,16 @@ var _ = Describe("CSI sanity test", Ordered, func() {
 					}
 				}
 
+				retToken := ""
 				if limitFilter != "" {
 					limit, _ := strconv.Atoi(limitFilter)
 
 					if limit > 0 && limit <= len(snapshots) {
 						snapshots = snapshots[:limit]
 					}
+					retToken = limitFilter
 				}
-				return snapshots, nil
+				return snapshots, retToken, nil
 			}).AnyTimes()
 
 			iaasClient.EXPECT().DeleteSnapshot(

pkg/stackit/client/iaas.go

@@ -23,7 +23,7 @@ type IaaSClient interface {
 	ListServers(ctx context.Context) (*[]iaas.Server, error)
 
 	CreateSnapshot(ctx context.Context, payload *iaas.CreateSnapshotPayload) (*iaas.Snapshot, error)
-	ListSnapshots(ctx context.Context, filters map[string]string) ([]iaas.Snapshot, error)
+	ListSnapshots(ctx context.Context, filters map[string]string) ([]iaas.Snapshot, string, error)
 	DeleteSnapshot(ctx context.Context, snapshotID string) error
 	GetSnapshot(ctx context.Context, snapshotID string) (*iaas.Snapshot, error)
 	WaitSnapshotReady(ctx context.Context, snapshotID string) (*string, error)
@@ -149,15 +149,15 @@ func (i iaasClient) CreateSnapshot(ctx context.Context, payload *iaas.CreateSnap
 	return snapshot, nil
 }
 
-func (i iaasClient) ListSnapshots(ctx context.Context, filters map[string]string) ([]iaas.Snapshot, error) {
+func (i iaasClient) ListSnapshots(ctx context.Context, filters map[string]string) ([]iaas.Snapshot, string, error) {
 	snaps, err := i.Client.ListSnapshotsInProject(ctx, i.projectID, i.region).Execute()
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 
 	filteredSnapshots := FilterSnapshots(snaps.Items, filters)
 
-	return filteredSnapshots, nil
+	return filteredSnapshots, "", nil
 }
 
 func (i iaasClient) DeleteSnapshot(ctx context.Context, snapshotID string) error {

pkg/stackit/client/iaas_test.go

@@ -177,7 +177,7 @@ var _ = Describe("Snapshot", func() {
 				Return(iaas.ApiListSnapshotsInProjectRequest{ApiService: mockIaaSClient})
 			mockIaaSClient.EXPECT().ListSnapshotsInProjectExecute(gomock.Any()).Return(mockItems, nil)
 
-			resp, err := client.ListSnapshots(context.Background(), nil)
+			resp, _, err := client.ListSnapshots(context.Background(), nil)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(resp).To(HaveLen(2))
 		})