[Refactor] Volume Onboarding

ibm/service/power/ibm_pi_constants.go

@@ -148,6 +148,7 @@ const (
 	Attr_Networks                                    = "networks"
 	Attr_NumberOfVolumes                             = "number_of_volumes"
 	Attr_Onboardings                                 = "onboardings"
+	Attr_OnboardingId                                = "onboarding_id"
 	Attr_OperatingSystem                             = "operating_system"
 	Attr_PVMInstanceID                               = "pvm_instance_id"
 	Attr_PVMInstances                                = "pvm_instances"

ibm/service/power/resource_ibm_pi_volume_onboarding.go

@@ -39,11 +39,11 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 
-			helpers.PICloudInstanceId: {
-				Type:        schema.TypeString,
-				Required:    true,
-				ForceNew:    true,
+			Arg_CloudInstanceID: {
 				Description: "Cloud Instance ID - This is the service_instance_id.",
+				ForceNew:    true,
+				Required:    true,
+				Type:        schema.TypeString,
 			},
 
 			piOnboardingVolumes: {
@@ -54,9 +54,9 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						piSourceCRN: {
-							Type:        schema.TypeString,
-							Required:    true,
 							Description: "CRN of source ServiceBroker instance from where auxiliary volumes need to be onboarded",
+							Required:    true,
+							Type:        schema.TypeString,
 						},
 						piAuxiliaryVolumes: {
 							Type:     schema.TypeList,
@@ -65,14 +65,14 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource {
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									piAuxiliaryVolumeName: {
-										Type:        schema.TypeString,
-										Required:    true,
 										Description: "Auxiliary volume name at storage host level",
+										Required:    true,
+										Type:        schema.TypeString,
 									},
 									piDisplayName: {
-										Type:        schema.TypeString,
-										Optional:    true,
 										Description: "Display name of auxVolumeName once onboarded,auxVolumeName will be set to display name if not provided.",
+										Optional:    true,
+										Type:        schema.TypeString,
 									},
 								},
 							},
@@ -81,62 +81,62 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource {
 				},
 			},
 			piDescription: {
-				Type:        schema.TypeString,
-				Optional:    true,
 				Computed:    true,
 				Description: "Description of the volume onboarding operation",
+				Optional:    true,
+				Type:        schema.TypeString,
 			},
 
 			// Computed Attribute
-			"create_time": {
-				Type:        schema.TypeString,
+			Attr_CreateTime: {
 				Computed:    true,
 				Description: "Indicates the create-time of volume onboarding operation",
-			},
-			"onboarding_id": {
 				Type:        schema.TypeString,
+			},
+			Attr_OnboardingId: {
 				Computed:    true,
 				Description: "Indicates the volume onboarding operation id",
+				Type:        schema.TypeString,
 			},
-			"input_volumes": {
-				Type:        schema.TypeList,
+			Attr_InputVolumes: {
 				Computed:    true,
 				Description: "List of volumes requested to be onboarded",
 				Elem:        &schema.Schema{Type: schema.TypeString},
+				Type:        schema.TypeList,
 			},
-			"progress": {
-				Type:        schema.TypeFloat,
+			Attr_Progress: {
 				Computed:    true,
 				Description: "Indicates the progress of volume onboarding operation",
+				Type:        schema.TypeFloat,
 			},
-			"results_onboarded_volumes": {
-				Type:        schema.TypeList,
+			Attr_ResultsOnboardedVolumes: {
 				Computed:    true,
 				Description: "List of volumes which are onboarded successfully",
 				Elem:        &schema.Schema{Type: schema.TypeString},
+				Type:        schema.TypeList,
 			},
-			"results_volume_onboarding_failures": {
+			Attr_ResultsVolumeOnboardingFailures: {
 				Type:     schema.TypeList,
 				Computed: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-						"failure_message": {
-							Type:        schema.TypeString,
+						Attr_FailureMessage: {
 							Computed:    true,
 							Description: "The failure reason for the volumes which have failed to be onboarded",
+							Type:        schema.TypeString,
 						},
-						"volumes": {
-							Type:        schema.TypeList,
+						Attr_Volumes: {
 							Computed:    true,
 							Description: "List of volumes which have failed to be onboarded",
 							Elem:        &schema.Schema{Type: schema.TypeString},
+							Type:        schema.TypeList,
 						},
 					}},
 			},
-			"status": {
-				Type:        schema.TypeString,
+			Attr_Status: {
 				Computed:    true,
 				Description: "Indicates the status of volume onboarding operation",
+				Type:        schema.TypeString,
 			},
 		},
 	}

ibm/service/power/resource_ibm_pi_volume_onboarding_test.go

@@ -82,6 +82,5 @@ func testAccCheckIBMPIVolumeOnboardingConfig(name string) string {
 				pi_display_name = "%[2]s-1"
 			}
 		}
-	  }
-	`, acc.Pi_cloud_instance_id, name, acc.Pi_volume_onboarding_source_crn, acc.Pi_auxiliary_volume_name)
+	  }`, acc.Pi_cloud_instance_id, name, acc.Pi_volume_onboarding_source_crn, acc.Pi_auxiliary_volume_name)
 }

website/docs/r/pi_volume_onboarding.html.markdown

@@ -1,5 +1,4 @@
 ---
-
 subcategory: "Power Systems"
 layout: "ibm"
 page_title: "IBM: pi_volume_onboarding"
@@ -28,7 +27,7 @@ resource "ibm_pi_volume_onboarding" "testacc_volume_onboarding"{
 }
 ```
 
-**Note**
+**Notes**
 * Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints.
 * If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows:
   * `region` - `lon`