[DataSource] [Resource] Add Software Tier support for data sources and resources (IBM-Cloud#6321)

* [DataSource] [Resource] Add Software Tier support for data sources and resources

* Update Attr_SupportedSoftwareTiers name

Author: ismirlia

ibm/provider/provider.go

@@ -758,6 +758,7 @@ func Provider() *schema.Provider {
 			"ibm_pi_sap_profiles":                           power.DataSourceIBMPISAPProfiles(),
 			"ibm_pi_shared_processor_pool":                  power.DataSourceIBMPISharedProcessorPool(),
 			"ibm_pi_shared_processor_pools":                 power.DataSourceIBMPISharedProcessorPools(),
+			"ibm_pi_software_tiers":                         power.DataSourceIBMPISoftwareTiers(),
 			"ibm_pi_spp_placement_group":                    power.DataSourceIBMPISPPPlacementGroup(),
 			"ibm_pi_spp_placement_groups":                   power.DataSourceIBMPISPPPlacementGroups(),
 			"ibm_pi_storage_pool_capacity":                  power.DataSourceIBMPIStoragePoolCapacity(),

ibm/service/power/data_source_ibm_pi_instance.go

@@ -262,6 +262,11 @@ func DataSourceIBMPIInstance() *schema.Resource {
 							Description: "Virtual serial number.",
 							Type:        schema.TypeString,
 						},
+						Attr_SoftwareTier: {
+							Computed:    true,
+							Description: "Software tier.",
+							Type:        schema.TypeString,
+						},
 					},
 				},
 				Type: schema.TypeList,

ibm/service/power/data_source_ibm_pi_instances.go

@@ -243,6 +243,11 @@ func DataSourceIBMPIInstances() *schema.Resource {
 										Description: "Virtual serial number.",
 										Type:        schema.TypeString,
 									},
+									Attr_SoftwareTier: {
+										Computed:    true,
+										Description: "Software tier.",
+										Type:        schema.TypeString,
+									},
 								},
 							},
 							Type: schema.TypeList,

ibm/service/power/data_source_ibm_pi_software_tiers.go

@@ -0,0 +1,86 @@
+// Copyright IBM Corp. 2025 All Rights Reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package power
+
+import (
+	"context"
+
+	"github.com/IBM-Cloud/power-go-client/clients/instance"
+	"github.com/IBM-Cloud/power-go-client/power/models"
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
+	"github.com/hashicorp/go-uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+func DataSourceIBMPISoftwareTiers() *schema.Resource {
+	return &schema.Resource{
+		ReadContext: dataSourceIBMPISoftwareTiersRead,
+		Schema: map[string]*schema.Schema{
+			// Arguments
+			Arg_CloudInstanceID: {
+				Description:  "The GUID of the service instance associated with an account.",
+				Required:     true,
+				Type:         schema.TypeString,
+				ValidateFunc: validation.NoZeroValues,
+			},
+
+			// Attributes
+			Attr_SupportedSoftwareTiers: {
+				Computed:    true,
+				Description: "List of supported software tiers (IBMi licensing).",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						Attr_SupportedSystems: {
+							Computed:    true,
+							Description: "List of supported systems.",
+							Elem:        schema.TypeString,
+							Type:        schema.TypeList,
+						},
+						Attr_SoftwareTier: {
+							Computed:    true,
+							Description: "Software tier.",
+							Type:        schema.TypeString,
+						},
+					},
+				},
+				Type: schema.TypeList,
+			},
+		},
+	}
+}
+
+func dataSourceIBMPISoftwareTiersRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	sess, err := meta.(conns.ClientSession).IBMPISession()
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
+
+	client := instance.NewIBMPIVSNClient(ctx, sess, cloudInstanceID)
+	tiers, err := client.GetAllSoftwareTiers()
+	if err != nil {
+		return diag.Errorf("error on GET of virtual serial number software tiers: %v", err)
+	}
+
+	var genID, _ = uuid.GenerateUUID()
+	d.SetId(genID)
+	d.Set(Attr_SupportedSoftwareTiers, flattenSoftwareTiers(tiers))
+
+	return nil
+}
+
+func flattenSoftwareTiers(tiers models.SupportedSoftwareTierList) []map[string]interface{} {
+	result := []map[string]interface{}{}
+	for _, tier := range tiers {
+		t := map[string]interface{}{
+			Attr_SupportedSystems: tier.SupportedSystems,
+			Attr_SoftwareTier:     tier.Tier,
+		}
+		result = append(result, t)
+	}
+	return result
+}

ibm/service/power/data_source_ibm_pi_software_tiers_test.go

@@ -0,0 +1,34 @@
+// Copyright IBM Corp. 2022 All Rights Reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package power_test
+
+import (
+	"fmt"
+	"testing"
+
+	acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccIBMPISoftwareTiersDataSourceBasic(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { acc.TestAccPreCheck(t) },
+		Providers: acc.TestAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckIBMPISoftwareTiersDataSourceConfig(),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("data.ibm_pi_software_tiers.test", "id"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckIBMPISoftwareTiersDataSourceConfig() string {
+	return fmt.Sprintf(`
+		data "ibm_pi_software_tiers" "test" {
+			pi_cloud_instance_id = "%s"
+		}`, acc.Pi_cloud_instance_id)
+}

ibm/service/power/data_source_ibm_pi_virtual_serial_number.go

@@ -43,6 +43,11 @@ func DataSourceIBMPIVirtualSerialNumber() *schema.Resource {
 				Description: "ID of PVM instance virtual serial number is attached to.",
 				Type:        schema.TypeString,
 			},
+			Attr_SoftwareTier: {
+				Computed:    true,
+				Description: "Software tier for virtual serial number.",
+				Type:        schema.TypeString,
+			},
 		},
 	}
 }
@@ -68,6 +73,9 @@ func dataSourceIBMPIVirtualSerialNumberRead(ctx context.Context, d *schema.Resou
 	if virtualSerialNumberData.PvmInstanceID != nil {
 		d.Set(Attr_InstanceID, virtualSerialNumberData.PvmInstanceID)
 	}
+	if virtualSerialNumberData.SoftwareTier != "" {
+		d.Set(Attr_SoftwareTier, virtualSerialNumberData.SoftwareTier)
+	}
 
 	return nil
 }

ibm/service/power/data_source_ibm_pi_virtual_serial_numbers.go

@@ -52,6 +52,11 @@ func DataSourceIBMPIVirtualSerialNumbers() *schema.Resource {
 							Description: "Virtual Serial Number.",
 							Type:        schema.TypeString,
 						},
+						Attr_SoftwareTier: {
+							Computed:    true,
+							Description: "Software tier for virtual serial number.",
+							Type:        schema.TypeString,
+						},
 					},
 				},
 				Type: schema.TypeList,
@@ -86,6 +91,7 @@ func dataSourceIBMPIVirtualSerialNumbersRead(ctx context.Context, d *schema.Reso
 		v[Attr_Description] = vsn.Description
 		v[Attr_InstanceID] = vsn.PvmInstanceID
 		v[Attr_Serial] = vsn.Serial
+		v[Attr_SoftwareTier] = vsn.SoftwareTier
 		vsnMapList = append(vsnMapList, v)
 	}
 

ibm/service/power/ibm_pi_constants.go

@@ -137,6 +137,7 @@ const (
 	Arg_SnapshotID                           = "pi_snapshot_id"
 	Arg_SnapShotName                         = "pi_snap_shot_name"
 	Arg_SnapshotName                         = "pi_snapshot_name"
+	Arg_SoftwareTier                         = "pi_software_tier"
 	Arg_SourceCRN                            = "pi_source_crn"
 	Arg_SourcePort                           = "pi_source_port"
 	Arg_SourcePorts                          = "pi_source_ports"
@@ -435,6 +436,7 @@ const (
 	Attr_SharedProcessorPools            = "shared_processor_pools"
 	Attr_Size                            = "size"
 	Attr_SnapshotID                      = "snapshot_id"
+	Attr_SoftwareTier                    = "software_tier"
 	Attr_Source                          = "source"
 	Attr_SourceChecksum                  = "source_checksum"
 	Attr_SourceIP                        = "source_ip"
@@ -462,6 +464,7 @@ const (
 	Attr_StoragePoolsCapacity            = "storage_pools_capacity"
 	Attr_StorageType                     = "storage_type"
 	Attr_StorageTypesCapacity            = "storage_types_capacity"
+	Attr_SupportedSoftwareTiers          = "supported_software_tiers"
 	Attr_SupportedSystems                = "supported_systems"
 	Attr_Synchronized                    = "synchronized"
 	Attr_SynchronousReplication          = "synchronous_replication"