From 5a44c2b3bfbb16bf7aac5e3a5857e5f91a9eee6f Mon Sep 17 00:00:00 2001 From: Diptipowervs Date: Fri, 29 Dec 2023 17:28:36 +0530 Subject: [PATCH 1/4] Refactor ssh key data source and documentation --- ibm/service/power/data_source_ibm_pi_key.go | 52 +++++++------------ .../power/data_source_ibm_pi_key_test.go | 10 ++-- ibm/service/power/data_source_ibm_pi_keys.go | 39 ++++++-------- .../power/data_source_ibm_pi_keys_test.go | 3 +- ibm/service/power/ibm_pi_constants.go | 3 ++ website/docs/d/pi_key.html.markdown | 40 +++++++------- website/docs/d/pi_keys.html.markdown | 38 ++++++-------- 7 files changed, 78 insertions(+), 107 deletions(-) diff --git a/ibm/service/power/data_source_ibm_pi_key.go b/ibm/service/power/data_source_ibm_pi_key.go index 70ab96ba7c7..b7f928828f8 100644 --- a/ibm/service/power/data_source_ibm_pi_key.go +++ b/ibm/service/power/data_source_ibm_pi_key.go @@ -6,79 +6,65 @@ package power import ( "context" - "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" - "github.com/IBM-Cloud/power-go-client/clients/instance" "github.com/IBM-Cloud/power-go-client/helpers" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" + "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" ) func DataSourceIBMPIKey() *schema.Resource { - return &schema.Resource{ ReadContext: dataSourceIBMPIKeyRead, Schema: map[string]*schema.Schema{ - // Arguments - Arg_KeyName: { - Type: schema.TypeString, + Arg_CloudInstanceID: { + Description: "The GUID of the service instance associated with an account.", Required: true, - Description: "SSH key name for a pcloud tenant", + Type: schema.TypeString, ValidateFunc: validation.NoZeroValues, }, - Arg_CloudInstanceID: { - Type: schema.TypeString, + Arg_KeyName: { Required: true, + Description: "User defined name for the SSH key.", ValidateFunc: validation.NoZeroValues, + Type: schema.TypeString, }, // Attributes - Attr_KeyCreationDate: { - Type: schema.TypeString, + Attr_CreationDate: { Computed: true, - Description: "Date of sshkey creation", - }, - Attr_Key: { + Description: "Date of SSH Key creation.", Type: schema.TypeString, - Sensitive: true, - Computed: true, - Description: "SSH RSA key", }, - "sshkey": { - Type: schema.TypeString, - Sensitive: true, - Computed: true, - Deprecated: "This field is deprecated, use ssh_key instead", + Attr_SSHKey: { + Computed: true, + Description: "SSH RSA key.", + Sensitive: true, + Type: schema.TypeString, }, }, } } func dataSourceIBMPIKeyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - - // session sess, err := meta.(conns.ClientSession).IBMPISession() if err != nil { return diag.FromErr(err) } - // arguments - cloudInstanceID := d.Get(helpers.PICloudInstanceId).(string) + cloudInstanceID := d.Get(Arg_CloudInstanceID).(string) - // get key sshkeyC := instance.NewIBMPIKeyClient(ctx, sess, cloudInstanceID) sshkeydata, err := sshkeyC.Get(d.Get(helpers.PIKeyName).(string)) if err != nil { return diag.FromErr(err) } - // set attributes d.SetId(*sshkeydata.Name) - d.Set(Attr_KeyCreationDate, sshkeydata.CreationDate.String()) - d.Set(Attr_Key, sshkeydata.SSHKey) - d.Set("sshkey", sshkeydata.SSHKey) // TODO: deprecated, to remove + d.Set(Attr_CreationDate, sshkeydata.CreationDate.String()) + d.Set(Attr_SSHKey, sshkeydata.SSHKey) return nil } diff --git a/ibm/service/power/data_source_ibm_pi_key_test.go b/ibm/service/power/data_source_ibm_pi_key_test.go index 184b74a0ec3..a4fb373339e 100644 --- a/ibm/service/power/data_source_ibm_pi_key_test.go +++ b/ibm/service/power/data_source_ibm_pi_key_test.go @@ -13,7 +13,6 @@ import ( ) func TestAccIBMPIKeyDataSource_basic(t *testing.T) { - resource.Test(t, resource.TestCase{ PreCheck: func() { acc.TestAccPreCheck(t) }, Providers: acc.TestAccProviders, @@ -30,9 +29,8 @@ func TestAccIBMPIKeyDataSource_basic(t *testing.T) { func testAccCheckIBMPIKeyDataSourceConfig() string { return fmt.Sprintf(` -data "ibm_pi_key" "testacc_ds_key" { - pi_key_name = "%s" - pi_cloud_instance_id = "%s" -}`, acc.Pi_key_name, acc.Pi_cloud_instance_id) - + data "ibm_pi_key" "testacc_ds_key" { + pi_key_name = "%s" + pi_cloud_instance_id = "%s" + }`, acc.Pi_key_name, acc.Pi_cloud_instance_id) } diff --git a/ibm/service/power/data_source_ibm_pi_keys.go b/ibm/service/power/data_source_ibm_pi_keys.go index 0f78a9ab4ec..f4c68220910 100644 --- a/ibm/service/power/data_source_ibm_pi_keys.go +++ b/ibm/service/power/data_source_ibm_pi_keys.go @@ -13,7 +13,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" st "github.com/IBM-Cloud/power-go-client/clients/instance" - "github.com/IBM-Cloud/power-go-client/helpers" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" ) @@ -21,56 +20,51 @@ func DataSourceIBMPIKeys() *schema.Resource { return &schema.Resource{ ReadContext: dataSourceIBMPIKeysRead, Schema: map[string]*schema.Schema{ - // Arguments Arg_CloudInstanceID: { - Type: schema.TypeString, + Description: "The GUID of the service instance associated with an account.", Required: true, - Description: "PI cloud instance ID", + Type: schema.TypeString, ValidateFunc: validation.NoZeroValues, }, // Attributes Attr_Keys: { - Type: schema.TypeList, Computed: true, - Description: "SSH Keys", + Description: "List of all the SSH keys.", Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - Attr_KeyName: { - Type: schema.TypeString, + Attr_KeyCreationDate: { Computed: true, - Description: "User defined name for the SSH key", - }, - Attr_Key: { + Description: "Date of SSH key creation.", Type: schema.TypeString, - Computed: true, - Description: "SSH RSA key", }, - Attr_KeyCreationDate: { + Attr_Name: { + Computed: true, + Description: "User defined name for the SSH key.", Type: schema.TypeString, + }, + Attr_SSHKey: { Computed: true, - Description: "Date of SSH key creation", + Description: "SSH RSA key.", + Type: schema.TypeString, }, }, }, + Type: schema.TypeList, }, }, } } func dataSourceIBMPIKeysRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { - - // session sess, err := meta.(conns.ClientSession).IBMPISession() if err != nil { return diag.FromErr(err) } - // arguments - cloudInstanceID := d.Get(helpers.PICloudInstanceId).(string) + cloudInstanceID := d.Get(Arg_CloudInstanceID).(string) - // get keys client := st.NewIBMPIKeyClient(ctx, sess, cloudInstanceID) sshKeys, err := client.GetAll() if err != nil { @@ -78,13 +72,12 @@ func dataSourceIBMPIKeysRead(ctx context.Context, d *schema.ResourceData, meta i return diag.FromErr(err) } - // set attributes result := make([]map[string]interface{}, 0, len(sshKeys.SSHKeys)) for _, sshKey := range sshKeys.SSHKeys { key := map[string]interface{}{ - Attr_KeyName: sshKey.Name, - Attr_Key: sshKey.SSHKey, Attr_KeyCreationDate: sshKey.CreationDate.String(), + Attr_Name: sshKey.Name, + Attr_SSHKey: sshKey.SSHKey, } result = append(result, key) } diff --git a/ibm/service/power/data_source_ibm_pi_keys_test.go b/ibm/service/power/data_source_ibm_pi_keys_test.go index f45dfc7fcee..e7b135bb1c4 100644 --- a/ibm/service/power/data_source_ibm_pi_keys_test.go +++ b/ibm/service/power/data_source_ibm_pi_keys_test.go @@ -31,6 +31,5 @@ func testAccCheckIBMPIKeysDataSourceConfig() string { return fmt.Sprintf(` data "ibm_pi_keys" "test" { pi_cloud_instance_id = "%s" - } - `, acc.Pi_cloud_instance_id) + } `, acc.Pi_cloud_instance_id) } diff --git a/ibm/service/power/ibm_pi_constants.go b/ibm/service/power/ibm_pi_constants.go index 8e66a4bd837..5c16f881fc4 100644 --- a/ibm/service/power/ibm_pi_constants.go +++ b/ibm/service/power/ibm_pi_constants.go @@ -15,6 +15,9 @@ const ( Attr_KeyCreationDate = "creation_date" Attr_Key = "ssh_key" Attr_KeyName = "name" + Attr_CreationDate = "creation_date" + Attr_SSHKey = "ssh_key" + Attr_Name = "name" // SAP Profile PISAPProfiles = "profiles" diff --git a/website/docs/d/pi_key.html.markdown b/website/docs/d/pi_key.html.markdown index 19b824e44c5..69eda7ca5b5 100644 --- a/website/docs/d/pi_key.html.markdown +++ b/website/docs/d/pi_key.html.markdown @@ -1,28 +1,40 @@ --- - subcategory: "Power Systems" layout: "ibm" page_title: "IBM: pi_key" description: |- - Manages an key in the Power Virtual Server cloud. + Manages an SSH key in the Power Virtual Server cloud. --- # ibm_pi_key -Retrieve information about the SSH key that is used for your Power Systems Virtual Server instance. The SSH key is used to access the instance after it is created. For more information, about [configuring your IBM virtual machine (VM)](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-creating-ssh-key). +Retrieve information about the SSH key that is used for your Power Systems Virtual Server instance. The SSH key is used to access the instance after it is created. For more information, about [generating and using SSH Keys](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-creating-ssh-key). ## Example usage - ```terraform data "ibm_pi_key" "ds_instance" { pi_key_name = "terraform-test-key" pi_cloud_instance_id = "49fba6c9-23f8-40bc-9899-aca322ee7d5b" } ``` - + +**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" + zone = "lon04" + } + ``` + ## Argument reference Review the argument references that you can specify for your data source. -- `pi_cloud_instance_id` - (Required, String) Cloud Instance ID of a PCloud Instance. +- `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account. - `pi_key_name` - (Required, String) User defined name for the SSH key. ## Attribute reference @@ -31,19 +43,3 @@ In addition to all argument reference list, you can access the following attribu - `id` - (String) User defined name for the SSH key - `creation_date` - (String) Date of SSH Key creation. - `ssh_key` - (String) SSH RSA key. - -**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" - zone = "lon04" - } - ``` \ No newline at end of file diff --git a/website/docs/d/pi_keys.html.markdown b/website/docs/d/pi_keys.html.markdown index 305c0f4a9df..dd5dac4d130 100644 --- a/website/docs/d/pi_keys.html.markdown +++ b/website/docs/d/pi_keys.html.markdown @@ -1,5 +1,4 @@ --- - subcategory: "Power Systems" layout: "ibm" page_title: "IBM: pi_keys" @@ -8,20 +7,33 @@ description: |- --- # ibm_pi_keys -Retrieve information about all SSH keys. For more information, see [getting started with IBM Power Systems Virtual Servers](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-getting-started). +Retrieve information about all SSH keys. For more information, about [generating and using SSH Keys](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-creating-ssh-key). ## Example usage - ```terraform data "ibm_pi_keys" "example" { pi_cloud_instance_id = "" } ``` - + +**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" + zone = "lon04" + } + ``` + ## Argument reference Review the argument references that you can specify for your data source. -- `pi_cloud_instance_id` - (Required, String) Cloud Instance ID of a PCloud Instance. +- `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. @@ -32,19 +44,3 @@ In addition to all argument reference list, you can access the following attribu - `name` - (String) User defined name for the SSH key - `creation_date` - (String) Date of SSH Key creation. - `ssh_key` - (String) SSH RSA key. - -**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" - zone = "lon04" - } - ``` \ No newline at end of file From a104dc1376dd2e94d7f4cb6354fbfa8310835562 Mon Sep 17 00:00:00 2001 From: Diptipowervs Date: Fri, 5 Jan 2024 18:04:04 +0530 Subject: [PATCH 2/4] Pull ibm_ pi_constants.go from constant-refactor --- ibm/service/power/ibm_pi_constants.go | 306 +++++++++++++++++++++----- 1 file changed, 251 insertions(+), 55 deletions(-) diff --git a/ibm/service/power/ibm_pi_constants.go b/ibm/service/power/ibm_pi_constants.go index 5c16f881fc4..7229f238312 100644 --- a/ibm/service/power/ibm_pi_constants.go +++ b/ibm/service/power/ibm_pi_constants.go @@ -3,21 +3,238 @@ package power import "time" const ( - // used by all - Arg_CloudInstanceID = "pi_cloud_instance_id" - - // Keys - Arg_KeyName = "pi_key_name" - Arg_Key = "pi_ssh_key" - - Attr_KeyID = "key_id" - Attr_Keys = "keys" - Attr_KeyCreationDate = "creation_date" - Attr_Key = "ssh_key" - Attr_KeyName = "name" - Attr_CreationDate = "creation_date" - Attr_SSHKey = "ssh_key" - Attr_Name = "name" + // Arguments + Arg_CloudConnectionName = "pi_cloud_connection_name" + Arg_CloudInstanceID = "pi_cloud_instance_id" + Arg_ImageName = "pi_image_name" + Arg_InstanceName = "pi_instance_name" + Arg_Key = "pi_ssh_key" + Arg_KeyName = "pi_key_name" + Arg_NetworkName = "pi_network_name" + Arg_PlacementGroupName = "pi_placement_group_name" + Arg_SAP = "sap" + Arg_SAPProfileID = "pi_sap_profile_id" + Arg_SPPPlacementGroupID = "pi_spp_placement_group_id" + Arg_SPPPlacementGroupName = "pi_spp_placement_group_name" + Arg_SPPPlacementGroupPolicy = "pi_spp_placement_group_policy" + Arg_SharedProcessorPoolHostGroup = "pi_shared_processor_pool_host_group" + Arg_SharedProcessorPoolID = "pi_shared_processor_pool_id" + Arg_SharedProcessorPoolName = "pi_shared_processor_pool_name" + Arg_SharedProcessorPoolPlacementGroupID = "pi_shared_processor_pool_placement_group_id" + Arg_SharedProcessorPoolReservedCores = "pi_shared_processor_pool_reserved_cores" + Arg_StoragePool = "pi_storage_pool" + Arg_StorageType = "pi_storage_type" + Arg_VTL = "vtl" + Arg_VolumeGroupID = "pi_volume_group_id" + Arg_VolumeID = "pi_volume_id" + Arg_VolumeOnboardingID = "pi_volume_onboarding_id" + + // Attributes + Attr_AccessConfig = "access_config" + Attr_Action = "action" + Attr_Addresses = "addresses" + Attr_AllocatedCores = "allocated_cores" + Attr_Architecture = "architecture" + Attr_Auxiliary = "auxiliary" + Attr_AuxiliaryChangedVolumeName = "auxiliary_changed_volume_name" + Attr_AuxiliaryVolumeName = "auxiliary_volume_name" + Attr_AvailabilityZone = "availability_zone" + Attr_AvailableCores = "available_cores" + Attr_AvailableIPCount = "available_ip_count" + Attr_BootVolumeID = "boot_volume_id" + Attr_Bootable = "bootable" + Attr_CIDR = "cidr" + Attr_CPUs = "cpus" + Attr_CRN = "crn" + Attr_Capabilities = "capabilities" + Attr_Capacity = "capacity" + Attr_Certified = "certified" + Attr_ClassicEnabled = "classic_enabled" + Attr_CloudConnectionID = "cloud_connection_id" + Attr_CloudInstanceID = "cloud_instance_id" + Attr_CloudInstances = "cloud_instances" + Attr_Code = "code" + Attr_ConnectionMode = "connection_mode" + Attr_Connections = "connections" + Attr_ConsistencyGroupName = "consistency_group_name" + Attr_ConsoleLanguages = "console_languages" + Attr_ContainerFormat = "container_format" + Attr_CopyRate = "copy_rate" + Attr_CopyType = "copy_type" + Attr_CoreMemoryRatio = "core_memory_ratio" + Attr_Cores = "cores" + Attr_CreateTime = "create_time" + Attr_CreationDate = "creation_date" + Attr_CyclePeriodSeconds = "cycle_period_seconds" + Attr_CyclingMode = "cycling_mode" + Attr_DNS = "dns" + Attr_Datacenters = "datacenters" + Attr_Default = "default" + Attr_DeploymentType = "deployment_type" + Attr_Description = "description" + Attr_DisasterRecoveryLocations = "disaster_recovery_locations" + Attr_DiskFormat = "disk_format" + Attr_DiskType = "disk_type" + Attr_Enabled = "enabled" + Attr_Endianness = "endianness" + Attr_ExternalIP = "external_ip" + Attr_FailureMessage = "failure_message" + Attr_FlashCopyMappings = "flash_copy_mappings" + Attr_FlashCopyName = "flash_copy_name" + Attr_FreezeTime = "freeze_time" + Attr_Gateway = "gateway" + Attr_GlobalRouting = "global_routing" + Attr_GreDestinationAddress = "gre_destination_address" + Attr_GreSourceAddress = "gre_source_address" + Attr_GroupID = "group_id" + Attr_HealthStatus = "health_status" + Attr_HostID = "host_id" + Attr_Href = "href" + Attr_Hypervisor = "hypervisor" + Attr_HypervisorType = "hypervisor_type" + Attr_IBMIPAddress = "ibm_ip_address" + Attr_ID = "id" + Attr_IP = "ip" + Attr_IPAddress = "ipaddress" + Attr_IPOctet = "ipoctet" + Attr_ImageID = "image_id" + Attr_ImageInfo = "image_info" + Attr_ImageType = "image_type" + Attr_Images = "images" + Attr_InputVolumes = "input_volumes" + Attr_InstanceSnapshots = "instance_snapshots" + Attr_InstanceVolumes = "instance_volumes" + Attr_Instances = "instances" + Attr_IsActive = "is_active" + Attr_Jumbo = "jumbo" + Attr_Key = "key" + Attr_KeyCreationDate = "creation_date" + Attr_KeyID = "key_id" + Attr_KeyName = "name" + Attr_Keys = "keys" + Attr_Language = "language" + Attr_LastUpdateDate = "last_update_date" + Attr_LastUpdatedDate = "last_updated_date" + Attr_Leases = "leases" + Attr_LicenseRepositoryCapacity = "license_repository_capacity" + Attr_Location = "location" + Attr_MTU = "mtu" + Attr_MacAddress = "macaddress" + Attr_MasterChangedVolumeName = "master_changed_volume_name" + Attr_MasterVolumeName = "master_volume_name" + Attr_Max = "max" + Attr_MaxAllocationSize = "max_allocation_size" + Attr_MaxAvailable = "max_available" + Attr_MaxCoresAvailable = "max_cores_available" + Attr_MaxMem = "maxmem" + Attr_MaxMemoryAvailable = "max_memory_available" + Attr_MaxProc = "maxproc" + Attr_MaxVirtualCores = "max_virtual_cores" + Attr_MaximumStorageAllocation = "max_storage_allocation" + Attr_Members = "members" + Attr_Memory = "memory" + Attr_Message = "message" + Attr_Metered = "metered" + Attr_Min = "min" + Attr_MinMem = "minmem" + Attr_MinProc = "minproc" + Attr_MinVirtualCores = "min_virtual_cores" + Attr_MirroringState = "mirroring_state" + Attr_Name = "name" + Attr_NetworkID = "network_id" + Attr_NetworkName = "network_name" + Attr_NetworkPorts = "network_ports" + Attr_Networks = "networks" + Attr_NumberOfVolumes = "number_of_volumes" + Attr_Onboardings = "onboardings" + Attr_OperatingSystem = "operating_system" + Attr_PVMInstanceID = "pvm_instance_id" + Attr_PVMInstances = "pvm_instances" + Attr_PVMSnapshots = "pvm_snapshots" + Attr_PercentComplete = "percent_complete" + Attr_PinPolicy = "pin_policy" + Attr_PlacementGroupID = "placement_group_id" + Attr_PlacementGroups = "placement_groups" + Attr_Policy = "policy" + Attr_Pool = "pool" + Attr_PoolName = "pool_name" + Attr_Port = "port" + Attr_PortID = "portid" + Attr_PrimaryRole = "primary_role" + Attr_ProcType = "proctype" + Attr_Processors = "processors" + Attr_ProfileID = "profile_id" + Attr_Profiles = "profiles" + Attr_Progress = "progress" + Attr_PublicIP = "public_ip" + Attr_Region = "region" + Attr_RemoteCopyID = "remote_copy_id" + Attr_RemoteCopyRelationshipNames = "remote_copy_relationship_names" + Attr_RemoteCopyRelationships = "remote_copy_relationships" + Attr_ReplicationEnabled = "replication_enabled" + Attr_ReplicationSites = "replication_sites" + Attr_ReplicationStatus = "replication_status" + Attr_ReplicationType = "replication_type" + Attr_ReservedCores = "reserved_cores" + Attr_ResultsOnboardedVolumes = "results_onboarded_volumes" + Attr_ResultsVolumeOnboardingFailures = "results_volume_onboarding_failures" + Attr_SPPPlacementGroups = "spp_placement_groups" + Attr_SSHKey = "ssh_key" + Attr_Shareable = "shreable" + Attr_SharedCoreRatio = "shared_core_ratio" + Attr_SharedProcessorPool = "shared_processor_pool" + Attr_SharedProcessorPoolID = "shared_processor_pool_id" + Attr_SharedProcessorPoolPlacementGroups = "spp_placement_groups" + Attr_SharedProcessorPoolStatus = "status" + Attr_SharedProcessorPools = "shared_processor_pools" + Attr_Size = "size" + Attr_SourceVolumeName = "source_volume_name" + Attr_Speed = "speed" + Attr_StartTime = "start_time" + Attr_State = "state" + Attr_Status = "status" + Attr_StatusDescriptionErrors = "status_description_errors" + Attr_StatusDetail = "status_detail" + Attr_StoragePool = "storage_pool" + Attr_StoragePoolAffinity = "storage_pool_affinity" + Attr_StoragePoolsCapacity = "storage_pools_capacity" + Attr_StorageType = "storage_type" + Attr_StorageTypesCapacity = "storage_types_capacity" + Attr_Synchronized = "synchronized" + Attr_SysType = "systype" + Attr_SystemPoolName = "system_pool_name" + Attr_SystemPools = "system_pools" + Attr_Systems = "systems" + Attr_TargetVolumeName = "target_volume_name" + Attr_TenantID = "tenant_id" + Attr_TenantName = "tenant_name" + Attr_TotalCapacity = "total_capacity" + Attr_TotalInstances = "total_instances" + Attr_TotalMemoryConsumed = "total_memory_consumed" + Attr_TotalProcessorsConsumed = "total_processors_consumed" + Attr_TotalSSDStorageConsumed = "total_ssd_storage_consumed" + Attr_TotalStandardStorageConsumed = "total_standard_storage_consumed" + Attr_Type = "type" + Attr_URL = "url" + Attr_Uncapped = "uncapped" + Attr_UsedIPCount = "used_ip_count" + Attr_UsedIPPercent = "used_ip_percent" + Attr_UserIPAddress = "user_ip_address" + Attr_VCPUs = "vcpus" + Attr_VLanID = "vlan_id" + Attr_VPCCRNs = "vpc_crns" + Attr_VPCEnabled = "vpc_enabled" + Attr_VirtualCoresAssigned = "virtual_cores_assigned" + Attr_VolumeGroupName = "volume_group_name" + Attr_VolumeGroups = "volume_groups" + Attr_VolumeIDs = "volume_ids" + Attr_VolumePool = "volume_pool" + Attr_VolumeSnapshots = "volume_snapshots" + Attr_Volumes = "volumes" + Attr_WWN = "wwn" + Attr_Workspaces = "workspaces" + + // TODO: Second Half Cleanup, remove extra variables // SAP Profile PISAPProfiles = "profiles" @@ -50,10 +267,6 @@ const ( Arg_PVMInstanceActionType = "pi_action" Arg_PVMInstanceHealthStatus = "pi_health_status" - Attr_Status = "status" - Attr_Progress = "progress" - Attr_HealthStatus = "health_status" - PVMInstanceHealthOk = "OK" PVMInstanceHealthWarning = "WARNING" @@ -61,14 +274,24 @@ const ( warningTimeOut = 60 * time.Second activeTimeOut = 2 * time.Minute // power service instance capabilities - CUSTOM_VIRTUAL_CORES = "custom-virtualcores" - PIInstanceDeploymentType = "pi_deployment_type" - PIInstanceNetwork = "pi_network" - PIInstanceStoragePool = "pi_storage_pool" - PISAPInstanceProfileID = "pi_sap_profile_id" - PISAPInstanceDeploymentType = "pi_sap_deployment_type" - PIInstanceStoragePoolAffinity = "pi_storage_pool_affinity" - Arg_PIInstanceSharedProcessorPool = "pi_shared_processor_pool" + CUSTOM_VIRTUAL_CORES = "custom-virtualcores" + + //Arg_CloudInstanceID = "pi_cloud_instance_id" + PIInstanceDeploymentType = "pi_deployment_type" + PIInstanceMigratable = "pi_migratable" + PIInstanceNetwork = "pi_network" + PIInstanceLicenseRepositoryCapacity = "pi_license_repository_capacity" + PIInstanceStoragePool = "pi_storage_pool" + PIInstanceStorageType = "pi_storage_type" + PISAPInstanceProfileID = "pi_sap_profile_id" + PISAPInstanceDeploymentType = "pi_sap_deployment_type" + PIInstanceSharedProcessorPool = "pi_shared_processor_pool" + PIInstanceStorageConnection = "pi_storage_connection" + PIInstanceStoragePoolAffinity = "pi_storage_pool_affinity" + + PIInstanceUserData = "pi_user_data" + PIInstanceVolumeIds = "pi_volume_ids" + Attr_PIInstanceSharedProcessorPool = "shared_processor_pool" Attr_PIInstanceSharedProcessorPoolID = "shared_processor_pool_id" @@ -107,37 +330,10 @@ const ( // Cloud Connections PICloudConnectionTransitEnabled = "pi_cloud_connection_transit_enabled" - // Shared Processor Pool - Arg_SharedProcessorPoolName = "pi_shared_processor_pool_name" - Arg_SharedProcessorPoolHostGroup = "pi_shared_processor_pool_host_group" - Arg_SharedProcessorPoolPlacementGroupID = "pi_shared_processor_pool_placement_group_id" - Arg_SharedProcessorPoolReservedCores = "pi_shared_processor_pool_reserved_cores" - Arg_SharedProcessorPoolID = "pi_shared_processor_pool_id" - Attr_SharedProcessorPoolID = "shared_processor_pool_id" - Attr_SharedProcessorPoolName = "name" - Attr_SharedProcessorPoolReservedCores = "reserved_cores" - Attr_SharedProcessorPoolAvailableCores = "available_cores" - Attr_SharedProcessorPoolAllocatedCores = "allocated_cores" - Attr_SharedProcessorPoolHostID = "host_id" - Attr_SharedProcessorPoolStatus = "status" - Attr_SharedProcessorPoolStatusDetail = "status_detail" - Attr_SharedProcessorPoolPlacementGroups = "spp_placement_groups" - Attr_SharedProcessorPoolInstances = "instances" - Attr_SharedProcessorPoolInstanceCpus = "cpus" - Attr_SharedProcessorPoolInstanceUncapped = "uncapped" - Attr_SharedProcessorPoolInstanceAvailabilityZone = "availability_zone" - Attr_SharedProcessorPoolInstanceId = "id" - Attr_SharedProcessorPoolInstanceMemory = "memory" - Attr_SharedProcessorPoolInstanceName = "name" - Attr_SharedProcessorPoolInstanceStatus = "status" - Attr_SharedProcessorPoolInstanceVcpus = "vcpus" - // SPP Placement Group - Arg_SPPPlacementGroupName = "pi_spp_placement_group_name" - Arg_SPPPlacementGroupPolicy = "pi_spp_placement_group_policy" + Attr_SPPPlacementGroupID = "spp_placement_group_id" Attr_SPPPlacementGroupMembers = "members" - Arg_SPPPlacementGroupID = "pi_spp_placement_group_id" Attr_SPPPlacementGroupPolicy = "policy" Attr_SPPPlacementGroupName = "name" From f1ab2281f6880304259065dd42c67f533fdd3254 Mon Sep 17 00:00:00 2001 From: Diptipowervs Date: Fri, 5 Jan 2024 21:19:26 +0530 Subject: [PATCH 3/4] Pull ibm_ pi_constants.go from constant-refactor branch --- ibm/service/power/ibm_pi_constants.go | 422 +++++++++++++------------- 1 file changed, 219 insertions(+), 203 deletions(-) diff --git a/ibm/service/power/ibm_pi_constants.go b/ibm/service/power/ibm_pi_constants.go index 7229f238312..1f745ebce50 100644 --- a/ibm/service/power/ibm_pi_constants.go +++ b/ibm/service/power/ibm_pi_constants.go @@ -30,209 +30,225 @@ const ( Arg_VolumeOnboardingID = "pi_volume_onboarding_id" // Attributes - Attr_AccessConfig = "access_config" - Attr_Action = "action" - Attr_Addresses = "addresses" - Attr_AllocatedCores = "allocated_cores" - Attr_Architecture = "architecture" - Attr_Auxiliary = "auxiliary" - Attr_AuxiliaryChangedVolumeName = "auxiliary_changed_volume_name" - Attr_AuxiliaryVolumeName = "auxiliary_volume_name" - Attr_AvailabilityZone = "availability_zone" - Attr_AvailableCores = "available_cores" - Attr_AvailableIPCount = "available_ip_count" - Attr_BootVolumeID = "boot_volume_id" - Attr_Bootable = "bootable" - Attr_CIDR = "cidr" - Attr_CPUs = "cpus" - Attr_CRN = "crn" - Attr_Capabilities = "capabilities" - Attr_Capacity = "capacity" - Attr_Certified = "certified" - Attr_ClassicEnabled = "classic_enabled" - Attr_CloudConnectionID = "cloud_connection_id" - Attr_CloudInstanceID = "cloud_instance_id" - Attr_CloudInstances = "cloud_instances" - Attr_Code = "code" - Attr_ConnectionMode = "connection_mode" - Attr_Connections = "connections" - Attr_ConsistencyGroupName = "consistency_group_name" - Attr_ConsoleLanguages = "console_languages" - Attr_ContainerFormat = "container_format" - Attr_CopyRate = "copy_rate" - Attr_CopyType = "copy_type" - Attr_CoreMemoryRatio = "core_memory_ratio" - Attr_Cores = "cores" - Attr_CreateTime = "create_time" - Attr_CreationDate = "creation_date" - Attr_CyclePeriodSeconds = "cycle_period_seconds" - Attr_CyclingMode = "cycling_mode" - Attr_DNS = "dns" - Attr_Datacenters = "datacenters" - Attr_Default = "default" - Attr_DeploymentType = "deployment_type" - Attr_Description = "description" - Attr_DisasterRecoveryLocations = "disaster_recovery_locations" - Attr_DiskFormat = "disk_format" - Attr_DiskType = "disk_type" - Attr_Enabled = "enabled" - Attr_Endianness = "endianness" - Attr_ExternalIP = "external_ip" - Attr_FailureMessage = "failure_message" - Attr_FlashCopyMappings = "flash_copy_mappings" - Attr_FlashCopyName = "flash_copy_name" - Attr_FreezeTime = "freeze_time" - Attr_Gateway = "gateway" - Attr_GlobalRouting = "global_routing" - Attr_GreDestinationAddress = "gre_destination_address" - Attr_GreSourceAddress = "gre_source_address" - Attr_GroupID = "group_id" - Attr_HealthStatus = "health_status" - Attr_HostID = "host_id" - Attr_Href = "href" - Attr_Hypervisor = "hypervisor" - Attr_HypervisorType = "hypervisor_type" - Attr_IBMIPAddress = "ibm_ip_address" - Attr_ID = "id" - Attr_IP = "ip" - Attr_IPAddress = "ipaddress" - Attr_IPOctet = "ipoctet" - Attr_ImageID = "image_id" - Attr_ImageInfo = "image_info" - Attr_ImageType = "image_type" - Attr_Images = "images" - Attr_InputVolumes = "input_volumes" - Attr_InstanceSnapshots = "instance_snapshots" - Attr_InstanceVolumes = "instance_volumes" - Attr_Instances = "instances" - Attr_IsActive = "is_active" - Attr_Jumbo = "jumbo" - Attr_Key = "key" - Attr_KeyCreationDate = "creation_date" - Attr_KeyID = "key_id" - Attr_KeyName = "name" - Attr_Keys = "keys" - Attr_Language = "language" - Attr_LastUpdateDate = "last_update_date" - Attr_LastUpdatedDate = "last_updated_date" - Attr_Leases = "leases" - Attr_LicenseRepositoryCapacity = "license_repository_capacity" - Attr_Location = "location" - Attr_MTU = "mtu" - Attr_MacAddress = "macaddress" - Attr_MasterChangedVolumeName = "master_changed_volume_name" - Attr_MasterVolumeName = "master_volume_name" - Attr_Max = "max" - Attr_MaxAllocationSize = "max_allocation_size" - Attr_MaxAvailable = "max_available" - Attr_MaxCoresAvailable = "max_cores_available" - Attr_MaxMem = "maxmem" - Attr_MaxMemoryAvailable = "max_memory_available" - Attr_MaxProc = "maxproc" - Attr_MaxVirtualCores = "max_virtual_cores" - Attr_MaximumStorageAllocation = "max_storage_allocation" - Attr_Members = "members" - Attr_Memory = "memory" - Attr_Message = "message" - Attr_Metered = "metered" - Attr_Min = "min" - Attr_MinMem = "minmem" - Attr_MinProc = "minproc" - Attr_MinVirtualCores = "min_virtual_cores" - Attr_MirroringState = "mirroring_state" - Attr_Name = "name" - Attr_NetworkID = "network_id" - Attr_NetworkName = "network_name" - Attr_NetworkPorts = "network_ports" - Attr_Networks = "networks" - Attr_NumberOfVolumes = "number_of_volumes" - Attr_Onboardings = "onboardings" - Attr_OperatingSystem = "operating_system" - Attr_PVMInstanceID = "pvm_instance_id" - Attr_PVMInstances = "pvm_instances" - Attr_PVMSnapshots = "pvm_snapshots" - Attr_PercentComplete = "percent_complete" - Attr_PinPolicy = "pin_policy" - Attr_PlacementGroupID = "placement_group_id" - Attr_PlacementGroups = "placement_groups" - Attr_Policy = "policy" - Attr_Pool = "pool" - Attr_PoolName = "pool_name" - Attr_Port = "port" - Attr_PortID = "portid" - Attr_PrimaryRole = "primary_role" - Attr_ProcType = "proctype" - Attr_Processors = "processors" - Attr_ProfileID = "profile_id" - Attr_Profiles = "profiles" - Attr_Progress = "progress" - Attr_PublicIP = "public_ip" - Attr_Region = "region" - Attr_RemoteCopyID = "remote_copy_id" - Attr_RemoteCopyRelationshipNames = "remote_copy_relationship_names" - Attr_RemoteCopyRelationships = "remote_copy_relationships" - Attr_ReplicationEnabled = "replication_enabled" - Attr_ReplicationSites = "replication_sites" - Attr_ReplicationStatus = "replication_status" - Attr_ReplicationType = "replication_type" - Attr_ReservedCores = "reserved_cores" - Attr_ResultsOnboardedVolumes = "results_onboarded_volumes" - Attr_ResultsVolumeOnboardingFailures = "results_volume_onboarding_failures" - Attr_SPPPlacementGroups = "spp_placement_groups" - Attr_SSHKey = "ssh_key" - Attr_Shareable = "shreable" - Attr_SharedCoreRatio = "shared_core_ratio" - Attr_SharedProcessorPool = "shared_processor_pool" - Attr_SharedProcessorPoolID = "shared_processor_pool_id" - Attr_SharedProcessorPoolPlacementGroups = "spp_placement_groups" - Attr_SharedProcessorPoolStatus = "status" - Attr_SharedProcessorPools = "shared_processor_pools" - Attr_Size = "size" - Attr_SourceVolumeName = "source_volume_name" - Attr_Speed = "speed" - Attr_StartTime = "start_time" - Attr_State = "state" - Attr_Status = "status" - Attr_StatusDescriptionErrors = "status_description_errors" - Attr_StatusDetail = "status_detail" - Attr_StoragePool = "storage_pool" - Attr_StoragePoolAffinity = "storage_pool_affinity" - Attr_StoragePoolsCapacity = "storage_pools_capacity" - Attr_StorageType = "storage_type" - Attr_StorageTypesCapacity = "storage_types_capacity" - Attr_Synchronized = "synchronized" - Attr_SysType = "systype" - Attr_SystemPoolName = "system_pool_name" - Attr_SystemPools = "system_pools" - Attr_Systems = "systems" - Attr_TargetVolumeName = "target_volume_name" - Attr_TenantID = "tenant_id" - Attr_TenantName = "tenant_name" - Attr_TotalCapacity = "total_capacity" - Attr_TotalInstances = "total_instances" - Attr_TotalMemoryConsumed = "total_memory_consumed" - Attr_TotalProcessorsConsumed = "total_processors_consumed" - Attr_TotalSSDStorageConsumed = "total_ssd_storage_consumed" - Attr_TotalStandardStorageConsumed = "total_standard_storage_consumed" - Attr_Type = "type" - Attr_URL = "url" - Attr_Uncapped = "uncapped" - Attr_UsedIPCount = "used_ip_count" - Attr_UsedIPPercent = "used_ip_percent" - Attr_UserIPAddress = "user_ip_address" - Attr_VCPUs = "vcpus" - Attr_VLanID = "vlan_id" - Attr_VPCCRNs = "vpc_crns" - Attr_VPCEnabled = "vpc_enabled" - Attr_VirtualCoresAssigned = "virtual_cores_assigned" - Attr_VolumeGroupName = "volume_group_name" - Attr_VolumeGroups = "volume_groups" - Attr_VolumeIDs = "volume_ids" - Attr_VolumePool = "volume_pool" - Attr_VolumeSnapshots = "volume_snapshots" - Attr_Volumes = "volumes" - Attr_WWN = "wwn" - Attr_Workspaces = "workspaces" + Attr_AccessConfig = "access_config" + Attr_Action = "action" + Attr_Addresses = "addresses" + Attr_AllocatedCores = "allocated_cores" + Attr_Architecture = "architecture" + Attr_Auxiliary = "auxiliary" + Attr_AuxiliaryChangedVolumeName = "auxiliary_changed_volume_name" + Attr_AuxiliaryVolumeName = "auxiliary_volume_name" + Attr_AvailabilityZone = "availability_zone" + Attr_AvailableCores = "available_cores" + Attr_AvailableIPCount = "available_ip_count" + Attr_BootVolumeID = "boot_volume_id" + Attr_Bootable = "bootable" + Attr_CIDR = "cidr" + Attr_CPUs = "cpus" + Attr_CRN = "crn" + Attr_Capabilities = "capabilities" + Attr_Capacity = "capacity" + Attr_Certified = "certified" + Attr_ClassicEnabled = "classic_enabled" + Attr_CloudConnectionID = "cloud_connection_id" + Attr_CloudInstanceID = "cloud_instance_id" + Attr_CloudInstances = "cloud_instances" + Attr_Code = "code" + Attr_ConnectionMode = "connection_mode" + Attr_Connections = "connections" + Attr_ConsistencyGroupName = "consistency_group_name" + Attr_ConsoleLanguages = "console_languages" + Attr_ContainerFormat = "container_format" + Attr_CopyRate = "copy_rate" + Attr_CopyType = "copy_type" + Attr_CoreMemoryRatio = "core_memory_ratio" + Attr_Cores = "cores" + Attr_CreateTime = "create_time" + Attr_CreationDate = "creation_date" + Attr_CyclePeriodSeconds = "cycle_period_seconds" + Attr_CyclingMode = "cycling_mode" + Attr_DNS = "dns" + Attr_Datacenters = "datacenters" + Attr_Default = "default" + Attr_DeploymentType = "deployment_type" + Attr_Description = "description" + Attr_DisasterRecoveryLocations = "disaster_recovery_locations" + Attr_DiskFormat = "disk_format" + Attr_DiskType = "disk_type" + Attr_Enabled = "enabled" + Attr_Endianness = "endianness" + Attr_ExternalIP = "external_ip" + Attr_FailureMessage = "failure_message" + Attr_FlashCopyMappings = "flash_copy_mappings" + Attr_FlashCopyName = "flash_copy_name" + Attr_FreezeTime = "freeze_time" + Attr_Gateway = "gateway" + Attr_GlobalRouting = "global_routing" + Attr_GreDestinationAddress = "gre_destination_address" + Attr_GreSourceAddress = "gre_source_address" + Attr_GroupID = "group_id" + Attr_HealthStatus = "health_status" + Attr_HostID = "host_id" + Attr_Href = "href" + Attr_Hypervisor = "hypervisor" + Attr_HypervisorType = "hypervisor_type" + Attr_IBMIPAddress = "ibm_ip_address" + Attr_ID = "id" + Attr_IP = "ip" + Attr_IPAddress = "ipaddress" + Attr_IPOctet = "ipoctet" + Attr_ImageID = "image_id" + Attr_ImageInfo = "image_info" + Attr_ImageType = "image_type" + Attr_Images = "images" + Attr_InputVolumes = "input_volumes" + Attr_InstanceSnapshots = "instance_snapshots" + Attr_InstanceVolumes = "instance_volumes" + Attr_Instances = "instances" + Attr_IsActive = "is_active" + Attr_Jumbo = "jumbo" + Attr_Key = "key" + Attr_KeyCreationDate = "creation_date" + Attr_KeyID = "key_id" + Attr_KeyName = "name" + Attr_Keys = "keys" + Attr_Language = "language" + Attr_LastUpdateDate = "last_update_date" + Attr_LastUpdatedDate = "last_updated_date" + Attr_Leases = "leases" + Attr_LicenseRepositoryCapacity = "license_repository_capacity" + Attr_Location = "location" + Attr_MTU = "mtu" + Attr_MacAddress = "macaddress" + Attr_MasterChangedVolumeName = "master_changed_volume_name" + Attr_MasterVolumeName = "master_volume_name" + Attr_Max = "max" + Attr_MaxAllocationSize = "max_allocation_size" + Attr_MaxAvailable = "max_available" + Attr_MaxCoresAvailable = "max_cores_available" + Attr_MaxMem = "maxmem" + Attr_MaxMemoryAvailable = "max_memory_available" + Attr_MaxProc = "maxproc" + Attr_MaxVirtualCores = "max_virtual_cores" + Attr_MaximumStorageAllocation = "max_storage_allocation" + Attr_Members = "members" + Attr_Memory = "memory" + Attr_Message = "message" + Attr_Metered = "metered" + Attr_Min = "min" + Attr_MinMem = "minmem" + Attr_MinProc = "minproc" + Attr_MinVirtualCores = "min_virtual_cores" + Attr_MirroringState = "mirroring_state" + Attr_Name = "name" + Attr_NetworkID = "network_id" + Attr_NetworkName = "network_name" + Attr_NetworkPorts = "network_ports" + Attr_Networks = "networks" + Attr_NumberOfVolumes = "number_of_volumes" + Attr_Onboardings = "onboardings" + Attr_OperatingSystem = "operating_system" + Attr_PVMInstanceID = "pvm_instance_id" + Attr_PVMInstances = "pvm_instances" + Attr_PVMSnapshots = "pvm_snapshots" + Attr_PercentComplete = "percent_complete" + Attr_PinPolicy = "pin_policy" + Attr_PlacementGroupID = "placement_group_id" + Attr_PlacementGroups = "placement_groups" + Attr_Policy = "policy" + Attr_Pool = "pool" + Attr_PoolName = "pool_name" + Attr_Port = "port" + Attr_PortID = "portid" + Attr_PrimaryRole = "primary_role" + Attr_ProcType = "proctype" + Attr_Processors = "processors" + Attr_ProfileID = "profile_id" + Attr_Profiles = "profiles" + Attr_Progress = "progress" + Attr_PublicIP = "public_ip" + Attr_Region = "region" + Attr_RemoteCopyID = "remote_copy_id" + Attr_RemoteCopyRelationshipNames = "remote_copy_relationship_names" + Attr_RemoteCopyRelationships = "remote_copy_relationships" + Attr_ReplicationEnabled = "replication_enabled" + Attr_ReplicationSites = "replication_sites" + Attr_ReplicationStatus = "replication_status" + Attr_ReplicationType = "replication_type" + Attr_ReservedCores = "reserved_cores" + Attr_ResultsOnboardedVolumes = "results_onboarded_volumes" + Attr_ResultsVolumeOnboardingFailures = "results_volume_onboarding_failures" + Attr_SPPPlacementGroups = "spp_placement_groups" + Attr_SSHKey = "ssh_key" + Attr_Shareable = "shreable" + Attr_SharedCoreRatio = "shared_core_ratio" + Attr_SharedProcessorPool = "shared_processor_pool" + Attr_SharedProcessorPoolID = "shared_processor_pool_id" + Attr_SharedProcessorPoolPlacementGroups = "spp_placement_groups" + Attr_SharedProcessorPoolStatus = "status" + Attr_SharedProcessorPools = "shared_processor_pools" + Attr_Size = "size" + Attr_SourceVolumeName = "source_volume_name" + Attr_Speed = "speed" + Attr_StartTime = "start_time" + Attr_State = "state" + Attr_Status = "status" + Attr_StatusDescriptionErrors = "status_description_errors" + Attr_StatusDetail = "status_detail" + Attr_StoragePool = "storage_pool" + Attr_StoragePoolAffinity = "storage_pool_affinity" + Attr_StoragePoolsCapacity = "storage_pools_capacity" + Attr_StorageType = "storage_type" + Attr_StorageTypesCapacity = "storage_types_capacity" + Attr_Synchronized = "synchronized" + Attr_SysType = "systype" + Attr_SystemPoolName = "system_pool_name" + Attr_SystemPools = "system_pools" + Attr_Systems = "systems" + Attr_TargetVolumeName = "target_volume_name" + Attr_TenantID = "tenant_id" + Attr_TenantName = "tenant_name" + Attr_TotalCapacity = "total_capacity" + Attr_TotalInstances = "total_instances" + Attr_TotalMemoryConsumed = "total_memory_consumed" + Attr_TotalProcessorsConsumed = "total_processors_consumed" + Attr_TotalSSDStorageConsumed = "total_ssd_storage_consumed" + Attr_TotalStandardStorageConsumed = "total_standard_storage_consumed" + Attr_Type = "type" + Attr_URL = "url" + Attr_Uncapped = "uncapped" + Attr_UsedIPCount = "used_ip_count" + Attr_UsedIPPercent = "used_ip_percent" + Attr_UserIPAddress = "user_ip_address" + Attr_VCPUs = "vcpus" + Attr_VLanID = "vlan_id" + Attr_VPCCRNs = "vpc_crns" + Attr_VPCEnabled = "vpc_enabled" + Attr_VirtualCoresAssigned = "virtual_cores_assigned" + Attr_VolumeGroupName = "volume_group_name" + Attr_VolumeGroups = "volume_groups" + Attr_VolumeIDs = "volume_ids" + Attr_VolumePool = "volume_pool" + Attr_VolumeSnapshots = "volume_snapshots" + Attr_Volumes = "volumes" + Attr_WWN = "wwn" + Attr_Workspaces = "workspaces" + Attr_SharedProcessorPoolName = "name" + Attr_SharedProcessorPoolHostID = "host_id" + Attr_SharedProcessorPoolReservedCores = "reserved_cores" + Attr_SharedProcessorPoolAvailableCores = "available_cores" + Attr_SharedProcessorPoolAllocatedCores = "allocated_cores" + Attr_SharedProcessorPoolStatusDetail = "status_detail" + Attr_SharedProcessorPoolInstances = "instances" + Attr_SharedProcessorPoolInstanceCpus = "cpus" + Attr_SharedProcessorPoolInstanceUncapped = "uncapped" + Attr_SharedProcessorPoolInstanceAvailabilityZone = "availability_zone" + Attr_SharedProcessorPoolInstanceId = "id" + Attr_SharedProcessorPoolInstanceMemory = "memory" + Attr_SharedProcessorPoolInstanceName = "name" + Attr_SharedProcessorPoolInstanceStatus = "status" + Attr_SharedProcessorPoolInstanceVcpus = "vcpus" + Arg_PIInstanceSharedProcessorPool = "pi_shared_processor_pool" // TODO: Second Half Cleanup, remove extra variables From 8c6c880c5f0e71e75d98b673db23eee012cc0d34 Mon Sep 17 00:00:00 2001 From: Diptipowervs Date: Thu, 11 Jan 2024 10:44:27 +0530 Subject: [PATCH 4/4] Remove extraspace from pi_keys_test.go --- ibm/service/power/data_source_ibm_pi_keys_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibm/service/power/data_source_ibm_pi_keys_test.go b/ibm/service/power/data_source_ibm_pi_keys_test.go index e7b135bb1c4..66bb6c45962 100644 --- a/ibm/service/power/data_source_ibm_pi_keys_test.go +++ b/ibm/service/power/data_source_ibm_pi_keys_test.go @@ -31,5 +31,5 @@ func testAccCheckIBMPIKeysDataSourceConfig() string { return fmt.Sprintf(` data "ibm_pi_keys" "test" { pi_cloud_instance_id = "%s" - } `, acc.Pi_cloud_instance_id) + }`, acc.Pi_cloud_instance_id) }