forked from IBM-Cloud/terraform-provider-ibm
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
939ddcc
commit 740cb36
Showing
12 changed files
with
702 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,139 @@ | ||
// Copyright IBM Corp. 2024 All Rights Reserved. | ||
// Licensed under the Mozilla Public License v2.0 | ||
|
||
package power | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"log" | ||
"strings" | ||
"time" | ||
|
||
st "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/IBM-Cloud/terraform-provider-ibm/ibm/flex" | ||
"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 ResourceIBMPIVolumesAttach() *schema.Resource { | ||
return &schema.Resource{ | ||
CreateContext: resourceIBMPIVolumesAttachCreate, | ||
ReadContext: resourceIBMPIVolumesAttachRead, | ||
DeleteContext: resourceIBMPIVolumesAttachDelete, | ||
Importer: &schema.ResourceImporter{}, | ||
|
||
Timeouts: &schema.ResourceTimeout{ | ||
Create: schema.DefaultTimeout(10 * time.Minute), | ||
Delete: schema.DefaultTimeout(10 * time.Minute), | ||
}, | ||
|
||
Schema: map[string]*schema.Schema{ | ||
// Arguments | ||
Arg_CloudInstanceID: { | ||
Description: "The GUID of the service instance associated with an account.", | ||
ForceNew: true, | ||
Required: true, | ||
Type: schema.TypeString, | ||
ValidateFunc: validation.NoZeroValues, | ||
}, | ||
Arg_InstanceID: { | ||
Description: "The unique identifier of the instance.", | ||
ForceNew: true, | ||
Required: true, | ||
Type: schema.TypeString, | ||
ValidateFunc: validation.NoZeroValues, | ||
}, | ||
Arg_VolumeIDs: { | ||
Description: "List of volumes to be detached from a pi_instance; required if detachAllVolumes is not provided.", | ||
Elem: &schema.Schema{Type: schema.TypeString}, | ||
ForceNew: true, | ||
Required: true, | ||
Type: schema.TypeList, | ||
}, | ||
Arg_BootVolumeID: { | ||
Description: "Primary Boot Volume Id.", | ||
ForceNew: true, | ||
Optional: true, | ||
Type: schema.TypeString, | ||
}, | ||
}, | ||
} | ||
} | ||
|
||
func resourceIBMPIVolumesAttachCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
sess, err := meta.(conns.ClientSession).IBMPISession() | ||
if err != nil { | ||
return diag.FromErr(err) | ||
} | ||
|
||
body := &models.VolumesAttach{} | ||
pvmInstanceID := d.Get(Arg_InstanceID).(string) | ||
cloudInstanceID := d.Get(Arg_CloudInstanceID).(string) | ||
|
||
var volumeIDs []string | ||
if _, ok := d.GetOk(Arg_VolumeIDs); ok { | ||
for _, v := range d.Get(Arg_VolumeIDs).([]interface{}) { | ||
volumeIDsItem := v.(string) | ||
volumeIDs = append(volumeIDs, volumeIDsItem) | ||
} | ||
body.VolumeIDs = volumeIDs | ||
} | ||
|
||
if _, ok := d.GetOk(Arg_BootVolumeID); ok { | ||
body.BootVolumeID = d.Get(Arg_BootVolumeID).(string) | ||
} | ||
volClient := st.NewIBMPIVolumeClient(ctx, sess, cloudInstanceID) | ||
volinfo, err := volClient.BulkVolumeAttach(pvmInstanceID, body) | ||
if err != nil { | ||
return diag.FromErr(err) | ||
} | ||
|
||
log.Printf("[DEBUG] Volumes attach accepted: %s", *volinfo.Summary) | ||
|
||
d.SetId(fmt.Sprintf("%s/%s/%s", cloudInstanceID, pvmInstanceID, strings.Join(volumeIDs, "/"))) | ||
for _, volumeID := range volumeIDs { | ||
_, err = isWaitForIBMPIVolumeAttachAvailable(ctx, volClient, volumeID, cloudInstanceID, pvmInstanceID, d.Timeout(schema.TimeoutCreate)) | ||
if err != nil { | ||
return diag.FromErr(err) | ||
} | ||
} | ||
return resourceIBMPIVolumesAttachRead(ctx, d, meta) | ||
} | ||
|
||
func resourceIBMPIVolumesAttachRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
return nil | ||
} | ||
|
||
func resourceIBMPIVolumesAttachDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
sess, err := meta.(conns.ClientSession).IBMPISession() | ||
if err != nil { | ||
return diag.FromErr(err) | ||
} | ||
ids, err := flex.IdParts(d.Id()) | ||
if err != nil { | ||
return diag.FromErr(err) | ||
} | ||
cloudInstanceID, pvmInstanceID := ids[0], ids[1] | ||
volClient := st.NewIBMPIVolumeClient(ctx, sess, cloudInstanceID) | ||
body := &models.VolumesDetach{ | ||
VolumeIDs: ids[2:], | ||
} | ||
volinfo, err := volClient.BulkVolumeDetach(pvmInstanceID, body) | ||
if err != nil { | ||
return diag.FromErr(err) | ||
} | ||
log.Printf("[DEBUG] Volumes delete accepted: %s", *volinfo.Summary) | ||
for _, volumeID := range ids[2:] { | ||
_, err = isWaitForIBMPIVolumeDetach(ctx, volClient, volumeID, cloudInstanceID, pvmInstanceID, d.Timeout(schema.TimeoutDelete)) | ||
if err != nil { | ||
return diag.FromErr(err) | ||
} | ||
} | ||
|
||
d.SetId("") | ||
return nil | ||
} |
170 changes: 170 additions & 0 deletions
170
ibm/service/power/resource_ibm_pi_volumes_attach_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,170 @@ | ||
// Copyright IBM Corp. 2024 All Rights Reserved. | ||
// Licensed under the Mozilla Public License v2.0 | ||
|
||
package power_test | ||
|
||
import ( | ||
"context" | ||
"errors" | ||
"fmt" | ||
"log" | ||
"testing" | ||
|
||
"github.com/IBM-Cloud/power-go-client/clients/instance" | ||
acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest" | ||
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" | ||
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" | ||
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" | ||
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" | ||
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform" | ||
) | ||
|
||
func TestAccIBMPIVolumesAttach(t *testing.T) { | ||
name := fmt.Sprintf("tf-pi-instance-%d", acctest.RandIntRange(10, 100)) | ||
resource.Test(t, resource.TestCase{ | ||
PreCheck: func() { acc.TestAccPreCheck(t) }, | ||
Providers: acc.TestAccProviders, | ||
CheckDestroy: testAccCheckVolumesAttachDestroy, | ||
Steps: []resource.TestStep{ | ||
{ | ||
Config: testAccCheckIBMPIVolumesAttachConfig(name, "WARNING"), | ||
Check: resource.ComposeTestCheckFunc( | ||
testAccCheckIBMPIVolumesAttachExists("ibm_pi_volumes_attach.pi_volumes_attach_instance"), | ||
resource.TestCheckResourceAttrSet("ibm_pi_volumes_attach.pi_volumes_attach_instance", "id"), | ||
), | ||
}, | ||
}, | ||
}) | ||
} | ||
|
||
func testAccCheckIBMPIVolumesAttachConfig(name, instanceHealthStatus string) string { | ||
return fmt.Sprintf(` | ||
resource "ibm_pi_key" "key" { | ||
pi_cloud_instance_id = "%[1]s" | ||
pi_key_name = "%[2]s" | ||
pi_ssh_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVERRN7/9484SOBJ3HSKxxNG5JN8owAjy5f9yYwcUg+JaUVuytn5Pv3aeYROHGGg+5G346xaq3DAwX6Y5ykr2fvjObgncQBnuU5KHWCECO/4h8uWuwh/kfniXPVjFToc+gnkqA+3RKpAecZhFXwfalQ9mMuYGFxn+fwn8cYEApsJbsEmb0iJwPiZ5hjFC8wREuiTlhPHDgkBLOiycd20op2nXzDbHfCHInquEe/gYxEitALONxm0swBOwJZwlTDOB7C6y2dzlrtxr1L59m7pCkWI4EtTRLvleehBoj3u7jB4usR" | ||
} | ||
data "ibm_pi_image" "power_image" { | ||
pi_cloud_instance_id = "%[1]s" | ||
pi_image_name = "%[3]s" | ||
} | ||
data "ibm_pi_network" "power_networks" { | ||
pi_cloud_instance_id = "%[1]s" | ||
pi_network_name = "%[4]s" | ||
} | ||
resource "ibm_pi_volume" "power_volume" { | ||
pi_cloud_instance_id = "%[1]s" | ||
pi_volume_name = "%[2]s" | ||
pi_volume_pool = data.ibm_pi_image.power_image.storage_pool | ||
pi_volume_shareable = true | ||
pi_volume_size = 20 | ||
pi_volume_type = "%[6]s" | ||
} | ||
resource "ibm_pi_volume" "power_volume_2" { | ||
pi_cloud_instance_id = "%[1]s" | ||
pi_volume_name = "%[2]s-2" | ||
pi_volume_pool = data.ibm_pi_image.power_image.storage_pool | ||
pi_volume_shareable = true | ||
pi_volume_size = 20 | ||
pi_volume_type = "%[6]s" | ||
} | ||
resource "ibm_pi_volume" "power_volume_3" { | ||
pi_cloud_instance_id = "%[1]s" | ||
pi_volume_name = "%[2]s-3" | ||
pi_volume_pool = data.ibm_pi_image.power_image.storage_pool | ||
pi_volume_shareable = true | ||
pi_volume_size = 20 | ||
pi_volume_type = "%[6]s" | ||
} | ||
resource "ibm_pi_instance" "power_instance" { | ||
pi_cloud_instance_id = "%[1]s" | ||
pi_health_status = "%[5]s" | ||
pi_image_id = data.ibm_pi_image.power_image.id | ||
pi_instance_name = "%[2]s" | ||
pi_key_pair_name = ibm_pi_key.key.name | ||
pi_memory = "2" | ||
pi_proc_type = "shared" | ||
pi_processors = "0.25" | ||
pi_storage_pool = data.ibm_pi_image.power_image.storage_pool | ||
pi_storage_type = "%[6]s" | ||
pi_sys_type = "s922" | ||
pi_volume_ids = [ibm_pi_volume.power_volume.volume_id] | ||
pi_network { | ||
network_id = data.ibm_pi_network.power_networks.id | ||
} | ||
} | ||
data "ibm_pi_instance" "power_instance" { | ||
pi_cloud_instance_id = "%[1]s" | ||
pi_instance_name = resource.ibm_pi_instance.power_instance.pi_instance_name | ||
} | ||
resource "ibm_pi_volumes_attach" "pi_volumes_attach_instance" { | ||
pi_cloud_instance_id = "%[1]s" | ||
pi_instance_id = data.ibm_pi_instance.power_instance.id | ||
pi_volume_ids = [ibm_pi_volume.power_volume_2.volume_id, ibm_pi_volume.power_volume_3.volume_id] | ||
} | ||
`, acc.Pi_cloud_instance_id, name, acc.Pi_image, acc.Pi_network_name, instanceHealthStatus, acc.PiStorageType) | ||
} | ||
|
||
func testAccCheckVolumesAttachDestroy(s *terraform.State) error { | ||
sess, err := acc.TestAccProvider.Meta().(conns.ClientSession).IBMPISession() | ||
if err != nil { | ||
return err | ||
} | ||
for _, rs := range s.RootModule().Resources { | ||
if rs.Type != "ibm_pi_volumes_attach" { | ||
continue | ||
} | ||
|
||
ids, err := flex.IdParts(rs.Primary.ID) | ||
if err != nil { | ||
return err | ||
} | ||
cloudInstanceID, pvmInstanceID := ids[0], ids[1] | ||
client := instance.NewIBMPIVolumeClient(context.Background(), sess, cloudInstanceID) | ||
for _, volumeID := range ids[2:] { | ||
volumeAttach, err := client.CheckVolumeAttach(pvmInstanceID, volumeID) | ||
if err == nil { | ||
log.Println("volume attach*****", volumeAttach.State) | ||
return fmt.Errorf("PI Volume Attach still exists: %s", rs.Primary.ID) | ||
} | ||
} | ||
|
||
} | ||
|
||
return nil | ||
} | ||
|
||
func testAccCheckIBMPIVolumesAttachExists(n string) resource.TestCheckFunc { | ||
return func(s *terraform.State) error { | ||
|
||
rs, ok := s.RootModule().Resources[n] | ||
|
||
if !ok { | ||
return fmt.Errorf("Not found: %s", n) | ||
} | ||
|
||
if rs.Primary.ID == "" { | ||
return errors.New("No Record ID is set") | ||
} | ||
|
||
sess, err := acc.TestAccProvider.Meta().(conns.ClientSession).IBMPISession() | ||
if err != nil { | ||
return err | ||
} | ||
|
||
ids, err := flex.IdParts(rs.Primary.ID) | ||
if err != nil { | ||
return err | ||
} | ||
cloudInstanceID, pvmInstanceID := ids[0], ids[1] | ||
client := instance.NewIBMPIVolumeClient(context.Background(), sess, cloudInstanceID) | ||
for _, volumeID := range ids[2:] { | ||
_, err = client.CheckVolumeAttach(pvmInstanceID, volumeID) | ||
if err != nil { | ||
return err | ||
} | ||
} | ||
|
||
return nil | ||
} | ||
} |
Oops, something went wrong.