Refactor deprecated fields and messages

ibm/service/power/data_source_ibm_pi_dhcp.go

@@ -63,7 +63,8 @@ func DataSourceIBMPIDhcp() *schema.Resource {
 			Attr_DhcpNetworkDeprecated: {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "The ID of the DHCP Server private network (deprecated - replaced by network_id)",
+				Description: "The ID of the DHCP Server private network",
+				Deprecated:  "This field is deprecated, use network_id instead",
 			},
 			Attr_DhcpNetworkID: {
 				Type:        schema.TypeString,

ibm/service/power/data_source_ibm_pi_dhcps.go

@@ -48,7 +48,8 @@ func DataSourceIBMPIDhcps() *schema.Resource {
 						Attr_DhcpNetworkDeprecated: {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "The ID of the DHCP Server private network (deprecated - replaced by network_id)",
+							Description: "The ID of the DHCP Server private network",
+							Deprecated:  "This field is deprecated, use network_id instead",
 						},
 						Attr_DhcpNetworkID: {
 							Type:        schema.TypeString,

ibm/service/power/data_source_ibm_pi_network.go

@@ -66,7 +66,7 @@ func DataSourceIBMPINetwork() *schema.Resource {
 			"name": {
 				Type:       schema.TypeString,
 				Computed:   true,
-				Deprecated: "This value is deprecated in favor of" + helpers.PINetworkName,
+				Deprecated: "This field is deprecated, use pi_network_name instead",
 			},
 			"dns": {
 				Type:     schema.TypeSet,

ibm/service/power/resource_ibm_pi_dhcp.go

@@ -101,7 +101,8 @@ func ResourceIBMPIDhcp() *schema.Resource {
 			Attr_DhcpNetworkDeprecated: {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "The ID of the DHCP Server private network (deprecated - replaced by network_id)",
+				Description: "The ID of the DHCP Server private network",
+				Deprecated:  "This field is deprecated, use network_id instead",
 			},
 			Attr_DhcpNetworkID: {
 				Type:        schema.TypeString,

ibm/service/power/resource_ibm_pi_instance.go

@@ -61,6 +61,7 @@ func ResourceIBMPIInstance() *schema.Resource {
 				Optional:    true,
 				Computed:    true,
 				Description: "set to true to enable migration of the PI instance",
+				Deprecated:  "This field is deprecated, use pin_policy instead",
 			},
 			"min_processors": {
 				Type:        schema.TypeFloat,
@@ -313,12 +314,6 @@ func ResourceIBMPIInstance() *schema.Resource {
 				Default:      "none",
 				ValidateFunc: validate.ValidateAllowedStringValues([]string{"none", "soft", "hard"}),
 			},
-
-			// "reboot_for_resource_change": {
-			// 	Type:        schema.TypeString,
-			// 	Optional:    true,
-			// 	Description: "Flag to be passed for CPU/Memory changes that require a reboot to take effect",
-			// },
 			"operating_system": {
 				Type:        schema.TypeString,
 				Computed:    true,

ibm/service/power/resource_ibm_pi_key.go

@@ -56,9 +56,10 @@ func ResourceIBMPIKey() *schema.Resource {
 				Description: "Date of SSH Key creation",
 			},
 			Attr_KeyID: {
-				Type:       schema.TypeString,
-				Computed:   true,
-				Deprecated: "User defined name for the SSH key (deprecated - replaced by name)",
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "User defined name for the SSH key",
+				Deprecated:  "This field is deprecated, use pi_key_name instead",
 			},
 			Attr_KeyName: {
 				Type:        schema.TypeString,

ibm/service/power/resource_ibm_pi_network_port_attach.go

@@ -72,7 +72,7 @@ func ResourceIBMPINetworkPortAttach() *schema.Resource {
 			"port_id": {
 				Type:       schema.TypeString,
 				Computed:   true,
-				Deprecated: "port_id attribute is deprecated, use network_port_id instead.",
+				Deprecated: "This field is deprecated, use network_port_id instead",
 			},
 			"network_port_id": {
 				Type:     schema.TypeString,

website/docs/d/pi_dhcp.html.markdown

@@ -34,7 +34,7 @@ In addition to all argument reference list, you can access the following attribu
   Nested scheme for `leases`:
   - `instance_ip` - (String) The IP of the PVM Instance.
   - `instance_mac` - (String) The MAC Address of the PVM Instance.
-- `network` - (String) The ID of the DHCP Server private network (deprecated - replaced by `network_id`).
+- `network` - (Deprecated, String) The ID of the DHCP Server private network.
 - `network_id`- (String) The ID of the DHCP Server private network.
 - `network_name` - The name of the DHCP Server private network.
 - `status` - (String) The status of the DHCP Server.

website/docs/d/pi_dhcps.html.markdown

@@ -33,7 +33,7 @@ In addition to all argument reference list, you can access the following attribu
 
   Nested scheme for `servers`:
   - `dhcp_id` - (String) The ID of the DHCP Server.
-  - `network` - (String) The ID of the DHCP Server private network (deprecated - replaced by `network_id`).
+  - `network` - (Deprecated, String) The ID of the DHCP Server private network.
   - `network_id`- (String) The ID of the DHCP Server private network.
   - `network_name` - The name of the DHCP Server private network.
   - `status` - (String) The status of the DHCP Server.

website/docs/r/pi_dhcp.html.markdown

@@ -40,7 +40,7 @@ In addition to all argument reference list, you can access the following attribu
   Nested scheme for `leases`:
   - `instance_ip` - (String) The IP of the PVM Instance.
   - `instance_mac` - (String) The MAC Address of the PVM Instance.
-- `network` - (String) The ID of the DHCP Server private network (deprecated - replaced by `network_id`).
+- `network` - (Deprecated, String) The ID of the DHCP Server private network.
 - `network_id`- (String) The ID of the DHCP Server private network.
 - `network_name` - The name of the DHCP Server private network.
 - `status` - (String) The status of the DHCP Server.

website/docs/r/pi_instance.html.markdown

@@ -74,7 +74,7 @@ Review the argument references that you can specify for your resource.
   - **Note**: Provisioning VTL instances is temporarily disabled.
 - `pi_memory` - (Optional, Float) The amount of memory that you want to assign to your instance in gigabytes.
   - Required when not creating SAP instances. Conflicts with `pi_sap_profile_id`.
-- `pi_migratable`- (Optional, Bool) Indicates the VM is migrated or not.
+- `pi_migratable`- (Deprecated, Optional, Bool) Indicates the VM is migrated or not.
 - `pi_network` - (Required, List of Map) List of one or more networks to attach to the instance.
 
   The `pi_network` block supports:

website/docs/r/pi_key.html.markdown

@@ -32,7 +32,7 @@ Review the argument references that you can specify for your resource.
  In addition to all argument reference list, you can access the following attribute reference after your resource is created.
 
 - `id` - (String) The unique identifier of the key. The ID is composed of `<pi_cloud_instance_id>/<pi_key_name>`.
-- `key_id` - (String) User defined name for the SSH key (deprecated - replaced by `name`).
+- `key_id` - (Deprecated, String) User defined name for the SSH key.
 - `name` - (String) User defined name for the SSH key
 - `creation_date` - (String) Date of SSH Key creation. 
 - `ssh_key` - (String) SSH RSA key.

website/docs/r/pi_network_port_attach.html.markdown

@@ -61,7 +61,7 @@ In addition to all argument reference list, you can access the following attribu
 - `id` - (String) The unique identifier of the instance. The ID is composed of `<pi_cloud_instance_id>/<power_network_port_id>/<id>`.
 - `macaddress` - (String) The MAC address of the port.
 - `network_port_id` - (String) The ID of the port.
-- `portid` - (Deprecated, String) The ID of the port.
+- `port_id` - (Deprecated, String) The ID of the port.
 - `public_ip` - (String) The public IP associated with the port.
 - `status` - (String) The status of the port.