Fix data sources and documentation

Author: Alexander-Kita

ibm/service/power/data_source_ibm_pi_virtual_serial_number.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/IBM-Cloud/power-go-client/clients/instance"
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
+	"github.com/hashicorp/go-uuid"
 	"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"
@@ -25,7 +26,7 @@ func DataSourceIBMPIVirtualSerialNumber() *schema.Resource {
 				Type:         schema.TypeString,
 				ValidateFunc: validation.NoZeroValues,
 			},
-			Arg_VirtualSerialNumber: {
+			Arg_Serial: {
 				Description:  "Virtual serial number.",
 				Required:     true,
 				Type:         schema.TypeString,
@@ -43,11 +44,6 @@ func DataSourceIBMPIVirtualSerialNumber() *schema.Resource {
 				Description: "ID of PVM instance virtual serial number is attached to.",
 				Type:        schema.TypeString,
 			},
-			Attr_Serial: {
-				Computed:    true,
-				Description: "Serial number.",
-				Type:        schema.TypeString,
-			},
 		},
 	}
 }
@@ -61,15 +57,18 @@ func dataSourceIBMPIVirtualSerialNumberRead(ctx context.Context, d *schema.Resou
 	cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
 	client := instance.NewIBMPIVSNClient(ctx, sess, cloudInstanceID)
 
-	vsnInput := d.Get(Arg_VirtualSerialNumber).(string)
+	vsnInput := d.Get(Arg_Serial).(string)
 	virtualSerialNumberData, err := client.Get(vsnInput)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
+	var clientgenU, _ = uuid.GenerateUUID()
+	d.SetId(clientgenU)
 	d.Set(Attr_Description, virtualSerialNumberData.Description)
-	d.Set(Attr_PVMInstanceID, virtualSerialNumberData.PvmInstanceID)
-	d.Set(Attr_Serial, virtualSerialNumberData.Serial)
+	if virtualSerialNumberData.PvmInstanceID != nil {
+		d.Set(Attr_PVMInstanceID, virtualSerialNumberData.PvmInstanceID)
+	}
 
 	return nil
 }

ibm/service/power/data_source_ibm_pi_virtual_serial_numbers.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/IBM-Cloud/power-go-client/clients/instance"
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
+	"github.com/hashicorp/go-uuid"
 	"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"
@@ -88,6 +89,8 @@ func dataSourceIBMPIVirtualSerialNumbersRead(ctx context.Context, d *schema.Reso
 		vsnMapList = append(vsnMapList, v)
 	}
 
+	var clientgenU, _ = uuid.GenerateUUID()
+	d.SetId(clientgenU)
 	d.Set(Attr_VirtualSerialNumbers, vsnMapList)
 	return nil
 }

ibm/service/power/resource_ibm_pi_instance.go

@@ -976,7 +976,6 @@ func resourceIBMPIInstanceUpdate(ctx context.Context, d *schema.ResourceData, me
 	}
 
 	if d.HasChange(Arg_VirtualSerialNumber) {
-		pvmInstanceID := d.Get(Attr_InstanceID).(string)
 		vsnClient := instance.NewIBMPIVSNClient(ctx, sess, cloudInstanceID)
 
 		if d.HasChange(Arg_VirtualSerialNumber + ".0." + Attr_Serial) {
@@ -1000,7 +999,7 @@ func resourceIBMPIInstanceUpdate(ctx context.Context, d *schema.ResourceData, me
 				deleteBody := &models.DeleteServerVirtualSerialNumber{
 					RetainVSN: retainVSN,
 				}
-				err := vsnClient.PVMInstanceDeleteVSN(pvmInstanceID, deleteBody)
+				err := vsnClient.PVMInstanceDeleteVSN(instanceID, deleteBody)
 				if err != nil {
 					return diag.FromErr(err)
 				}
@@ -1014,7 +1013,7 @@ func resourceIBMPIInstanceUpdate(ctx context.Context, d *schema.ResourceData, me
 					Description: description,
 					Serial:      &serial,
 				}
-				err := vsnClient.PVMInstanceAttachVSN(pvmInstanceID, addBody)
+				err := vsnClient.PVMInstanceAttachVSN(instanceID, addBody)
 				if err != nil {
 					return diag.FromErr(err)
 				}
@@ -1026,7 +1025,7 @@ func resourceIBMPIInstanceUpdate(ctx context.Context, d *schema.ResourceData, me
 			}
 
 			if instanceRestart {
-				err = startLparAfterResourceChange(ctx, client, pvmInstanceID, d)
+				err = startLparAfterResourceChange(ctx, client, instanceID, d)
 				if err != nil {
 					return diag.FromErr(err)
 				}

ibm/service/power/resource_ibm_pi_virtual_serial_number.go

@@ -17,10 +17,10 @@ import (
 
 func ResourceIBMPIVirtualSerialNumber() *schema.Resource {
 	return &schema.Resource{
-		CreateContext: resourceIBMPIInstanceCreate,
-		ReadContext:   resourceIBMPIInstanceRead,
-		UpdateContext: resourceIBMPIInstanceUpdate,
-		DeleteContext: resourceIBMPIInstanceDelete,
+		CreateContext: resourceIBMPIVirtualSerialNumberCreate,
+		ReadContext:   resourceIBMPIVirtualSerialNumberRead,
+		UpdateContext: resourceIBMPIVirtualSerialNumberUpdate,
+		DeleteContext: resourceIBMPIVirtualSerialNumberUpdate,
 		Importer:      &schema.ResourceImporter{},
 
 		Timeouts: &schema.ResourceTimeout{
@@ -38,21 +38,23 @@ func ResourceIBMPIVirtualSerialNumber() *schema.Resource {
 				Type:        schema.TypeString,
 			},
 			Arg_Description: {
+				Computed:    true,
 				Description: "Description of virtual serial number.",
 				Optional:    true,
 				Type:        schema.TypeString,
 			},
 			Arg_Serial: {
-				Description: "Virtual serial number.",
-				Required:    true,
-				Type:        schema.TypeString,
+				Description:      "Virtual serial number.",
+				DiffSuppressFunc: flex.ApplyOnce,
+				Required:         true,
+				Type:             schema.TypeString,
 			},
 
 			// Attributes
 			Attr_PVMInstanceID: {
 				Computed:    true,
 				Description: "PVM instance ID virtual serial number is assigned to.",
-				Type:        schema.TypeBool,
+				Type:        schema.TypeString,
 			},
 		},
 	}
@@ -103,6 +105,7 @@ func resourceIBMPIVirtualSerialNumberRead(ctx context.Context, d *schema.Resourc
 	if vsn.PvmInstanceID != nil {
 		d.Set(Attr_PVMInstanceID, vsn.PvmInstanceID)
 	}
+	d.Set(Arg_Serial, vsn.Serial)
 
 	return nil
 }
@@ -138,34 +141,20 @@ func resourceIBMPIVirtualSerialNumberUpdate(ctx context.Context, d *schema.Resou
 		return diag.FromErr(err)
 	}
 
-	if d.HasChange(Arg_VirtualSerialNumber) || d.HasChange(Arg_CloudInstanceID) {
+	if d.HasChange(Arg_Description) {
 		cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
 		client := instance.NewIBMPIVSNClient(ctx, sess, cloudInstanceID)
 
-		vsnArg := d.Get(Arg_Serial).(string)
-		vsn, err := client.Get(vsnArg)
-		if err != nil {
-			return diag.FromErr(err)
+		newDescription := d.Get(Arg_Description).(string)
+		updateBody := &models.UpdateVirtualSerialNumber{
+			Description: &newDescription,
 		}
 
-		id := cloudInstanceID + "/" + *vsn.Serial
-		d.SetId(id)
-	} else {
-		if d.HasChange(Arg_Description) {
-			cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
-			client := instance.NewIBMPIVSNClient(ctx, sess, cloudInstanceID)
-
-			newDescription := d.Get(Arg_Description).(string)
-			updateBody := &models.UpdateVirtualSerialNumber{
-				Description: &newDescription,
-			}
-
-			vsnArg := d.Get(Arg_Serial).(string)
+		vsnArg := d.Get(Arg_Serial).(string)
 
-			_, err = client.Update(vsnArg, updateBody)
-			if err != nil {
-				return diag.FromErr(err)
-			}
+		_, err = client.Update(vsnArg, updateBody)
+		if err != nil {
+			return diag.FromErr(err)
 		}
 	}
 

website/docs/d/pi_virtual_serial_number.html.markdown

@@ -13,7 +13,7 @@ Retrieve information about an existing IBM Power Virtual Server Cloud Instance a
 ```terraform
 data "ibm_pi_virtual_serial_number" "ds_virtual_serial_number" {
   pi_cloud_instance_id     = "<cloud instance id>"
-  pi_virtual_serial_number = "<virtual serial number>"
+  pi_serial = "<virtual serial number>"
 }
 ```
 
@@ -35,7 +35,7 @@ Example usage:
 Review the argument reference that you can specify for your data source. 
 
 - `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account. 
-- `pi_virtual_serial_number` - (Required, String) Virtual serial number.
+- `pi_serial` - (Required, String) Virtual serial number.
 
 ## Attribute reference
 In addition to the argument reference list, you can access the following attribute references after your data source is created.

website/docs/d/pi_virtual_serial_numbers.html.markdown

@@ -35,12 +35,12 @@ Example usage:
 Review the argument reference that you can specify for your data source. 
 
 - `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account. 
-- `pi_instance_id` - (Required, String) Power virtual server instance id.
+- `pi_instance_id` - (Optional, String) Power virtual server instance ID.
 
 ## Attribute reference
 In addition to the argument reference list, you can access the following attribute references after your data source is created.
 
-- `virtual_serial_number` - (List) List of virtual serial numbers
+- `virtual_serial_numbers` - (List) List of virtual serial numbers
 
   Nested scheme for `virtual_serial_number`:
     - `description` - (String) Description for virtual serial number.