remove diskoffering id when creating volume from snapshot

Author: Pearl1594

deploy/k8s/snapshot-cdrs.yaml deploy/k8s/00-snapshot-crds.yamldeploy/k8s/snapshot-cdrs.yaml renamed to deploy/k8s/00-snapshot-crds.yaml

@@ -24,7 +24,7 @@ type Interface interface {
 	DetachVolume(ctx context.Context, volumeID string) error
 	ExpandVolume(ctx context.Context, volumeID string, newSizeInGB int64) error
 
-	CreateVolumeFromSnapshot(ctx context.Context, diskOfferingID, zoneID, name, domainID, projectID, snapshotID string, sizeInGB int64) (string, error)
+	CreateVolumeFromSnapshot(ctx context.Context, zoneID, name, domainID, projectID, snapshotID string, sizeInGB int64) (*Volume, error)
 	GetSnapshotByID(ctx context.Context, snapshotID ...string) (*Snapshot, error)
 	CreateSnapshot(ctx context.Context, volumeID string) (*Snapshot, error)
 	DeleteSnapshot(ctx context.Context, snapshotID string) error

pkg/cloud/cloud.go

@@ -137,8 +137,8 @@ func (f *fakeConnector) ExpandVolume(_ context.Context, volumeID string, newSize
 	return cloud.ErrNotFound
 }
 
-func (f *fakeConnector) CreateVolumeFromSnapshot(ctx context.Context, diskOfferingID, zoneID, name, domainID, projectID, snapshotID string, sizeInGB int64) (string, error) {
-	return "1", nil
+func (f *fakeConnector) CreateVolumeFromSnapshot(ctx context.Context, zoneID, name, domainID, projectID, snapshotID string, sizeInGB int64) (*cloud.Volume, error) {
+	return nil, nil
 }
 
 func (f *fakeConnector) GetSnapshotByID(ctx context.Context, snapshotID ...string) (*cloud.Snapshot, error) {

pkg/cloud/fake/fake.go

@@ -156,15 +156,14 @@ func (c *client) ExpandVolume(ctx context.Context, volumeID string, newSizeInGB
 	return nil
 }
 
-func (c *client) CreateVolumeFromSnapshot(ctx context.Context, diskOfferingID, zoneID, name, domainID, projectID, snapshotID string, sizeInGB int64) (string, error) {
+func (c *client) CreateVolumeFromSnapshot(ctx context.Context, zoneID, name, domainID, projectID, snapshotID string, sizeInGB int64) (*Volume, error) {
 	logger := klog.FromContext(ctx)
 	snapshot, _, err := c.Snapshot.GetSnapshotByID(snapshotID)
 	if err != nil {
-		return "", fmt.Errorf("failed to retrieve snapshot '%s': %w", snapshotID, err)
+		return nil, fmt.Errorf("failed to retrieve snapshot '%s': %w", snapshotID, err)
 	}
 
 	p := c.Volume.NewCreateVolumeParams()
-	p.SetDiskofferingid(diskOfferingID)
 	p.SetZoneid(zoneID)
 	if projectID != "" {
 		p.SetProjectid(projectID)
@@ -181,8 +180,20 @@ func (c *client) CreateVolumeFromSnapshot(ctx context.Context, diskOfferingID, z
 	vol, err := c.Volume.CreateVolume(p)
 	if err != nil {
 		// Handle the error accordingly
-		return "", fmt.Errorf("failed to create volume from snapshot'%s': %w", snapshotID, err)
+		return nil, fmt.Errorf("failed to create volume from snapshot'%s': %w", snapshotID, err)
+	}
+
+	v := Volume{
+		ID:               vol.Id,
+		Name:             vol.Name,
+		Size:             vol.Size,
+		DiskOfferingID:   vol.Diskofferingid,
+		DomainID:         vol.Domainid,
+		ProjectID:        vol.Projectid,
+		ZoneID:           vol.Zoneid,
+		VirtualMachineID: vol.Virtualmachineid,
+		DeviceID:         strconv.FormatInt(vol.Deviceid, 10),
 	}
 
-	return vol.Id, err
+	return &v, nil
 }

pkg/cloud/volumes.go

@@ -2,6 +2,7 @@ package driver
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"math/rand"
@@ -118,34 +119,50 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 		}
 	}
 
+	// We have to create the volume.
+
+	// Determine volume size using requested capacity range.
+	sizeInGB, err := determineSize(req)
+	if err != nil {
+		return nil, status.Error(codes.InvalidArgument, err.Error())
+	}
+
 	if snapshotID != "" {
 		logger.Info("Creating volume from snapshot", "snapshotID", snapshotID)
 		// Call the cloud connector's CreateVolumeFromSnapshot if implemented
-		volID, err := cs.connector.CreateVolumeFromSnapshot(ctx, diskOfferingID, vol.ZoneID, name, vol.DomainID, vol.ProjectID, snapshotID, vol.Size)
+		printVolumeAsJSON(req)
+		snapshot, err := cs.connector.GetSnapshotByID(ctx, snapshotID)
+		if errors.Is(err, cloud.ErrNotFound) {
+			return nil, status.Errorf(codes.NotFound, "Snapshot %v not found", snapshotID)
+		} else if err != nil {
+			// Error with CloudStack
+			return nil, status.Errorf(codes.Internal, "Error %v", err)
+		}
+		logger.Info("Disk offering ID", "diskOfferingID: ", diskOfferingID)
+		logger.Info("Zone ID", "ZoneID", snapshot.ZoneID)
+		logger.Info("Name", "name", name)
+		logger.Info("Domain ID", "DomainID", snapshot.DomainID)
+		logger.Info("Project ID", "ProjectID", snapshot.ProjectID)
+		logger.Info("Snapshot ID", "snapshotID", snapshotID)
+		logger.Info("Volume size", "Size", sizeInGB)
+		volFromSnapshot, err := cs.connector.CreateVolumeFromSnapshot(ctx, snapshot.ZoneID, name, snapshot.DomainID, snapshot.ProjectID, snapshotID, sizeInGB)
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "Cannot create volume from snapshot %s: %v", snapshotID, err.Error())
 		}
 		resp := &csi.CreateVolumeResponse{
 			Volume: &csi.Volume{
-				VolumeId:      volID,
-				CapacityBytes: vol.Size,
+				VolumeId:      volFromSnapshot.ID,
+				CapacityBytes: volFromSnapshot.Size,
 				VolumeContext: req.GetParameters(),
+				ContentSource: req.GetVolumeContentSource(),
 				AccessibleTopology: []*csi.Topology{
-					Topology{ZoneID: vol.ZoneID}.ToCSI(),
+					Topology{ZoneID: volFromSnapshot.ZoneID}.ToCSI(),
 				},
 			},
 		}
 		return resp, nil
 	}
 
-	// We have to create the volume.
-
-	// Determine volume size using requested capacity range.
-	sizeInGB, err := determineSize(req)
-	if err != nil {
-		return nil, status.Error(codes.InvalidArgument, err.Error())
-	}
-
 	// Determine zone using topology constraints.
 	var zoneID string
 	topologyRequirement := req.GetAccessibilityRequirements()
@@ -189,7 +206,7 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 			VolumeId:      volID,
 			CapacityBytes: util.GigaBytesToBytes(sizeInGB),
 			VolumeContext: req.GetParameters(),
-			// ContentSource: req.GetVolumeContentSource(), TODO: snapshot support.
+			ContentSource: req.GetVolumeContentSource(),
 			AccessibleTopology: []*csi.Topology{
 				Topology{ZoneID: zoneID}.ToCSI(),
 			},
@@ -199,6 +216,11 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 	return resp, nil
 }
 
+func printVolumeAsJSON(vol *csi.CreateVolumeRequest) {
+	b, _ := json.MarshalIndent(vol, "", "  ")
+	fmt.Println(string(b))
+}
+
 func checkVolumeSuitable(vol *cloud.Volume,
 	diskOfferingID string, capRange *csi.CapacityRange, topologyRequirement *csi.TopologyRequirement,
 ) (bool, string) {