fix csi tests

Author: Pearl1594

pkg/cloud/cloud.go

@@ -26,6 +26,7 @@ type Interface interface {
 
 	CreateVolumeFromSnapshot(ctx context.Context, zoneID, name, domainID, projectID, snapshotID string, sizeInGB int64) (*Volume, error)
 	GetSnapshotByID(ctx context.Context, snapshotID string) (*Snapshot, error)
+	GetSnapshotByName(ctx context.Context, name string) (*Snapshot, error)
 	CreateSnapshot(ctx context.Context, volumeID string) (*Snapshot, error)
 	DeleteSnapshot(ctx context.Context, snapshotID string) error
 }

pkg/cloud/fake/fake.go

@@ -4,6 +4,7 @@ package fake
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/hashicorp/go-uuid"
 
@@ -15,10 +16,11 @@ const zoneID = "a1887604-237c-4212-a9cd-94620b7880fa"
 const snapshotID = "9d076136-657b-4c84-b279-455da3ea484c"
 
 type fakeConnector struct {
-	node          *cloud.VM
-	snapshot      *cloud.Snapshot
-	volumesByID   map[string]cloud.Volume
-	volumesByName map[string]cloud.Volume
+	node            *cloud.VM
+	snapshot        *cloud.Snapshot
+	volumesByID     map[string]cloud.Volume
+	volumesByName   map[string]cloud.Volume
+	snapshotsByName map[string]*cloud.Snapshot
 }
 
 // New returns a new fake implementation of the
@@ -47,11 +49,16 @@ func New() cloud.Interface {
 		CreatedAt: "2025-07-07T16:13:06-0700",
 	}
 
+	snapshotsByName := map[string]*cloud.Snapshot{
+		snapshot.Name: snapshot,
+	}
+
 	return &fakeConnector{
-		node:          node,
-		snapshot:      snapshot,
-		volumesByID:   map[string]cloud.Volume{volume.ID: volume},
-		volumesByName: map[string]cloud.Volume{volume.Name: volume},
+		node:            node,
+		snapshot:        snapshot,
+		volumesByID:     map[string]cloud.Volume{volume.ID: volume},
+		volumesByName:   map[string]cloud.Volume{volume.Name: volume},
+		snapshotsByName: snapshotsByName,
 	}
 }
 
@@ -72,6 +79,9 @@ func (f *fakeConnector) ListZonesID(_ context.Context) ([]string, error) {
 }
 
 func (f *fakeConnector) GetVolumeByID(_ context.Context, volumeID string) (*cloud.Volume, error) {
+	if volumeID == "" {
+		return nil, fmt.Errorf("invalid volume ID: empty string")
+	}
 	vol, ok := f.volumesByID[volumeID]
 	if ok {
 		return &vol, nil
@@ -81,6 +91,9 @@ func (f *fakeConnector) GetVolumeByID(_ context.Context, volumeID string) (*clou
 }
 
 func (f *fakeConnector) GetVolumeByName(_ context.Context, name string) (*cloud.Volume, error) {
+	if name == "" {
+		return nil, fmt.Errorf("invalid volume name: empty string")
+	}
 	vol, ok := f.volumesByName[name]
 	if ok {
 		return &vol, nil
@@ -152,3 +165,13 @@ func (f *fakeConnector) CreateSnapshot(ctx context.Context, volumeID string) (*c
 func (f *fakeConnector) DeleteSnapshot(ctx context.Context, snapshotID string) error {
 	return nil
 }
+
+func (f *fakeConnector) GetSnapshotByName(_ context.Context, name string) (*cloud.Snapshot, error) {
+	if name == "" {
+		return nil, fmt.Errorf("invalid snapshot name: empty string")
+	}
+	if snap, ok := f.snapshotsByName[name]; ok {
+		return snap, nil
+	}
+	return nil, cloud.ErrNotFound
+}

pkg/cloud/snapshots.go

@@ -81,3 +81,40 @@ func (c *client) DeleteSnapshot(ctx context.Context, snapshotID string) error {
 
 	return err
 }
+
+func (c *client) GetSnapshotByName(ctx context.Context, name string) (*Snapshot, error) {
+	logger := klog.FromContext(ctx)
+	if name == "" {
+		return nil, ErrNotFound
+	}
+	p := c.Snapshot.NewListSnapshotsParams()
+	p.SetName(name)
+	if c.projectID != "" {
+		p.SetProjectid(c.projectID)
+	}
+	logger.V(2).Info("CloudStack API call", "command", "ListSnapshots", "params", map[string]string{
+		"name":      name,
+		"projectid": c.projectID,
+	})
+	l, err := c.Snapshot.ListSnapshots(p)
+	if err != nil {
+		return nil, err
+	}
+	if l.Count == 0 {
+		return nil, ErrNotFound
+	}
+	if l.Count > 1 {
+		return nil, ErrTooManyResults
+	}
+	snapshot := l.Snapshots[0]
+	s := Snapshot{
+		ID:        snapshot.Id,
+		Name:      snapshot.Name,
+		DomainID:  snapshot.Domainid,
+		ProjectID: snapshot.Projectid,
+		ZoneID:    snapshot.Zoneid,
+		VolumeID:  snapshot.Volumeid,
+		CreatedAt: snapshot.Created,
+	}
+	return &s, nil
+}

pkg/driver/controller.go

@@ -328,11 +328,32 @@ func (cs *controllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 func (cs *controllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
 	klog.V(4).Infof("CreateSnapshot")
 
+	if req.GetName() == "" {
+		return nil, status.Error(codes.InvalidArgument, "Snapshot name missing in request")
+	}
+
 	volumeID := req.GetSourceVolumeId()
+	if volumeID == "" {
+		return nil, status.Error(codes.InvalidArgument, "SourceVolumeId missing in request")
+	}
+
+	// Check for existing snapshot with same name but different source volume ID
+	if req.GetName() != "" {
+		// check if the name matches and volumeID differs
+		existingSnap, err := cs.connector.GetSnapshotByName(ctx, req.GetName())
+		if err == nil && existingSnap.VolumeID != volumeID {
+			return nil, status.Errorf(codes.AlreadyExists, "Snapshot with name %s already exists for a different source volume", req.GetName())
+		}
+	}
+
 	volume, err := cs.connector.GetVolumeByID(ctx, volumeID)
-	if errors.Is(err, cloud.ErrNotFound) {
-		return nil, status.Errorf(codes.NotFound, "Volume %v not found", volumeID)
-	} else if err != nil {
+	if err != nil {
+		if err.Error() == "invalid volume ID: empty string" {
+			return nil, status.Error(codes.InvalidArgument, "Invalid volume ID")
+		}
+		if errors.Is(err, cloud.ErrNotFound) {
+			return nil, status.Errorf(codes.NotFound, "Volume %v not found", volumeID)
+		}
 		// Error with CloudStack
 		return nil, status.Errorf(codes.Internal, "Error %v", err)
 	}
@@ -363,6 +384,11 @@ func (cs *controllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
 
 }
 
+func (cs *controllerServer) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {
+	// Stub implementation: returns an empty list
+	return &csi.ListSnapshotsResponse{Entries: []*csi.ListSnapshotsResponse_Entry{}}, nil
+}
+
 func (cs *controllerServer) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshotRequest) (*csi.DeleteSnapshotResponse, error) {
 	snapshotID := req.GetSnapshotId()