Merge pull request #43 from Madhan-SWE/waitloop

Waitloop added for volume creation

Author: Power Cloud Robot

pkg/cloud/cloud_interface.go

@@ -22,7 +22,7 @@ type Cloud interface {
 	AttachDisk(volumeID string, nodeID string) (err error)
 	DetachDisk(volumeID string, nodeID string) (err error)
 	ResizeDisk(volumeID string, reqSize int64) (newSize int64, err error)
-	WaitForAttachmentState(volumeID, state string) error
+	WaitForVolumeState(volumeID, state string) error
 	GetDiskByName(name string) (disk *Disk, err error)
 	GetDiskByID(volumeID string) (disk *Disk, err error)
 	GetPVMInstanceByName(instanceName string) (instance *PVMInstance, err error)

pkg/cloud/powervs.go

@@ -250,6 +250,11 @@ func (p *powerVSCloud) CreateDisk(volumeName string, diskOptions *DiskOptions) (
 		return nil, err
 	}
 
+	err = p.WaitForVolumeState(*v.VolumeID, VolumeAvailableState)
+	if err != nil {
+		return nil, err
+	}
+
 	return &Disk{CapacityGiB: capacityGiB, VolumeID: *v.VolumeID, DiskType: v.DiskType, WWN: strings.ToLower(v.Wwn)}, nil
 }
 
@@ -268,7 +273,7 @@ func (p *powerVSCloud) AttachDisk(volumeID string, nodeID string) (err error) {
 		return err
 	}
 
-	err = p.WaitForAttachmentState(volumeID, VolumeInUseState)
+	err = p.WaitForVolumeState(volumeID, VolumeInUseState)
 	if err != nil {
 		return err
 	}
@@ -280,7 +285,7 @@ func (p *powerVSCloud) DetachDisk(volumeID string, nodeID string) (err error) {
 	if err != nil {
 		return err
 	}
-	err = p.WaitForAttachmentState(volumeID, VolumeAvailableState)
+	err = p.WaitForVolumeState(volumeID, VolumeAvailableState)
 	if err != nil {
 		return err
 	}
@@ -309,7 +314,7 @@ func (p *powerVSCloud) ResizeDisk(volumeID string, reqSize int64) (newSize int64
 	return int64(*v.Size), nil
 }
 
-func (p *powerVSCloud) WaitForAttachmentState(volumeID, state string) error {
+func (p *powerVSCloud) WaitForVolumeState(volumeID, state string) error {
 	err := wait.PollImmediate(PollInterval, PollTimeout, func() (bool, error) {
 		v, err := p.volClient.Get(volumeID, p.cloudInstanceID, TIMEOUT)
 		if err != nil {

tests/e2e/pre_provisioning.go

@@ -94,7 +94,7 @@ var _ = Describe("[powervs-csi-e2e]Pre-Provisioned", func() {
 	AfterEach(func() {
 		skipManuallyDeletingVolume = true
 		if !skipManuallyDeletingVolume {
-			err := cloud.WaitForAttachmentState(volumeID, "detached")
+			err := cloud.WaitForVolumeState(volumeID, "detached")
 			if err != nil {
 				Fail(fmt.Sprintf("could not detach volume %q: %v", volumeID, err))
 			}