Update storage connection

Author: Diptipowervs

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240216115622-a311507b4b5b
-	github.com/IBM-Cloud/power-go-client v1.6.0
+	github.com/IBM-Cloud/power-go-client v1.6.0-beta11
 	github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca
 	github.com/IBM/appconfiguration-go-admin-sdk v0.3.0
 	github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f

go.sum

@@ -106,8 +106,8 @@ github.com/IBM-Cloud/bluemix-go v0.0.0-20240423071914-9e96525baef4/go.mod h1:/7h
 github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240216115622-a311507b4b5b h1:Wnq0BuprazpP41+nQlRpxpmAs8+8jyOqU50KrvFdJQ4=
 github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240216115622-a311507b4b5b/go.mod h1:xUQL9SGAjoZFd4GNjrjjtEpjpkgU7RFXRyHesbKTjiY=
 github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.5.3/go.mod h1:RiUvKuHKTBmBApDMUQzBL14pQUGKcx/IioKQPIcRQjs=
-github.com/IBM-Cloud/power-go-client v1.6.0 h1:X+QX+WSF66+aouyaf4r+IeBLXUurAJj9+Bd+vH7G5I0=
-github.com/IBM-Cloud/power-go-client v1.6.0/go.mod h1:0ad5Lcq1utoYVJx0uqooMjCpUaYaK0ItP9QJYtY6k0Y=
+github.com/IBM-Cloud/power-go-client v1.6.0-beta11 h1:OVDUo72VokP+cB8Rr8pEnLBdn14SSYkoIAFVHkowkjk=
+github.com/IBM-Cloud/power-go-client v1.6.0-beta11/go.mod h1:bvErc8Wjz3yBlL+BHJ+ScuzuJtR+5EFasMvusluF+Yc=
 github.com/IBM-Cloud/softlayer-go v1.0.5-tf h1:koUAyF9b6X78lLLruGYPSOmrfY2YcGYKOj/Ug9nbKNw=
 github.com/IBM-Cloud/softlayer-go v1.0.5-tf/go.mod h1:6HepcfAXROz0Rf63krk5hPZyHT6qyx2MNvYyHof7ik4=
 github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca h1:crniVcf+YcmgF03NmmfonXwSQ73oJF+IohFYBwknMxs=

ibm/acctest/acctest.go

@@ -188,37 +188,38 @@ var (
 // For Power Colo
 
 var (
+	Pi_auxiliary_volume_name        string
+	Pi_cloud_instance_id            string
+	Pi_dhcp_id                      string
 	Pi_image                        string
-	Pi_sap_image                    string
-	Pi_image_bucket_name            string
-	Pi_image_bucket_file_name       string
 	Pi_image_bucket_access_key      string
-	Pi_image_bucket_secret_key      string
+	Pi_image_bucket_file_name       string
+	Pi_image_bucket_name            string
 	Pi_image_bucket_region          string
+	Pi_image_bucket_secret_key      string
+	Pi_instance_name                string
 	Pi_key_name                     string
-	Pi_volume_name                  string
-	Pi_volume_id                    string
+	Pi_network_name                 string
+	Pi_placement_group_name         string
 	Pi_replication_volume_name      string
-	Pi_volume_onboarding_source_crn string
-	Pi_auxiliary_volume_name        string
-	Pi_volume_group_name            string
+	Pi_resource_group_id            string
+	Pi_sap_image                    string
+	Pi_shared_processor_pool_id     string
+	Pi_snapshot_id                  string
+	Pi_spp_placement_group_id       string
+	Pi_storage_connection           string
+	Pi_target_storage_tier          string
+	Pi_volume_clone_task_id         string
 	Pi_volume_group_id              string
+	Pi_volume_group_name            string
+	Pi_volume_id                    string
+	Pi_volume_name                  string
 	Pi_volume_onboarding_id         string
-	Pi_network_name                 string
-	Pi_cloud_instance_id            string
-	Pi_snapshot_id                  string
-	Pi_instance_name                string
-	Pi_dhcp_id                      string
+	Pi_volume_onboarding_source_crn string
 	PiCloudConnectionName           string
 	PiSAPProfileID                  string
-	Pi_placement_group_name         string
-	Pi_spp_placement_group_id       string
 	PiStoragePool                   string
 	PiStorageType                   string
-	Pi_shared_processor_pool_id     string
-	Pi_target_storage_tier          string
-	Pi_volume_clone_task_id         string
-	Pi_resource_group_id            string
 )
 
 var (
@@ -1136,7 +1137,10 @@ func init() {
 		Pi_shared_processor_pool_id = "tf-pi-shared-processor-pool"
 		fmt.Println("[WARN] Set the environment variable PI_SHARED_PROCESSOR_POOL_ID for testing ibm_pi_shared_processor_pool resource else it is set to default value 'tf-pi-shared-processor-pool'")
 	}
-
+	Pi_storage_connection = os.Getenv("PI_STORAGE_CONNECTION")
+	if Pi_storage_connection == "" {
+		fmt.Println("[WARN] Set the environment variable PI_STORAGE_CONNECTION for testing pi_storage_connection resource else it is empty")
+	}
 	Pi_target_storage_tier = os.Getenv("PI_TARGET_STORAGE_TIER")
 	if Pi_target_storage_tier == "" {
 		Pi_target_storage_tier = "terraform-test-tier"

ibm/service/power/data_source_ibm_pi_instance.go

@@ -182,6 +182,11 @@ func DataSourceIBMPIInstance() *schema.Resource {
 				Description: "The status of the instance.",
 				Type:        schema.TypeString,
 			},
+			Attr_StorageConnection: {
+				Computed:    true,
+				Description: "The storage connection type.",
+				Type:        schema.TypeString,
+			},
 			Attr_StoragePool: {
 				Computed:    true,
 				Description: "The storage Pool where server is deployed.",
@@ -245,6 +250,7 @@ func dataSourceIBMPIInstancesRead(ctx context.Context, d *schema.ResourceData, m
 	d.Set(Attr_SharedProcessorPool, powervmdata.SharedProcessorPool)
 	d.Set(Attr_SharedProcessorPoolID, powervmdata.SharedProcessorPoolID)
 	d.Set(Attr_Status, powervmdata.Status)
+	d.Set(Attr_StorageConnection, powervmdata.StorageConnection)
 	d.Set(Attr_StorageType, powervmdata.StorageType)
 	d.Set(Attr_StoragePool, powervmdata.StoragePool)
 	d.Set(Attr_StoragePoolAffinity, powervmdata.StoragePoolAffinity)

ibm/service/power/data_source_ibm_pi_instances.go

@@ -162,6 +162,11 @@ func DataSourceIBMPIInstances() *schema.Resource {
 							Description: "The status of the instance.",
 							Type:        schema.TypeString,
 						},
+						Attr_StorageConnection: {
+							Computed:    true,
+							Description: "The storage connection type.",
+							Type:        schema.TypeString,
+						},
 						Attr_StoragePool: {
 							Computed:    true,
 							Description: "The storage Pool where server is deployed.",
@@ -235,6 +240,7 @@ func flattenPvmInstances(list []*models.PVMInstanceReference) []map[string]inter
 			Attr_SharedProcessorPool:       i.SharedProcessorPool,
 			Attr_SharedProcessorPoolID:     i.SharedProcessorPoolID,
 			Attr_Status:                    *i.Status,
+			Attr_StorageConnection:         i.StorageConnection,
 			Attr_StoragePool:               i.StoragePool,
 			Attr_StoragePoolAffinity:       i.StoragePoolAffinity,
 			Attr_StorageType:               i.StorageType,

ibm/service/power/ibm_pi_constants.go

@@ -17,6 +17,7 @@ const (
 	Arg_IBMiPHA                             = "pi_ibmi_pha"
 	Arg_IBMiRDSUsers                        = "pi_ibmi_rds_users"
 	Arg_ImageName                           = "pi_image_name"
+	Arg_ImportDetails                       = "pi_image_import_details"
 	Arg_InstanceName                        = "pi_instance_name"
 	Arg_KeyName                             = "pi_key_name"
 	Arg_NetworkName                         = "pi_network_name"
@@ -153,6 +154,7 @@ const (
 	Attr_LastUpdatedDate                             = "last_updated_date"
 	Attr_Leases                                      = "leases"
 	Attr_LicenseRepositoryCapacity                   = "license_repository_capacity"
+	Attr_LicenseType                                 = "license_type"
 	Attr_Location                                    = "location"
 	Attr_MacAddress                                  = "macaddress"
 	Attr_MasterChangedVolumeName                     = "master_changed_volume_name"
@@ -200,6 +202,7 @@ const (
 	Attr_PrimaryRole                                 = "primary_role"
 	Attr_Processors                                  = "processors"
 	Attr_ProcType                                    = "proctype"
+	Attr_Product                                     = "product"
 	Attr_ProfileID                                   = "profile_id"
 	Attr_Profiles                                    = "profiles"
 	Attr_Progress                                    = "progress"
@@ -255,6 +258,7 @@ const (
 	Attr_Status                                      = "status"
 	Attr_StatusDescriptionErrors                     = "status_description_errors"
 	Attr_StatusDetail                                = "status_detail"
+	Attr_StorageConnection                           = "storage_connection"
 	Attr_StoragePool                                 = "storage_pool"
 	Attr_StoragePoolAffinity                         = "storage_pool_affinity"
 	Attr_StoragePoolsCapacity                        = "storage_pools_capacity"
@@ -281,6 +285,7 @@ const (
 	Attr_UsedIPPercent                               = "used_ip_percent"
 	Attr_UserIPAddress                               = "user_ip_address"
 	Attr_VCPUs                                       = "vcpus"
+	Attr_Vendor                                      = "vendor"
 	Attr_VirtualCoresAssigned                        = "virtual_cores_assigned"
 	Attr_VLanID                                      = "vlan_id"
 	Attr_VolumeGroupName                             = "volume_group_name"
@@ -300,8 +305,10 @@ const (
 	Attr_WorkspaceStatus                             = "pi_workspace_status"
 	Attr_WorkspaceType                               = "pi_workspace_type"
 	Attr_WWN                                         = "wwn"
-	OS_IBMI                                          = "ibmi"
 
+	MaxVolumeSupport = "maxVolumeSupport"
+	OS_IBMI          = "ibmi"
+	// Allowed Values
 	// TODO: Second Half Cleanup, remove extra variables
 
 	// SAP Profile

ibm/service/power/resource_ibm_pi_instance.go

@@ -138,7 +138,7 @@ func ResourceIBMPIInstance() *schema.Resource {
 			helpers.PIInstanceStorageConnection: {
 				Type:         schema.TypeString,
 				Optional:     true,
-				ValidateFunc: validate.ValidateAllowedStringValues([]string{"vSCSI"}),
+				ValidateFunc: validate.ValidateAllowedStringValues([]string{vSCSI, MaxVolumeSupport}),
 				Description:  "Storage Connectivity Group for server deployment",
 			},
 			PIInstanceStoragePoolAffinity: {

ibm/service/power/resource_ibm_pi_instance_test.go

@@ -224,7 +224,31 @@ func testAccCheckIBMPIInstanceReplicantConfig(name string) string {
 	  }
 	`, acc.Pi_cloud_instance_id, name, acc.Pi_image, acc.Pi_network_name, acc.Pi_volume_name)
 }
-
+func testAccCheckIBMPIInstanceStorageConnectionConfig(name, instanceHealthStatus string) string {
+	return fmt.Sprintf(`
+	resource "ibm_pi_volume" "power_volume" {
+		pi_cloud_instance_id = "%[1]s"
+		pi_volume_size       = 1
+		pi_volume_name       = "%[2]s"
+		pi_volume_type        = "tier3"
+	  }
+	resource "ibm_pi_instance" "power_instance" {
+		pi_cloud_instance_id = "%[1]s"
+		pi_memory            = "2"
+		pi_processors        = "1"
+		pi_instance_name     = "%[2]s"
+		pi_proc_type         = "shared"
+		pi_image_id          = "%[3]s"
+		pi_sys_type          = "s922"
+		pi_network {
+		  network_id = "%[4]s"
+		}
+		pi_storage_connection = "%[5]s"
+		pi_health_status      = "%[6]s"
+		pi_volume_ids         = [ibm_pi_volume.power_volume.volume_id]
+	  }
+	`, acc.Pi_cloud_instance_id, name, acc.Pi_image, acc.Pi_network_name, acc.Pi_storage_connection, instanceHealthStatus)
+}
 func testAccCheckIBMPIInstanceDestroy(s *terraform.State) error {
 	sess, err := acc.TestAccProvider.Meta().(conns.ClientSession).IBMPISession()
 	if err != nil {
@@ -305,7 +329,25 @@ func TestAccIBMPIInstanceBasic(t *testing.T) {
 		},
 	})
 }
-
+func TestAccIBMPIInstanceStorageConnection(t *testing.T) {
+	instanceRes := "ibm_pi_instance.power_instance"
+	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: testAccCheckIBMPIInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckIBMPIInstanceStorageConnectionConfig(name, helpers.PIInstanceHealthOk),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckIBMPIInstanceExists(instanceRes),
+					resource.TestCheckResourceAttr(instanceRes, "pi_instance_name", name),
+					resource.TestCheckResourceAttr(instanceRes, "pi_storage_connection", acc.Pi_storage_connection),
+				),
+			},
+		},
+	})
+}
 func TestAccIBMPIInstanceDeploymentType(t *testing.T) {
 	instanceRes := "ibm_pi_instance.power_instance"
 	name := fmt.Sprintf("tf-pi-instance-%d", acctest.RandIntRange(10, 100))

website/docs/d/pi_instance.html.markdown

@@ -7,23 +7,27 @@ description: |-
 ---
 
 # ibm_pi_instance
+
 Retrieve information about a Power Systems Virtual Server instance. For more information, about Power Virtual Server instance, see [getting started with IBM Power Systems Virtual Servers](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-getting-started).
 
 ## Example usage
+
 ```terraform
 data "ibm_pi_instance" "ds_instance" {
   pi_instance_name     = "terraform-test-instance"
   pi_cloud_instance_id = "49fba6c9-23f8-40bc-9899-aca322ee7d5b"
 }
 ```
 
-**Notes**
+### 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`
   - `zone` - `lon04`
 
 Example usage:
+
   ```terraform
     provider "ibm" {
       region    =   "lon"
@@ -32,18 +36,21 @@ Example usage:
   ```
 
 ## Argument reference
+
 Review the argument references 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_name` - (Required, String) The unique identifier or name of the instance.
 
 ## Attribute reference
+
 In addition to all argument reference list, you can access the following attribute references after your data source is created. 
 
 - `deployment_type` - (String) The custom deployment type.
 - `health_status` - (String) The health of the instance.
 
 **Notes** IBM i software licenses for IBM i virtual server instances -- only for IBM i instances
+
 - `ibmi_css` - (Boolean) IBM i Cloud Storage Solution.
 - `ibmi_pha` - (Boolean) IBM i Power High Availability.
 - `ibmi_rds` - (Boolean) IBM i Rational Dev Studio.
@@ -75,6 +82,7 @@ In addition to all argument reference list, you can access the following attribu
 - `shared_processor_pool`- (String) The name of the shared processor pool for the instance.
 - `shared_processor_pool_id` - (String)  The ID of the shared processor pool for the instance.
 - `status` - (String) The status of the instance.
+- `storage_connection` - (String) The storage connection type for the instance.
 - `storage_pool` - (String) The storage Pool where server is deployed.
 - `storage_pool_affinity` - (Boolean) Indicates if all volumes attached to the server must reside in the same storage pool.
 - `storage_type` - (String) The storage type where server is deployed.

website/docs/d/pi_instances.html.markdown

@@ -7,22 +7,26 @@ description: |-
 ---
 
 # ibm_pi_instances
+
 Retrieve information about all Power Systems Virtual Server instances for the given cloud instance. For more information, about Power Virtual Server instances, see [getting started with IBM Power Systems Virtual Servers](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-getting-started).
 
 ## Example usage
+
 ```terraform
 data "ibm_pi_instances" "ds_instance" {
   pi_cloud_instance_id = "49fba6c9-23f8-40bc-9899-aca322ee7d5b"
 }
 ```
 
-**Notes**
+### 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`
   - `zone` - `lon04`
 
 Example usage:
+
   ```terraform
     provider "ibm" {
       region    =   "lon"
@@ -31,20 +35,22 @@ Example usage:
   ```
 
 ## Argument reference
-Review the argument references that you can specify for your data source. 
+
+Review the argument references that you can specify for your data source.
 
 - `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account.
 
 ## Attribute reference
-In addition to all argument reference list, you can access the following attribute references after your data source is created. 
+
+In addition to all argument reference list, you can access the following attribute references after your data source is created.
 
 - `pvm_instances` - (List) List of power virtual server instances for the respective cloud instance.
 
   Nested scheme for `pvm_instances`:
   - `health_status` - (String) The health of the instance.
   - `license_repository_capacity` - (Deprecated, Integer) The VTL license repository capacity TB value. Only available with VTL instances.
   - `memory` - (Float) The amount of memory that is allocated to the instance.
-  - `minproc`- (Float) The minimum number of processors that must be allocated to the instance. 
+  - `minproc`- (Float) The minimum number of processors that must be allocated to the instance.
   - `maxproc`- (Float) The maximum number of processors that can be allocated to the instance without shutting down or rebooting the `LPAR`.
   - `max_virtual_cores` - (Integer) The maximum number of virtual cores that can be assigned without rebooting the instance.
   - `minmem`- (Float) The minimum amount of memory that must be allocated to the instance.
@@ -53,12 +59,12 @@ In addition to all argument reference list, you can access the following attribu
   - `networks` - (List) List of networks associated with this instance.
 
       Nested scheme for `networks`:
-      - `external_ip` - (String) The external IP address of the instance.
-      - `ip` - (String) The IP address of the instance.
-      - `macaddress` - (String) The MAC address of the instance.
-      - `network_id` - (String) The network ID of the instance.
-      - `network_name` - (String) The network name of the instance.
-      - `type` - (String) The type of the network.
+    - `external_ip` - (String) The external IP address of the instance.
+    - `ip` - (String) The IP address of the instance.
+    - `macaddress` - (String) The MAC address of the instance.
+    - `network_id` - (String) The network ID of the instance.
+    - `network_name` - (String) The network name of the instance.
+    - `type` - (String) The type of the network.
 
   - `pin_policy` - (String) The pinning policy of the instance.
   - `placement_group_id`- (String) The ID of the placement group that the instance is a member.
@@ -69,6 +75,7 @@ In addition to all argument reference list, you can access the following attribu
   - `shared_processor_pool`- (String) The name of the shared processor pool for the instance.
   - `shared_processor_pool_id` - (String)  The ID of the shared processor pool for the instance.
   - `status` - (String) The status of the instance.
+  - `storage_connection` - (String) The storage connection type for the instance
   - `storage_pool` - (String) The storage Pool where server is deployed.
   - `storage_pool_affinity` - (Boolean) Indicates if all volumes attached to the server must reside in the same storage pool.
   - `storage_type` - (String) The storage type where server is deployed.