IBM-Cloud
diff --git a/‎.github/workflows/go.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/go.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎clients/instance/ibm-pi-instance-networks.go‎
Lines changed: 57 additions & 0 deletions b/‎clients/instance/ibm-pi-instance-networks.go‎
Lines changed: 57 additions & 0 deletions
diff --git a/‎clients/instance/ibm-pi-vpmem.go‎
Lines changed: 77 additions & 0 deletions b/‎clients/instance/ibm-pi-vpmem.go‎
Lines changed: 77 additions & 0 deletions
diff --git a/‎clients/instance/ibm-pi-workspaces.go‎
Lines changed: 2 additions & 2 deletions b/‎clients/instance/ibm-pi-workspaces.go‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎ibmpisession/session.go‎
Lines changed: 11 additions & 0 deletions b/‎ibmpisession/session.go‎
Lines changed: 11 additions & 0 deletions
@@ -38,4 +38,4 @@ jobs:
         run: go test -v `go list ./... | grep -v '/power/' | grep -v examples`
 
       - name: Coverage
-        run: go test `go list ./... | grep -v '/power/' | grep -v examples` -coverprofile=profile.cov && go tool cover -func profile.cov
+        run: go test `go list ./... | grep -v '/power/' | grep -v examples` -coverprofile=profile.cov && go tool cover -func profile.cov
@@ -0,0 +1,57 @@
+package instance
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/IBM-Cloud/power-go-client/helpers"
+	"github.com/IBM-Cloud/power-go-client/ibmpisession"
+	pvmclient "github.com/IBM-Cloud/power-go-client/power/client/p_cloud_p_vm_instances"
+	"github.com/IBM-Cloud/power-go-client/power/models"
+)
+
+// Instance-scoped networks under a PVM:
+type IBMPIInstanceNetworksClient struct {
+	IBMPIClient
+}
+
+func NewIBMPIInstanceNetworksClient(ctx context.Context, sess *ibmpisession.IBMPISession, cloudInstanceID string) *IBMPIInstanceNetworksClient {
+	return &IBMPIInstanceNetworksClient{*NewIBMPIClient(ctx, sess, cloudInstanceID)}
+}
+
+// GetAll returns the wrapper that contains all networks on a PVM instance.
+func (c *IBMPIInstanceNetworksClient) GetAll(pvmInstanceID string) (*models.PVMInstanceNetworks, error) {
+	params := pvmclient.NewPcloudPvminstancesNetworksGetallParams().
+		WithContext(c.ctx).
+		WithTimeout(helpers.PIGetTimeOut).
+		WithCloudInstanceID(c.cloudInstanceID).
+		WithPvmInstanceID(pvmInstanceID)
+
+	resp, err := c.session.Power.PCloudpVMInstances.PcloudPvminstancesNetworksGetall(params, c.session.AuthInfo(c.cloudInstanceID))
+	if err != nil {
+		return nil, ibmpisession.SDKFailWithAPIError(err, fmt.Errorf("failed to get networks for pvm instance %s: %w", pvmInstanceID, err))
+	}
+	if resp == nil || resp.Payload == nil {
+		return nil, fmt.Errorf("failed to get networks for pvm instance %s", pvmInstanceID)
+	}
+	return resp.Payload, nil
+}
+
+// Get returns the wrapper for a specific network on a PVM instance.
+func (c *IBMPIInstanceNetworksClient) Get(pvmInstanceID, networkID string) (*models.PVMInstanceNetworks, error) {
+	params := pvmclient.NewPcloudPvminstancesNetworksGetParams().
+		WithContext(c.ctx).
+		WithTimeout(helpers.PIGetTimeOut).
+		WithCloudInstanceID(c.cloudInstanceID).
+		WithPvmInstanceID(pvmInstanceID).
+		WithNetworkID(networkID)
+
+	resp, err := c.session.Power.PCloudpVMInstances.PcloudPvminstancesNetworksGet(params, c.session.AuthInfo(c.cloudInstanceID))
+	if err != nil {
+		return nil, ibmpisession.SDKFailWithAPIError(err, fmt.Errorf("failed to get network %s for pvm instance %s: %w", networkID, pvmInstanceID, err))
+	}
+	if resp == nil || resp.Payload == nil {
+		return nil, fmt.Errorf("failed to get network %s for pvm instance %s", networkID, pvmInstanceID)
+	}
+	return resp.Payload, nil
+}
@@ -0,0 +1,77 @@
+package instance
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/IBM-Cloud/power-go-client/helpers"
+	"github.com/IBM-Cloud/power-go-client/ibmpisession"
+	"github.com/IBM-Cloud/power-go-client/power/client/p_cloud_v_p_mem_volumes"
+	"github.com/IBM-Cloud/power-go-client/power/models"
+)
+
+// IBMPIVPMEMClient
+type IBMPIVPMEMClient struct {
+	IBMPIClient
+}
+
+// NewIBMPIVPMEMClient
+func NewIBMPIVPMEMClient(ctx context.Context, sess *ibmpisession.IBMPISession, cloudInstanceID string) *IBMPIVPMEMClient {
+	return &IBMPIVPMEMClient{
+		*NewIBMPIClient(ctx, sess, cloudInstanceID),
+	}
+}
+
+// PvmInstance create VPMEM volumes
+func (f *IBMPIVPMEMClient) CreatePvmVpmemVolumes(pvminstanceID string, body *models.VPMemVolumeAttach) (*models.VPMemVolumes, error) {
+	params := p_cloud_v_p_mem_volumes.NewPcloudPvminstancesVpmemVolumesPostParams().WithContext(f.ctx).
+		WithTimeout(helpers.PICreateTimeOut).WithCloudInstanceID(f.cloudInstanceID).WithPvmInstanceID(pvminstanceID).
+		WithBody(body)
+	resp, err := f.session.Power.PCloudvpMemVolumes.PcloudPvminstancesVpmemVolumesPost(params, f.session.AuthInfo(f.cloudInstanceID))
+	if err != nil {
+		return nil, ibmpisession.SDKFailWithAPIError(err, fmt.Errorf("failed to create a VPMEM volumes for pvminstance %s in %s with %w", pvminstanceID, f.cloudInstanceID, err))
+	}
+	if resp == nil || resp.Payload == nil {
+		return nil, fmt.Errorf("failed to create a VPMEM volumes for pvminstance %s in %s", pvminstanceID, f.cloudInstanceID)
+	}
+	return resp.Payload, nil
+}
+
+// PvmInstance get VPMEM volume
+func (f *IBMPIVPMEMClient) GetPvmVpmemVolume(pvminstanceID, vpmemVolumeID string) (*models.VPMemVolumeReference, error) {
+	params := p_cloud_v_p_mem_volumes.NewPcloudPvminstancesVpmemVolumesGetParams().WithContext(f.ctx).WithTimeout(helpers.PIGetTimeOut).
+		WithCloudInstanceID(f.cloudInstanceID).WithPvmInstanceID(pvminstanceID).WithVpmemVolumeID(vpmemVolumeID)
+	resp, err := f.session.Power.PCloudvpMemVolumes.PcloudPvminstancesVpmemVolumesGet(params, f.session.AuthInfo(f.cloudInstanceID))
+	if err != nil {
+		return nil, ibmpisession.SDKFailWithAPIError(err, fmt.Errorf("failed to get VPMEM volume %s for pvminstance %s in %s with %w", vpmemVolumeID, pvminstanceID, f.cloudInstanceID, err))
+	}
+	if resp == nil || resp.Payload == nil {
+		return nil, fmt.Errorf("failed to get VPMEM volume %s for pvminstance %s in %s", vpmemVolumeID, pvminstanceID, f.cloudInstanceID)
+	}
+	return resp.Payload, nil
+}
+
+// PvmInstance delete VPMEM volume
+func (f *IBMPIVPMEMClient) DeletePvmVpmemVolume(pvminstanceID, vpmemVolumeID string) error {
+	params := p_cloud_v_p_mem_volumes.NewPcloudPvminstancesVpmemVolumesDeleteParams().WithContext(f.ctx).
+		WithTimeout(helpers.PIDeleteTimeOut).WithCloudInstanceID(f.cloudInstanceID).WithPvmInstanceID(pvminstanceID).WithVpmemVolumeID(vpmemVolumeID)
+	_, err := f.session.Power.PCloudvpMemVolumes.PcloudPvminstancesVpmemVolumesDelete(params, f.session.AuthInfo(f.cloudInstanceID))
+	if err != nil {
+		return fmt.Errorf("failed to delete VPMEM volume %s for pvminstance %s in %s :%w", vpmemVolumeID, pvminstanceID, f.cloudInstanceID, err)
+	}
+	return nil
+}
+
+// PvmInstance get all VPMEM volumes
+func (f *IBMPIVPMEMClient) GetAllPvmVpmemVolumes(pvminstanceID string) (*models.VPMemVolumes, error) {
+	params := p_cloud_v_p_mem_volumes.NewPcloudPvminstancesVpmemVolumesGetallParams().WithContext(f.ctx).
+		WithTimeout(helpers.PIGetTimeOut).WithCloudInstanceID(f.cloudInstanceID).WithPvmInstanceID(pvminstanceID)
+	resp, err := f.session.Power.PCloudvpMemVolumes.PcloudPvminstancesVpmemVolumesGetall(params, f.session.AuthInfo(f.cloudInstanceID))
+	if err != nil {
+		return nil, ibmpisession.SDKFailWithAPIError(err, fmt.Errorf("failed to get VPMEM volumes for pvminstance %s in %s with %w", pvminstanceID, f.cloudInstanceID, err))
+	}
+	if resp == nil || resp.Payload == nil {
+		return nil, fmt.Errorf("failed to get VPMEM volumes for pvminstance %s in %s", pvminstanceID, f.cloudInstanceID)
+	}
+	return resp.Payload, nil
+}
@@ -45,7 +45,7 @@ func (f *IBMPIWorkspacesClient) Get(cloudInstanceID string) (*models.Workspace,
 		return nil, fmt.Errorf(helpers.NotOnPremSupported)
 	}
 	params := workspaces.NewV1WorkspacesGetParams().WithContext(f.ctx).WithTimeout(helpers.PIGetTimeOut).WithWorkspaceID(cloudInstanceID)
-	resp, err := f.session.Power.Workspaces.V1WorkspacesGet(params, f.session.AuthInfo(f.cloudInstanceID))
+	resp, err := f.session.Power.Workspaces.V1WorkspacesGet(params, f.session.AuthInfoV2())
 	if err != nil {
 		return nil, ibmpisession.SDKFailWithAPIError(err, fmt.Errorf(errors.GetWorkspaceOperationFailed, f.cloudInstanceID, err))
 	}
@@ -61,7 +61,7 @@ func (f *IBMPIWorkspacesClient) GetAll() (*models.Workspaces, error) {
 		return nil, fmt.Errorf(helpers.NotOnPremSupported)
 	}
 	params := workspaces.NewV1WorkspacesGetallParams().WithContext(f.ctx).WithTimeout(helpers.PIGetTimeOut)
-	resp, err := f.session.Power.Workspaces.V1WorkspacesGetall(params, f.session.AuthInfo(f.cloudInstanceID))
+	resp, err := f.session.Power.Workspaces.V1WorkspacesGetall(params, f.session.AuthInfoV2())
 	if err != nil {
 		return nil, ibmpisession.SDKFailWithAPIError(err, fmt.Errorf("failed to Get all Workspaces: %w", err))
 	}
 
@@ -125,6 +125,17 @@ func (s *IBMPISession) AuthInfo(cloudInstanceID string) runtime.ClientAuthInfoWr
 	})
 }
 
+// AuthInfoV2 only set Authorization since some apis do not require CRN in the header
+func (s *IBMPISession) AuthInfoV2() runtime.ClientAuthInfoWriter {
+	return runtime.ClientAuthInfoWriterFunc(func(r runtime.ClientRequest, _ strfmt.Registry) error {
+		auth, err := fetchAuthorizationData(s.Options.Authenticator)
+		if err != nil {
+			return err
+		}
+		return r.SetHeaderParam("Authorization", auth)
+	})
+}
+
 // IsOnPrem returns true if the operation is being done on premise (at a satellite region)
 func (s *IBMPISession) IsOnPrem() bool {
 	return strings.Contains(s.Options.Zone, helpers.PIStratosRegionPrefix)
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func (f IBMPIWorkspacesClient) Get(cloudInstanceID string) (models.Workspace,`
`45`	`45`	`return nil, fmt.Errorf(helpers.NotOnPremSupported)`
`46`	`46`	`}`
`47`	`47`	`params := workspaces.NewV1WorkspacesGetParams().WithContext(f.ctx).WithTimeout(helpers.PIGetTimeOut).WithWorkspaceID(cloudInstanceID)`
`48`		`- resp, err := f.session.Power.Workspaces.V1WorkspacesGet(params, f.session.AuthInfo(f.cloudInstanceID))`
	`48`	`+ resp, err := f.session.Power.Workspaces.V1WorkspacesGet(params, f.session.AuthInfoV2())`
`49`	`49`	`if err != nil {`
`50`	`50`	`return nil, ibmpisession.SDKFailWithAPIError(err, fmt.Errorf(errors.GetWorkspaceOperationFailed, f.cloudInstanceID, err))`
`51`	`51`	`}`
`@@ -61,7 +61,7 @@ func (f IBMPIWorkspacesClient) GetAll() (models.Workspaces, error) {`
`61`	`61`	`return nil, fmt.Errorf(helpers.NotOnPremSupported)`
`62`	`62`	`}`
`63`	`63`	`params := workspaces.NewV1WorkspacesGetallParams().WithContext(f.ctx).WithTimeout(helpers.PIGetTimeOut)`
`64`		`- resp, err := f.session.Power.Workspaces.V1WorkspacesGetall(params, f.session.AuthInfo(f.cloudInstanceID))`
	`64`	`+ resp, err := f.session.Power.Workspaces.V1WorkspacesGetall(params, f.session.AuthInfoV2())`
`65`	`65`	`if err != nil {`
`66`	`66`	`return nil, ibmpisession.SDKFailWithAPIError(err, fmt.Errorf("failed to Get all Workspaces: %w", err))`
`67`	`67`	`}`