Skip to content

Commit

Permalink
Update const
Browse files Browse the repository at this point in the history
  • Loading branch information
Diptipowervs committed Mar 26, 2024
1 parent f1683b1 commit 2e4457c
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 22 deletions.
19 changes: 9 additions & 10 deletions ibm/service/power/ibm_pi_constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const (
Arg_CloudInstanceID = "pi_cloud_instance_id"
Arg_ImageName = "pi_image_name"
Arg_InstanceName = "pi_instance_name"
Arg_InstanceId = "pi_instace_id"
Arg_Key = "pi_ssh_key"
Arg_KeyName = "pi_key_name"
Arg_NetworkName = "pi_network_name"
Expand Down Expand Up @@ -244,14 +243,11 @@ const (
Attr_VPCCRNs = "vpc_crns"
Attr_VPCEnabled = "vpc_enabled"
Attr_VirtualCoresAssigned = "virtual_cores_assigned"
Attr_VolumeAllowableAttachStatus = "volume_allowable_attach_status"
Attr_VolumeAttachStatus = "volume_attach_status"
Attr_VolumeGroupName = "volume_group_name"
Attr_VolumeGroups = "volume_groups"
Attr_VolumeIDs = "volume_ids"
Attr_VolumePool = "volume_pool"
Attr_VolumeProvisioning = "volume_provisioning"
Attr_VolumeProvisioningDone = "volume_provisioning_done"
Attr_VolumeSnapshots = "volume_snapshots"
Attr_Volumes = "volumes"
Attr_WWN = "wwn"
Expand Down Expand Up @@ -339,12 +335,15 @@ const (
PIPlacementGroupMembers = "members"

// Volume
PIVolumeIds = "pi_volume_ids"
PIAffinityPolicy = "pi_affinity_policy"
PIAffinityVolume = "pi_affinity_volume"
PIAffinityInstance = "pi_affinity_instance"
PIAntiAffinityInstances = "pi_anti_affinity_instances"
PIAntiAffinityVolumes = "pi_anti_affinity_volumes"
PIAffinityPolicy = "pi_affinity_policy"
PIAffinityVolume = "pi_affinity_volume"
PIAffinityInstance = "pi_affinity_instance"
PIAntiAffinityInstances = "pi_anti_affinity_instances"
PIAntiAffinityVolumes = "pi_anti_affinity_volumes"
PIVolumeIds = "pi_volume_ids"
PIVolumeAllowableAttachStatus = "in-use"
PIVolumeProvisioning = "creating"
PIVolumeProvisioningDone = "available"

// Volume Clone
PIVolumeCloneName = "pi_volume_clone_name"
Expand Down
24 changes: 12 additions & 12 deletions ibm/service/power/resource_ibm_pi_volume_attach.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ func ResourceIBMPIVolumeAttach() *schema.Resource {
Type: schema.TypeString,
},

Arg_InstanceId: {
Arg_PVMInstanceId: {
Description: "PI Instance Id",
ForceNew: true,
Required: true,
Type: schema.TypeString,
},

// Computed Attribute
Attr_VolumeAttachStatus: {
Attr_Status: {
Type: schema.TypeString,
Computed: true,
},
Expand All @@ -70,7 +70,7 @@ func resourceIBMPIVolumeAttachCreate(ctx context.Context, d *schema.ResourceData
}

volumeID := d.Get(Arg_VolumeID).(string)
pvmInstanceID := d.Get(Arg_InstanceId).(string)
pvmInstanceID := d.Get(Arg_PVMInstanceId).(string)
cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)

volClient := instance.NewIBMPIVolumeClient(ctx, sess, cloudInstanceID)
Expand All @@ -88,7 +88,7 @@ func resourceIBMPIVolumeAttachCreate(ctx context.Context, d *schema.ResourceData
log.Printf("Volume State /Status is permitted and hence attaching the volume to the instance")
}

if volinfo.State == Attr_VolumeAllowableAttachStatus && !*volinfo.Shareable {
if volinfo.State == PIVolumeAllowableAttachStatus && !*volinfo.Shareable {
return diag.Errorf("the volume cannot be attached in the current state. The volume must be in the *available* state. No other states are permissible")
}

Expand Down Expand Up @@ -127,7 +127,7 @@ func resourceIBMPIVolumeAttachRead(ctx context.Context, d *schema.ResourceData,
return diag.FromErr(err)
}

d.Set(Attr_VolumeAttachStatus, vol.State)
d.Set(Attr_Status, vol.State)
return nil
}

Expand Down Expand Up @@ -173,8 +173,8 @@ func isWaitForIBMPIVolumeAttachAvailable(ctx context.Context, client *instance.I
log.Printf("Waiting for Volume (%s) to be available for attachment", id)

stateConf := &resource.StateChangeConf{
Pending: []string{"retry", Attr_VolumeProvisioning},
Target: []string{Attr_VolumeAllowableAttachStatus},
Pending: []string{"retry", PIVolumeProvisioning},
Target: []string{PIVolumeAllowableAttachStatus},
Refresh: isIBMPIVolumeAttachRefreshFunc(client, id, cloudInstanceID, pvmInstanceID),
Delay: 10 * time.Second,
MinTimeout: 30 * time.Second,
Expand All @@ -192,10 +192,10 @@ func isIBMPIVolumeAttachRefreshFunc(client *instance.IBMPIVolumeClient, id, clou
}

if vol.State == "in-use" && flex.StringContains(vol.PvmInstanceIDs, pvmInstanceID) {
return vol, Attr_VolumeAllowableAttachStatus, nil
return vol, PIVolumeAllowableAttachStatus, nil
}

return vol, Attr_VolumeProvisioning, nil
return vol, PIVolumeProvisioning, nil
}
}

Expand All @@ -204,7 +204,7 @@ func isWaitForIBMPIVolumeDetach(ctx context.Context, client *instance.IBMPIVolum

stateConf := &resource.StateChangeConf{
Pending: []string{"detaching", Attr_PowerVolumeAttachDeleting},
Target: []string{Attr_VolumeProvisioningDone},
Target: []string{PIVolumeProvisioningDone},
Refresh: isIBMPIVolumeDetachRefreshFunc(client, id, cloudInstanceID, pvmInstanceID),
Delay: 10 * time.Second,
MinTimeout: 30 * time.Second,
Expand All @@ -222,7 +222,7 @@ func isIBMPIVolumeDetachRefreshFunc(client *instance.IBMPIVolumeClient, id, clou
switch uErr.(type) {
case *p_cloud_volumes.PcloudCloudinstancesVolumesGetNotFound:
log.Printf("[DEBUG] volume does not exist while detaching %v", err)
return vol, Attr_VolumeProvisioningDone, nil
return vol, PIVolumeProvisioningDone, nil
}
return nil, "", err
}
Expand All @@ -232,7 +232,7 @@ func isIBMPIVolumeDetachRefreshFunc(client *instance.IBMPIVolumeClient, id, clou
// In case of Sharable Volume it can be `in-use` state
if !flex.StringContains(vol.PvmInstanceIDs, pvmInstanceID) &&
(*vol.Shareable || (!*vol.Shareable && vol.State == "available")) {
return vol, Attr_VolumeProvisioningDone, nil
return vol, PIVolumeProvisioningDone, nil
}

return vol, "detaching", nil
Expand Down

0 comments on commit 2e4457c

Please sign in to comment.