[Resource] Remove computed property from pi_instance pi_placement_group_id and fix placement group acceptance test (#6230)

Author: Alexander-Kita

ibm/service/power/resource_ibm_pi_instance.go

@@ -232,7 +232,6 @@ func ResourceIBMPIInstance() *schema.Resource {
 			},
 			Arg_PlacementGroupID: {
 				Description: "Placement group ID",
-				Computed:    true,
 				Optional:    true,
 				Type:        schema.TypeString,
 			},

ibm/service/power/resource_ibm_pi_placement_group.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"strings"
 	"time"
 
 	"github.com/IBM-Cloud/power-go-client/clients/instance"
@@ -15,6 +16,7 @@ import (
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
@@ -139,10 +141,41 @@ func resourceIBMPIPlacementGroupDelete(ctx context.Context, d *schema.ResourceDa
 	cloudInstanceID := parts[0]
 	client := instance.NewIBMPIPlacementGroupClient(ctx, sess, cloudInstanceID)
 	err = client.Delete(parts[1])
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
+	_, err = isWaitForPIPlacementGroupDeleted(ctx, client, parts[1], d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		return diag.FromErr(err)
 	}
+
 	d.SetId("")
 	return nil
 }
+
+func isWaitForPIPlacementGroupDeleted(ctx context.Context, client *instance.IBMPIPlacementGroupClient, id string, timeout time.Duration) (interface{}, error) {
+	log.Printf("Waiting for placement group (%s) to be deleted.", id)
+
+	stateConf := &retry.StateChangeConf{
+		Pending:    []string{State_Deleting},
+		Target:     []string{State_NotFound},
+		Refresh:    isPIPlacementGroupDeleteRefreshFunc(client, id),
+		Delay:      10 * time.Second,
+		MinTimeout: 30 * time.Second,
+		Timeout:    timeout,
+	}
+
+	return stateConf.WaitForStateContext(ctx)
+}
+
+func isPIPlacementGroupDeleteRefreshFunc(client *instance.IBMPIPlacementGroupClient, id string) retry.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		pg, err := client.Get(id)
+		if err != nil && strings.Contains(err.Error(), NotFound) {
+			log.Printf("The power placement group does not exist")
+			return pg, State_NotFound, nil
+		}
+		return pg, State_Deleting, nil
+	}
+}

ibm/service/power/resource_ibm_pi_placement_group_test.go

@@ -61,7 +61,7 @@ func TestAccIBMPIPlacementGroupBasic(t *testing.T) {
 			{
 				Config: testAccCheckIBMPIPlacementGroupRemoveMemberConfig(name, policy),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckIBMPIPlacementGroupMemberDoesNotExist("ibm_pi_placement_group.power_placement_group", "ibm_pi_instance.power_instance"),
+					testAccCheckIBMPIPlacementGroupMemberDoesNotExist("ibm_pi_placement_group.power_placement_group_another", "ibm_pi_instance.power_instance"),
 				),
 			},
 			{
@@ -76,7 +76,6 @@ func TestAccIBMPIPlacementGroupBasic(t *testing.T) {
 					testAccCheckIBMPIPlacementGroupMemberExistsFromInstanceCreate("ibm_pi_placement_group.power_placement_group", "ibm_pi_instance.power_instance", "ibm_pi_instance.power_instance_in_pg"),
 					testAccCheckIBMPIPlacementGroupMemberExists("ibm_pi_placement_group.power_placement_group", "ibm_pi_instance.sap_power_instance"),
 				),
-				ExpectNonEmptyPlan: true,
 			},
 			{
 				Config: testAccCheckIBMPIDeletePlacementGroup(name, policy),
@@ -468,7 +467,6 @@ func testAccCheckIBMPIPlacementGroupRemoveMemberConfig(name string, policy strin
 			pi_network {
 				network_id = "%[5]s"
 			}
-			pi_placement_group_id = ""
 		}
 	
 		resource "ibm_pi_placement_group" "power_placement_group" {