@@ -33,10 +33,12 @@ import (
3333 "github.com/IBM-Cloud/power-go-client/errors"
3434 "github.com/IBM-Cloud/power-go-client/ibmpisession"
3535 "github.com/IBM-Cloud/power-go-client/power/client/p_cloud_volumes"
36+ "github.com/IBM-Cloud/power-go-client/power/models"
3637 "github.com/davecgh/go-spew/spew"
3738 "github.com/golang-jwt/jwt"
3839 "github.com/ppc64le-cloud/powervs-csi-driver/pkg/util"
3940 "k8s.io/apimachinery/pkg/util/wait"
41+ "k8s.io/utils/pointer"
4042)
4143
4244var _ Cloud = & powerVSCloud {}
@@ -171,14 +173,15 @@ func newPowerVSCloud(cloudInstanceID string, debug bool) (Cloud, error) {
171173 if err != nil {
172174 return nil , err
173175 }
174- piSession , err := ibmpisession .New (bxSess .Config .IAMAccessToken , region , debug , TIMEOUT , user .Account , zone )
176+ piSession , err := ibmpisession .New (bxSess .Config .IAMAccessToken , region , debug , user .Account , zone )
175177 if err != nil {
176178 return nil , err
177179 }
178180
179- volClient := instance .NewIBMPIVolumeClient (piSession , cloudInstanceID )
180- pvmInstancesClient := instance .NewIBMPIInstanceClient (context .Background (), piSession , cloudInstanceID )
181- imageClient := instance .NewIBMPIImageClient (piSession , cloudInstanceID )
181+ backgroundContext := context .Background ()
182+ volClient := instance .NewIBMPIVolumeClient (backgroundContext , piSession , cloudInstanceID )
183+ pvmInstancesClient := instance .NewIBMPIInstanceClient (backgroundContext , piSession , cloudInstanceID )
184+ imageClient := instance .NewIBMPIImageClient (backgroundContext , piSession , cloudInstanceID )
182185
183186 return & powerVSCloud {
184187 bxSess : bxSess ,
@@ -222,7 +225,7 @@ func (p *powerVSCloud) GetPVMInstanceByID(instanceID string) (*PVMInstance, erro
222225}
223226
224227func (p * powerVSCloud ) GetImageByID (imageID string ) (* PVMImage , error ) {
225- image , err := p .imageClient .Get (imageID , p . cloudInstanceID )
228+ image , err := p .imageClient .Get (imageID )
226229 if err != nil {
227230 return nil , err
228231 }
@@ -246,7 +249,14 @@ func (p *powerVSCloud) CreateDisk(volumeName string, diskOptions *DiskOptions) (
246249 return nil , fmt .Errorf ("invalid PowerVS VolumeType %q" , diskOptions .VolumeType )
247250 }
248251
249- v , err := p .volClient .Create (volumeName , float64 (capacityGiB ), volumeType , diskOptions .Shareable , p .cloudInstanceID , TIMEOUT )
252+ dataVolume := & models.CreateDataVolume {
253+ Name : & volumeName ,
254+ Size : pointer .Float64Ptr (float64 (capacityGiB )),
255+ Shareable : & diskOptions .Shareable ,
256+ DiskType : volumeType ,
257+ }
258+
259+ v , err := p .volClient .CreateVolume (dataVolume )
250260 if err != nil {
251261 return nil , err
252262 }
@@ -260,7 +270,7 @@ func (p *powerVSCloud) CreateDisk(volumeName string, diskOptions *DiskOptions) (
260270}
261271
262272func (p * powerVSCloud ) DeleteDisk (volumeID string ) (success bool , err error ) {
263- err = p .volClient .DeleteVolume (volumeID , p . cloudInstanceID , TIMEOUT )
273+ err = p .volClient .DeleteVolume (volumeID )
264274 if err != nil {
265275 return false , err
266276 }
@@ -269,7 +279,7 @@ func (p *powerVSCloud) DeleteDisk(volumeID string) (success bool, err error) {
269279}
270280
271281func (p * powerVSCloud ) AttachDisk (volumeID string , nodeID string ) (err error ) {
272- _ , err = p .volClient .Attach (nodeID , volumeID , p . cloudInstanceID , TIMEOUT )
282+ err = p .volClient .Attach (nodeID , volumeID )
273283 if err != nil {
274284 return err
275285 }
@@ -282,7 +292,7 @@ func (p *powerVSCloud) AttachDisk(volumeID string, nodeID string) (err error) {
282292}
283293
284294func (p * powerVSCloud ) DetachDisk (volumeID string , nodeID string ) (err error ) {
285- _ , err = p .volClient .Detach (nodeID , volumeID , p . cloudInstanceID , TIMEOUT )
295+ err = p .volClient .Detach (nodeID , volumeID )
286296 if err != nil {
287297 return err
288298 }
@@ -294,7 +304,7 @@ func (p *powerVSCloud) DetachDisk(volumeID string, nodeID string) (err error) {
294304}
295305
296306func (p * powerVSCloud ) IsAttached (volumeID string , nodeID string ) (attached bool , err error ) {
297- _ , err = p .volClient .CheckVolumeAttach (p . cloudInstanceID , nodeID , volumeID , TIMEOUT )
307+ _ , err = p .volClient .CheckVolumeAttach (nodeID , volumeID )
298308 if err != nil {
299309 return false , err
300310 }
@@ -308,7 +318,14 @@ func (p *powerVSCloud) ResizeDisk(volumeID string, reqSize int64) (newSize int64
308318 }
309319
310320 capacityGiB := util .BytesToGiB (reqSize )
311- v , err := p .volClient .Update (volumeID , disk .Name , float64 (capacityGiB ), disk .Shareable , p .cloudInstanceID , TIMEOUT )
321+
322+ dataVolume := & models.UpdateVolume {
323+ Name : & disk .Name ,
324+ Size : float64 (capacityGiB ),
325+ Shareable : & disk .Shareable ,
326+ }
327+
328+ v , err := p .volClient .UpdateVolume (volumeID , dataVolume )
312329 if err != nil {
313330 return 0 , err
314331 }
@@ -317,7 +334,7 @@ func (p *powerVSCloud) ResizeDisk(volumeID string, reqSize int64) (newSize int64
317334
318335func (p * powerVSCloud ) WaitForVolumeState (volumeID , state string ) error {
319336 err := wait .PollImmediate (PollInterval , PollTimeout , func () (bool , error ) {
320- v , err := p .volClient .Get (volumeID , p . cloudInstanceID , TIMEOUT )
337+ v , err := p .volClient .Get (volumeID )
321338 if err != nil {
322339 return false , err
323340 }
@@ -354,7 +371,7 @@ func (p *powerVSCloud) GetDiskByName(name string) (disk *Disk, err error) {
354371}
355372
356373func (p * powerVSCloud ) GetDiskByID (volumeID string ) (disk * Disk , err error ) {
357- v , err := p .volClient .Get (volumeID , p . cloudInstanceID , TIMEOUT )
374+ v , err := p .volClient .Get (volumeID )
358375 if err != nil {
359376 if strings .Contains (err .Error (), "Resource not found" ) {
360377 return nil , ErrNotFound
0 commit comments