OCPBUGS-25482: Adding PER check for BYO workspace on PowerVS

pkg/asset/installconfig/powervs/client.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/IBM-Cloud/bluemix-go/crn"
 	"github.com/IBM-Cloud/power-go-client/power/client/datacenters"
+	"github.com/IBM-Cloud/power-go-client/power/client/workspaces"
 	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/IBM/networking-go-sdk/dnsrecordsv1"
 	"github.com/IBM/networking-go-sdk/dnssvcsv1"
@@ -44,6 +45,7 @@ type API interface {
 	ListServiceInstances(ctx context.Context) ([]string, error)
 	ServiceInstanceGUIDToName(ctx context.Context, id string) (string, error)
 	GetDatacenterCapabilities(ctx context.Context, region string) (map[string]bool, error)
+	GetWorkspaceCapabilities(ctx context.Context, svcInsID string) (map[string]bool, error)
 	GetAttachedTransitGateway(ctx context.Context, svcInsID string) (string, error)
 	GetTGConnectionVPC(ctx context.Context, gatewayID string, vpcSubnetID string) (string, error)
 }
@@ -782,6 +784,16 @@ func (c *Client) GetDatacenterCapabilities(ctx context.Context, region string) (
 	return getOk.Payload.Capabilities, nil
 }
 
+// GetWorkspaceCapabilities retrieves the capabilities of the specified workspace.
+func (c *Client) GetWorkspaceCapabilities(ctx context.Context, svcInsID string) (map[string]bool, error) {
+	params := workspaces.NewV1WorkspacesGetParamsWithContext(ctx).WithWorkspaceID(svcInsID)
+	getOk, err := c.BXCli.PISession.Power.Workspaces.V1WorkspacesGet(params, c.BXCli.PISession.AuthInfo(svcInsID))
+	if err != nil {
+		return nil, fmt.Errorf("failed to get workspace capabilities: %w", err)
+	}
+	return getOk.Payload.Capabilities, nil
+}
+
 // GetAttachedTransitGateway finds an existing Transit Gateway attached to the provided PowerVS cloud instance.
 func (c *Client) GetAttachedTransitGateway(ctx context.Context, svcInsID string) (string, error) {
 	var (

pkg/asset/installconfig/powervs/validation.go

@@ -49,7 +49,7 @@ func validateMachinePool(fldPath *field.Path, machinePool *types.MachinePool) fi
 	return allErrs
 }
 
-// ValidatePERAvailability ensures the target datacenter has PER enabled.
+// ValidatePERAvailability ensures the target datacenter has PER enabled, and in BYO workspace case, the workspace also has PER available.
 func ValidatePERAvailability(client API, ic *types.InstallConfig) error {
 	capabilities, err := client.GetDatacenterCapabilities(context.TODO(), ic.PowerVS.Zone)
 	if err != nil {
@@ -64,6 +64,17 @@ func ValidatePERAvailability(client API, ic *types.InstallConfig) error {
 		return fmt.Errorf("%s is not available at: %s", per, ic.PowerVS.Zone)
 	}
 
+	svcInsID := ic.PowerVS.ServiceInstanceGUID
+	if svcInsID != "" {
+		capabilities, err = client.GetWorkspaceCapabilities(context.TODO(), svcInsID)
+		if err != nil {
+			return err
+		}
+		if !capabilities[per] {
+			return fmt.Errorf("%s is not available in workspace: %s", per, svcInsID)
+		}
+	}
+
 	return nil
 }
 

pkg/asset/installconfig/powervs/validation_test.go

@@ -134,6 +134,8 @@ var (
 	newSysType               = "s1022"
 	invalidRegion            = "foo"
 	validServiceInstanceGUID = ""
+	bogusServiceInstanceGUID = "bogus-workspace-guid"
+	validByoWorkspaceGUID    = "valid-workspace-guid"
 )
 
 func validInstallConfig() *types.InstallConfig {
@@ -509,7 +511,7 @@ func TestValidatePERAvailability(t *testing.T) {
 			errorMsg: fmt.Sprintf("power-edge-router is not available at: %s", regionWithoutPER),
 		},
 		{
-			name: "Region with PER",
+			name: "Region with PER and no BYO Workspace",
 			edits: editFunctions{
 				func(ic *types.InstallConfig) {
 					ic.Platform.PowerVS.Zone = regionWithPER
@@ -526,6 +528,26 @@ func TestValidatePERAvailability(t *testing.T) {
 			},
 			errorMsg: fmt.Sprintf("power-edge-router capability unknown at: %s", regionPERUnknown),
 		},
+		{
+			name: "Region with PER, but with invalid Workspace ID",
+			edits: editFunctions{
+				func(ic *types.InstallConfig) {
+					ic.Platform.PowerVS.Zone = regionWithPER
+					ic.Platform.PowerVS.ServiceInstanceGUID = bogusServiceInstanceGUID
+				},
+			},
+			errorMsg: fmt.Sprintf("power-edge-router is not available in workspace: %s", bogusServiceInstanceGUID),
+		},
+		{
+			name: "Region with PER and valid BYO Workspace",
+			edits: editFunctions{
+				func(ic *types.InstallConfig) {
+					ic.Platform.PowerVS.Zone = regionWithPER
+					ic.Platform.PowerVS.ServiceInstanceGUID = validByoWorkspaceGUID
+				},
+			},
+			errorMsg: "",
+		},
 	}
 	setMockEnvVars()
 
@@ -537,12 +559,20 @@ func TestValidatePERAvailability(t *testing.T) {
 	// Mocks: PER-absent region results in false
 	powervsClient.EXPECT().GetDatacenterCapabilities(gomock.Any(), regionWithoutPER).Return(mapWithPERFalse, nil)
 
-	// Mocks: PER-enabled region results in true
+	// Mocks: PER-enabled region with no BYO workspace results in true
 	powervsClient.EXPECT().GetDatacenterCapabilities(gomock.Any(), regionWithPER).Return(mapWithPERTrue, nil)
 
 	// Mocks: PER-unknown region results in false
 	powervsClient.EXPECT().GetDatacenterCapabilities(gomock.Any(), regionPERUnknown).Return(mapPERUnknown, nil)
 
+	// Mocks: PER-enabled region, but bogus Service Instance results in false
+	powervsClient.EXPECT().GetDatacenterCapabilities(gomock.Any(), regionWithPER).Return(mapWithPERTrue, nil)
+	powervsClient.EXPECT().GetWorkspaceCapabilities(gomock.Any(), bogusServiceInstanceGUID).Return(mapWithPERFalse, nil)
+
+	// Mocks: PER-enabled region with valid BYO workspace results in false
+	powervsClient.EXPECT().GetDatacenterCapabilities(gomock.Any(), regionWithPER).Return(mapWithPERTrue, nil)
+	powervsClient.EXPECT().GetWorkspaceCapabilities(gomock.Any(), validByoWorkspaceGUID).Return(mapWithPERTrue, nil)
+
 	// Run tests
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {