[R] Volume Group

Author: michaelkad

go.mod

@@ -5,7 +5,7 @@ go 1.24.2
 require (
 	github.com/IBM-Cloud/bluemix-go v0.0.0-20250324085928-caa6511f0c13
 	github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113
-	github.com/IBM-Cloud/power-go-client v1.12.0
+	github.com/IBM-Cloud/power-go-client v1.13.0-beta9
 	github.com/IBM/appconfiguration-go-admin-sdk v0.4.4
 	github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f
 	github.com/IBM/cloud-databases-go-sdk v0.8.0

go.sum

@@ -96,6 +96,10 @@ github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae2311
 github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113/go.mod h1:xUQL9SGAjoZFd4GNjrjjtEpjpkgU7RFXRyHesbKTjiY=
 github.com/IBM-Cloud/power-go-client v1.12.0 h1:tF9Mq5GLYHebpzQT6IYB89lIxEST1E9teuchjxSAaw0=
 github.com/IBM-Cloud/power-go-client v1.12.0/go.mod h1:SpTK1ttW8bfMNUVQS8qOEuWn2KOkzaCLyzfze8MG1JE=
+github.com/IBM-Cloud/power-go-client v1.13.0-beta8 h1:SU7ZW9oxBZgvGzcu8oCyzmn6hHSeDHy0WeUnU6omiFA=
+github.com/IBM-Cloud/power-go-client v1.13.0-beta8/go.mod h1:SpTK1ttW8bfMNUVQS8qOEuWn2KOkzaCLyzfze8MG1JE=
+github.com/IBM-Cloud/power-go-client v1.13.0-beta9 h1:RYwG71ucJGr3FHoPpFgBx8ak6pVwiEgRg3W/u9HxgTM=
+github.com/IBM-Cloud/power-go-client v1.13.0-beta9/go.mod h1:SpTK1ttW8bfMNUVQS8qOEuWn2KOkzaCLyzfze8MG1JE=
 github.com/IBM-Cloud/softlayer-go v1.0.5-tf h1:koUAyF9b6X78lLLruGYPSOmrfY2YcGYKOj/Ug9nbKNw=
 github.com/IBM-Cloud/softlayer-go v1.0.5-tf/go.mod h1:6HepcfAXROz0Rf63krk5hPZyHT6qyx2MNvYyHof7ik4=
 github.com/IBM/appconfiguration-go-admin-sdk v0.4.4 h1:VQ+mVavoo3/xrBaVSyxE+B6Uef+m33RcbropwpTRBy4=

ibm/service/power/data_source_ibm_pi_network_peers.go

@@ -93,9 +93,6 @@ func dataSourceIBMPINetworkPeersRead(ctx context.Context, d *schema.ResourceData
 
 func dataSourceIBMPINetworkPeersNetworkPeerToMap(np *models.NetworkPeer) map[string]interface{} {
 	npMap := make(map[string]interface{})
-	if np.Description != nil {
-		npMap[Attr_Description] = np.Description
-	}
 	if np.ID != nil {
 		npMap[Attr_ID] = np.ID
 	}

ibm/service/power/ibm_pi_constants.go

@@ -43,9 +43,9 @@ const (
 	Arg_DeploymentType                       = "pi_deployment_type"
 	Arg_Description                          = "pi_description"
 	Arg_Destination                          = "pi_destination"
-	Arg_DestinationType                      = "pi_destination_type"
 	Arg_DestinationPort                      = "pi_destination_port"
 	Arg_DestinationPorts                     = "pi_destination_ports"
+	Arg_DestinationType                      = "pi_destination_type"
 	Arg_DhcpID                               = "pi_dhcp_id"
 	Arg_DhcpName                             = "pi_dhcp_name"
 	Arg_DhcpSnatEnabled                      = "pi_dhcp_snat_enabled"
@@ -152,6 +152,7 @@ const (
 	Arg_StorageType                          = "pi_storage_type"
 	Arg_SysType                              = "pi_sys_type"
 	Arg_Target                               = "pi_target"
+	Arg_TargetCRN                            = "pi_target_crn"
 	Arg_TargetStorageTier                    = "pi_target_storage_tier"
 	Arg_Type                                 = "pi_type"
 	Arg_UserData                             = "pi_user_data"

ibm/service/power/resource_ibm_pi_instance_snapshot.go

@@ -224,7 +224,7 @@ func resourceIBMPIInstanceSnapshotUpdate(ctx context.Context, d *schema.Resource
 	if d.HasChange(Arg_SnapshotName) || d.HasChange(Arg_Description) {
 		name := d.Get(Arg_SnapshotName).(string)
 		description := d.Get(Arg_Description).(string)
-		snapshotBody := &models.SnapshotUpdate{Name: name, Description: description}
+		snapshotBody := &models.SnapshotUpdate{Name: &name, Description: &description}
 
 		_, err := client.Update(snapshotID, snapshotBody)
 		if err != nil {

ibm/service/power/resource_ibm_pi_network.go

@@ -752,7 +752,7 @@ func networkMapToNetworkCreatePeer(networkCreatePeerMap map[string]interface{})
 	ncp := &models.NetworkCreatePeer{}
 	if networkCreatePeerMap[Attr_ID].(string) != "" {
 		id := networkCreatePeerMap[Attr_ID].(string)
-		ncp.ID = &id
+		ncp.ID = id
 	}
 	if networkCreatePeerMap[Attr_NetworkAddressTranslation] != nil && len(networkCreatePeerMap[Attr_NetworkAddressTranslation].([]interface{})) > 0 {
 		networkAddressTranslationModel := natMapToNetworkAddressTranslation(networkCreatePeerMap[Attr_NetworkAddressTranslation].([]interface{})[0].(map[string]interface{}))

ibm/service/power/resource_ibm_pi_snapshot.go

@@ -228,7 +228,7 @@ func resourceIBMPISnapshotUpdate(ctx context.Context, d *schema.ResourceData, me
 	if d.HasChange(Arg_SnapShotName) || d.HasChange(Arg_Description) {
 		name := d.Get(Arg_SnapShotName).(string)
 		description := d.Get(Arg_Description).(string)
-		snapshotBody := &models.SnapshotUpdate{Name: name, Description: description}
+		snapshotBody := &models.SnapshotUpdate{Name: &name, Description: &description}
 
 		_, err := client.Update(snapshotID, snapshotBody)
 		if err != nil {

ibm/service/power/resource_ibm_pi_volume_group.go

@@ -49,6 +49,11 @@ func ResourceIBMPIVolumeGroup() *schema.Resource {
 				Optional:      true,
 				Type:          schema.TypeString,
 			},
+			Arg_TargetCRN: {
+				Description: "Target CRN of the secondary workspace where the auxiliary data resides; optional; if specified, the auxiliary volumes for the primary volumes getting added to the new volume group will be automatically onboarded into the secondary workspace and added to the corresponding auxiliary consistency group.",
+				Optional:    true,
+				Type:        schema.TypeString,
+			},
 			Arg_VolumeGroupName: {
 				ConflictsWith: []string{Arg_ConsistencyGroupName},
 				Description:   "Volume Group Name to create",
@@ -130,7 +135,9 @@ func resourceIBMPIVolumeGroupCreate(ctx context.Context, d *schema.ResourceData,
 	body := &models.VolumeGroupCreate{
 		Name: vgName,
 	}
-
+	if v, ok := d.GetOk(Arg_TargetCRN); ok {
+		body.TargetCRN = v.(string)
+	}
 	volids := flex.ExpandStringList((d.Get(Arg_VolumeIDs).(*schema.Set)).List())
 	body.VolumeIDs = volids
 
@@ -199,15 +206,22 @@ func resourceIBMPIVolumeGroupUpdate(ctx context.Context, d *schema.ResourceData,
 	}
 
 	client := instance.NewIBMPIVolumeGroupClient(ctx, sess, cloudInstanceID)
+	body := &models.VolumeGroupUpdate{}
+	hasChange := false
 	if d.HasChanges(Arg_VolumeIDs) {
 		old, new := d.GetChange(Arg_VolumeIDs)
 		oldList := old.(*schema.Set)
 		newList := new.(*schema.Set)
-		body := &models.VolumeGroupUpdate{
-			AddVolumes:    flex.ExpandStringList(newList.Difference(oldList).List()),
-			RemoveVolumes: flex.ExpandStringList(oldList.Difference(newList).List()),
-		}
-		err := client.UpdateVolumeGroup(vgID, body)
+		body.AddVolumes = flex.ExpandStringList(newList.Difference(oldList).List())
+		body.RemoveVolumes = flex.ExpandStringList(oldList.Difference(newList).List())
+		hasChange = true
+	}
+	if d.HasChanges(Arg_TargetCRN) {
+		body.TargetCRN = d.Get(Arg_TargetCRN).(string)
+		hasChange = true
+	}
+	if hasChange {
+		err = client.UpdateVolumeGroup(vgID, body)
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -216,7 +230,6 @@ func resourceIBMPIVolumeGroupUpdate(ctx context.Context, d *schema.ResourceData,
 			return diag.FromErr(err)
 		}
 	}
-
 	return resourceIBMPIVolumeGroupRead(ctx, d, meta)
 }
 func resourceIBMPIVolumeGroupDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -246,8 +259,12 @@ func resourceIBMPIVolumeGroupDelete(ctx context.Context, d *schema.ResourceData,
 			return diag.FromErr(err)
 		}
 	}
-
-	err = client.DeleteVolumeGroup(vgID)
+	body := &models.VolumeGroupDelete{}
+	if v, ok := d.GetOk(Arg_TargetCRN); ok {
+		targetCRN := v.(string)
+		body.TargetCRN = &targetCRN
+	}
+	err = client.DeleteVolumeGroupWithBody(vgID, body)
 	if err != nil {
 		return diag.FromErr(err)
 	}

website/docs/r/pi_volume_group.html.markdown

@@ -52,6 +52,7 @@ Review the argument references that you can specify for your resource.
 
 - `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account.
 - `pi_consistency_group_name` - (Optional, String) The name of consistency group at storage controller level, required if `pi_volume_group_name` is not provided.
+- `pi_target_crn` - (Optional, String) Target CRN of the secondary workspace where the auxiliary data resides; if specified, the auxiliary volumes for the primary volumes getting added to the new volume group will be automatically onboarded into the secondary workspace and added to the corresponding auxiliary consistency group.
 - `pi_volume_group_name` - (Optional, String) The name of the volume group, required if `pi_consistency_group_name` is not provided.
 - `pi_volume_ids` - (Required, Set of String) List of volume IDs to add in volume group.