Merge pull request #469 from yussufsh/m1

Cleanup: refactor powervs cloud to remove extra params

Author: k8s-ci-robot

pkg/cloud/powervs.go

@@ -24,9 +24,7 @@ import (
 	"time"
 
 	"github.com/IBM-Cloud/power-go-client/clients/instance"
-	"github.com/IBM-Cloud/power-go-client/errors"
 	"github.com/IBM-Cloud/power-go-client/ibmpisession"
-	"github.com/IBM-Cloud/power-go-client/power/client/p_cloud_volumes"
 	"github.com/IBM-Cloud/power-go-client/power/models"
 	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/IBM/platform-services-go-sdk/resourcecontrollerv2"
@@ -50,10 +48,6 @@ type PowerVSClient interface {
 }
 
 type powerVSCloud struct {
-	piSession *ibmpisession.IBMPISession
-
-	cloudInstanceID string
-
 	pvmInstancesClient *instance.IBMPIInstanceClient
 	volClient          *instance.IBMPIVolumeClient
 }
@@ -99,8 +93,6 @@ func newPowerVSCloud(cloudInstanceID, zone string, debug bool) (Cloud, error) {
 	pvmInstancesClient := instance.NewIBMPIInstanceClient(backgroundContext, piSession, cloudInstanceID)
 
 	return &powerVSCloud{
-		piSession:          piSession,
-		cloudInstanceID:    cloudInstanceID,
 		pvmInstancesClient: pvmInstancesClient,
 		volClient:          volClient,
 	}, nil
@@ -249,13 +241,11 @@ func (p *powerVSCloud) WaitForVolumeState(volumeID, state string) error {
 }
 
 func (p *powerVSCloud) GetDiskByName(name string) (disk *Disk, err error) {
-	//TODO: remove capacityBytes
-	params := p_cloud_volumes.NewPcloudCloudinstancesVolumesGetallParamsWithTimeout(TIMEOUT).WithCloudInstanceID(p.cloudInstanceID)
-	resp, err := p.piSession.Power.PCloudVolumes.PcloudCloudinstancesVolumesGetall(params, p.piSession.AuthInfo(p.cloudInstanceID))
+	vols, err := p.volClient.GetAll()
 	if err != nil {
-		return nil, errors.ToError(err)
+		return nil, err
 	}
-	for _, v := range resp.Payload.Volumes {
+	for _, v := range vols.Volumes {
 		if name == *v.Name {
 			return &Disk{
 				Name:        *v.Name,