From 55798931d81dddfa4c164d57881e60643735be22 Mon Sep 17 00:00:00 2001 From: Axel Ismirlian Date: Tue, 28 Jan 2025 16:41:57 -0600 Subject: [PATCH] Remove storage type set --- ibm/service/power/resource_ibm_pi_instance.go | 9 +++------ ibm/service/power/resource_ibm_pi_instance_test.go | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ibm/service/power/resource_ibm_pi_instance.go b/ibm/service/power/resource_ibm_pi_instance.go index fca6eb07e7..354831a3e6 100644 --- a/ibm/service/power/resource_ibm_pi_instance.go +++ b/ibm/service/power/resource_ibm_pi_instance.go @@ -603,18 +603,15 @@ func resourceIBMPIInstanceRead(ctx context.Context, d *schema.ResourceData, meta if powervmdata.Status != nil { d.Set(Attr_Status, powervmdata.Status) } - d.Set(Arg_ProcType, powervmdata.ProcType) - d.Set(Attr_MinProcessors, powervmdata.Minproc) - d.Set(Attr_Progress, powervmdata.Progress) - if powervmdata.StorageType != nil && *powervmdata.StorageType != "" { - d.Set(Arg_StorageType, powervmdata.StorageType) - } d.Set(Arg_CloudInstanceID, cloudInstanceID) d.Set(Arg_ImageID, powervmdata.ImageID) d.Set(Arg_InstanceName, powervmdata.ServerName) + d.Set(Arg_ProcType, powervmdata.ProcType) d.Set(Arg_StoragePool, powervmdata.StoragePool) d.Set(Arg_StoragePoolAffinity, powervmdata.StoragePoolAffinity) d.Set(Attr_InstanceID, powervmdata.PvmInstanceID) + d.Set(Attr_MinProcessors, powervmdata.Minproc) + d.Set(Attr_Progress, powervmdata.Progress) if *powervmdata.PlacementGroup != None { d.Set(Arg_PlacementGroupID, powervmdata.PlacementGroup) } diff --git a/ibm/service/power/resource_ibm_pi_instance_test.go b/ibm/service/power/resource_ibm_pi_instance_test.go index 9d7886a630..d45801d0e2 100644 --- a/ibm/service/power/resource_ibm_pi_instance_test.go +++ b/ibm/service/power/resource_ibm_pi_instance_test.go @@ -32,7 +32,7 @@ func TestAccIBMPIInstanceBasic(t *testing.T) { CheckDestroy: testAccCheckIBMPIInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccCheckIBMPIInstanceConfig(name, power.Warning), + Config: testAccCheckIBMPIInstanceConfig(name, power.OK), Check: resource.ComposeTestCheckFunc( testAccCheckIBMPIInstanceExists(instanceRes), resource.TestCheckResourceAttr(instanceRes, "pi_instance_name", name),