From c7a1e2d7947cbe51a68e91fc4afa85ad555a1ec7 Mon Sep 17 00:00:00 2001 From: Diptipowervs Date: Tue, 19 Mar 2024 01:55:39 +0530 Subject: [PATCH 1/6] sort stanza --- ibm/service/power/ibm_pi_constants.go | 1 + .../resource_ibm_pi_volume_onboarding.go | 58 +++++++++---------- .../resource_ibm_pi_volume_onboarding_test.go | 3 +- .../docs/r/pi_volume_onboarding.html.markdown | 3 +- 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/ibm/service/power/ibm_pi_constants.go b/ibm/service/power/ibm_pi_constants.go index c06f0b7d80..ea4464f3c0 100644 --- a/ibm/service/power/ibm_pi_constants.go +++ b/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" diff --git a/ibm/service/power/resource_ibm_pi_volume_onboarding.go b/ibm/service/power/resource_ibm_pi_volume_onboarding.go index f91977de7d..0c1a81d548 100644 --- a/ibm/service/power/resource_ibm_pi_volume_onboarding.go +++ b/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, }, }, } diff --git a/ibm/service/power/resource_ibm_pi_volume_onboarding_test.go b/ibm/service/power/resource_ibm_pi_volume_onboarding_test.go index 14c01fb51d..002d65e628 100644 --- a/ibm/service/power/resource_ibm_pi_volume_onboarding_test.go +++ b/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) } diff --git a/website/docs/r/pi_volume_onboarding.html.markdown b/website/docs/r/pi_volume_onboarding.html.markdown index 0331a767aa..413cbeaea6 100644 --- a/website/docs/r/pi_volume_onboarding.html.markdown +++ b/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` From 0d803da48b890aa490a47d8097e1cfd05ce2b717 Mon Sep 17 00:00:00 2001 From: Diptipowervs <152427968+Diptipowervs@users.noreply.github.com> Date: Tue, 26 Mar 2024 17:18:21 +0530 Subject: [PATCH 2/6] Update ibm/service/power/resource_ibm_pi_volume_onboarding.go Co-authored-by: michaelkad <45772690+michaelkad@users.noreply.github.com> --- ibm/service/power/resource_ibm_pi_volume_onboarding.go | 1 + 1 file changed, 1 insertion(+) diff --git a/ibm/service/power/resource_ibm_pi_volume_onboarding.go b/ibm/service/power/resource_ibm_pi_volume_onboarding.go index 0c1a81d548..340b13a513 100644 --- a/ibm/service/power/resource_ibm_pi_volume_onboarding.go +++ b/ibm/service/power/resource_ibm_pi_volume_onboarding.go @@ -39,6 +39,7 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource { Schema: map[string]*schema.Schema{ +// Arguments Arg_CloudInstanceID: { Description: "Cloud Instance ID - This is the service_instance_id.", ForceNew: true, From 3c95fd68c8eaf8a118a327543b425f287741f086 Mon Sep 17 00:00:00 2001 From: Diptipowervs Date: Tue, 26 Mar 2024 18:13:30 +0530 Subject: [PATCH 3/6] fix bug --- ibm/service/power/ibm_pi_constants.go | 838 +++++++++--------- .../resource_ibm_pi_volume_onboarding.go | 59 +- 2 files changed, 443 insertions(+), 454 deletions(-) diff --git a/ibm/service/power/ibm_pi_constants.go b/ibm/service/power/ibm_pi_constants.go index e3f8df0bec..f4e2b6d385 100644 --- a/ibm/service/power/ibm_pi_constants.go +++ b/ibm/service/power/ibm_pi_constants.go @@ -1,419 +1,419 @@ -package power - -import "time" - -const ( - // 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_SnapshotID = "pi_snapshot_id" - 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_VolumeName = "pi_volume_name" - 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_IOThrottleRate = "io_throttle_rate" - 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_OnboardingId = "onboarding_id" - 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_ServerName = "server_name" - Attr_Shareable = "shreable" - Attr_SharedCoreRatio = "shared_core_ratio" - Attr_SharedProcessorPool = "shared_processor_pool" - Attr_SharedProcessorPoolAllocatedCores = "allocated_cores" - Attr_SharedProcessorPoolAvailableCores = "available_cores" - Attr_SharedProcessorPoolHostID = "host_id" - Attr_SharedProcessorPoolID = "shared_processor_pool_id" - Attr_SharedProcessorPoolInstanceAvailabilityZone = "availability_zone" - Attr_SharedProcessorPoolInstanceCpus = "cpus" - Attr_SharedProcessorPoolInstanceId = "id" - Attr_SharedProcessorPoolInstanceMemory = "memory" - Attr_SharedProcessorPoolInstanceName = "name" - Attr_SharedProcessorPoolInstanceStatus = "status" - Attr_SharedProcessorPoolInstanceUncapped = "uncapped" - Attr_SharedProcessorPoolInstanceVcpus = "vcpus" - Attr_SharedProcessorPoolInstances = "instances" - Attr_SharedProcessorPoolName = "name" - Attr_SharedProcessorPoolPlacementGroups = "spp_placement_groups" - Attr_SharedProcessorPoolReservedCores = "reserved_cores" - Attr_SharedProcessorPoolStatus = "status" - Attr_SharedProcessorPoolStatusDetail = "status_detail" - 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" - PISAPProfileCertified = "certified" - PISAPProfileCores = "cores" - PISAPProfileMemory = "memory" - PISAPProfileID = "profile_id" - PISAPProfileType = "type" - - // DHCP - Arg_DhcpCidr = "pi_cidr" - Arg_DhcpID = "pi_dhcp_id" - Arg_DhcpCloudConnectionID = "pi_cloud_connection_id" - Arg_DhcpDnsServer = "pi_dns_server" - Arg_DhcpName = "pi_dhcp_name" - Arg_DhcpSnatEnabled = "pi_dhcp_snat_enabled" - - Attr_DhcpServers = "servers" - Attr_DhcpID = "dhcp_id" - Attr_DhcpLeases = "leases" - Attr_DhcpLeaseInstanceIP = "instance_ip" - Attr_DhcpLeaseInstanceMac = "instance_mac" - Attr_DhcpNetworkDeprecated = "network" // to deprecate - Attr_DhcpNetworkID = "network_id" - Attr_DhcpNetworkName = "network_name" - Attr_DhcpStatus = "status" - - // Instance - Arg_PVMInstanceId = "pi_instance_id" - Arg_PVMInstanceActionType = "pi_action" - Arg_PVMInstanceHealthStatus = "pi_health_status" - Arg_IBMiCSS = "pi_ibmi_css" - Arg_IBMiPHA = "pi_ibmi_pha" - Arg_IBMiRDSUsers = "pi_ibmi_rds_users" - Attr_IBMiCSS = "ibmi_css" - Attr_IBMiPHA = "ibmi_pha" - Attr_IBMiRDS = "ibmi_rds" - Attr_IBMiRDSUsers = "ibmi_rds_users" - OS_IBMI = "ibmi" - - PVMInstanceHealthOk = "OK" - PVMInstanceHealthWarning = "WARNING" - - //Added timeout values for warning and active status - warningTimeOut = 60 * time.Second - activeTimeOut = 2 * time.Minute - // power service instance capabilities - CUSTOM_VIRTUAL_CORES = "custom-virtualcores" - - PIConsoleLanguageCode = "pi_language_code" - PICloudConnectionId = "cloud_connection_id" - PICloudConnectionStatus = "status" - PICloudConnectionIBMIPAddress = "ibm_ip_address" - PICloudConnectionUserIPAddress = "user_ip_address" - PICloudConnectionPort = "port" - PICloudConnectionClassicGreSource = "gre_source_address" - PICloudConnectionConnectionMode = "connection_mode" - 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" - Arg_PIInstanceSharedProcessorPool = "pi_shared_processor_pool" - - // Placement Group - PIPlacementGroupID = "placement_group_id" - PIPlacementGroupMembers = "members" - - // Volume - PIVolumeIds = "pi_volume_ids" - PIAffinityPolicy = "pi_affinity_policy" - PIAffinityVolume = "pi_affinity_volume" - PIAffinityInstance = "pi_affinity_instance" - PIAntiAffinityInstances = "pi_anti_affinity_instances" - PIAntiAffinityVolumes = "pi_anti_affinity_volumes" - - // Volume Clone - PIVolumeCloneName = "pi_volume_clone_name" - PIVolumeCloneTaskID = "pi_volume_clone_task_id" - PITargetStorageTier = "pi_target_storage_tier" - - // IBM PI Volume Group - PIVolumeGroupName = "pi_volume_group_name" - PIVolumeGroupConsistencyGroupName = "pi_consistency_group_name" - PIVolumeGroupID = "pi_volume_group_id" - PIVolumeGroupAction = "pi_volume_group_action" - PIVolumeOnboardingID = "pi_volume_onboarding_id" - - // Disaster Recovery Location - PIDRLocation = "location" - - // VPN - PIVPNConnectionId = "connection_id" - PIVPNConnectionStatus = "connection_status" - PIVPNConnectionDeadPeerDetection = "dead_peer_detections" - PIVPNConnectionDeadPeerDetectionAction = "action" - PIVPNConnectionDeadPeerDetectionInterval = "interval" - PIVPNConnectionDeadPeerDetectionThreshold = "threshold" - PIVPNConnectionLocalGatewayAddress = "local_gateway_address" - PIVPNConnectionVpnGatewayAddress = "gateway_address" - - // Cloud Connections - PICloudConnectionTransitEnabled = "pi_cloud_connection_transit_enabled" - - // SPP Placement Group - - Attr_SPPPlacementGroupID = "spp_placement_group_id" - Attr_SPPPlacementGroupMembers = "members" - Attr_SPPPlacementGroupPolicy = "policy" - Attr_SPPPlacementGroupName = "name" - - // status - // common status states - StatusShutoff = "SHUTOFF" - StatusActive = "ACTIVE" - StatusResize = "RESIZE" - StatusError = "ERROR" - StatusBuild = "BUILD" - StatusPending = "PENDING" - SctionStart = "start" - SctionStop = "stop" - - // volume clone task status - VolumeCloneCompleted = "completed" - VolumeCloneRunning = "running" - - // Workspaces - Attr_WorkspaceCapabilities = "pi_workspace_capabilities" - Attr_WorkspaceDetails = "pi_workspace_details" - Attr_WorkspaceID = "pi_workspace_id" - Attr_WorkspaceLocation = "pi_workspace_location" - Attr_WorkspaceName = "pi_workspace_name" - Attr_WorkspaceStatus = "pi_workspace_status" - Attr_WorkspaceType = "pi_workspace_type" - - // Datacenter - Arg_DatacenterZone = "pi_datacenter_zone" - Attr_DatacenterCapabilities = "pi_datacenter_capabilities" - Attr_DatacenterLocation = "pi_datacenter_location" - Attr_DatacenterStatus = "pi_datacenter_status" - Attr_DatacenterType = "pi_datacenter_type" - Attr_DatacenterHref = "pi_datacenter_href" - - // IBM PI Workspace - PIWorkspaceName = "pi_name" - PIWorkspaceDatacenter = "pi_datacenter" - PIWorkspaceResourceGroup = "pi_resource_group_id" - PIWorkspacePlan = "pi_plan" - PIVirtualOpticalDevice = "pi_virtual_optical_device" -) +package power + +import "time" + +const ( + // 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_SnapshotID = "pi_snapshot_id" + 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_VolumeName = "pi_volume_name" + 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_IOThrottleRate = "io_throttle_rate" + 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_OnboardingId = "onboarding_id" + 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_ServerName = "server_name" + Attr_Shareable = "shreable" + Attr_SharedCoreRatio = "shared_core_ratio" + Attr_SharedProcessorPool = "shared_processor_pool" + Attr_SharedProcessorPoolAllocatedCores = "allocated_cores" + Attr_SharedProcessorPoolAvailableCores = "available_cores" + Attr_SharedProcessorPoolHostID = "host_id" + Attr_SharedProcessorPoolID = "shared_processor_pool_id" + Attr_SharedProcessorPoolInstanceAvailabilityZone = "availability_zone" + Attr_SharedProcessorPoolInstanceCpus = "cpus" + Attr_SharedProcessorPoolInstanceId = "id" + Attr_SharedProcessorPoolInstanceMemory = "memory" + Attr_SharedProcessorPoolInstanceName = "name" + Attr_SharedProcessorPoolInstanceStatus = "status" + Attr_SharedProcessorPoolInstanceUncapped = "uncapped" + Attr_SharedProcessorPoolInstanceVcpus = "vcpus" + Attr_SharedProcessorPoolInstances = "instances" + Attr_SharedProcessorPoolName = "name" + Attr_SharedProcessorPoolPlacementGroups = "spp_placement_groups" + Attr_SharedProcessorPoolReservedCores = "reserved_cores" + Attr_SharedProcessorPoolStatus = "status" + Attr_SharedProcessorPoolStatusDetail = "status_detail" + 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" + PISAPProfileCertified = "certified" + PISAPProfileCores = "cores" + PISAPProfileMemory = "memory" + PISAPProfileID = "profile_id" + PISAPProfileType = "type" + + // DHCP + Arg_DhcpCidr = "pi_cidr" + Arg_DhcpID = "pi_dhcp_id" + Arg_DhcpCloudConnectionID = "pi_cloud_connection_id" + Arg_DhcpDnsServer = "pi_dns_server" + Arg_DhcpName = "pi_dhcp_name" + Arg_DhcpSnatEnabled = "pi_dhcp_snat_enabled" + + Attr_DhcpServers = "servers" + Attr_DhcpID = "dhcp_id" + Attr_DhcpLeases = "leases" + Attr_DhcpLeaseInstanceIP = "instance_ip" + Attr_DhcpLeaseInstanceMac = "instance_mac" + Attr_DhcpNetworkDeprecated = "network" // to deprecate + Attr_DhcpNetworkID = "network_id" + Attr_DhcpNetworkName = "network_name" + Attr_DhcpStatus = "status" + + // Instance + Arg_PVMInstanceId = "pi_instance_id" + Arg_PVMInstanceActionType = "pi_action" + Arg_PVMInstanceHealthStatus = "pi_health_status" + Arg_IBMiCSS = "pi_ibmi_css" + Arg_IBMiPHA = "pi_ibmi_pha" + Arg_IBMiRDSUsers = "pi_ibmi_rds_users" + Attr_IBMiCSS = "ibmi_css" + Attr_IBMiPHA = "ibmi_pha" + Attr_IBMiRDS = "ibmi_rds" + Attr_IBMiRDSUsers = "ibmi_rds_users" + OS_IBMI = "ibmi" + + PVMInstanceHealthOk = "OK" + PVMInstanceHealthWarning = "WARNING" + + //Added timeout values for warning and active status + warningTimeOut = 60 * time.Second + activeTimeOut = 2 * time.Minute + // power service instance capabilities + CUSTOM_VIRTUAL_CORES = "custom-virtualcores" + + PIConsoleLanguageCode = "pi_language_code" + PICloudConnectionId = "cloud_connection_id" + PICloudConnectionStatus = "status" + PICloudConnectionIBMIPAddress = "ibm_ip_address" + PICloudConnectionUserIPAddress = "user_ip_address" + PICloudConnectionPort = "port" + PICloudConnectionClassicGreSource = "gre_source_address" + PICloudConnectionConnectionMode = "connection_mode" + 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" + Arg_PIInstanceSharedProcessorPool = "pi_shared_processor_pool" + + // Placement Group + PIPlacementGroupID = "placement_group_id" + PIPlacementGroupMembers = "members" + + // Volume + PIVolumeIds = "pi_volume_ids" + PIAffinityPolicy = "pi_affinity_policy" + PIAffinityVolume = "pi_affinity_volume" + PIAffinityInstance = "pi_affinity_instance" + PIAntiAffinityInstances = "pi_anti_affinity_instances" + PIAntiAffinityVolumes = "pi_anti_affinity_volumes" + + // Volume Clone + PIVolumeCloneName = "pi_volume_clone_name" + PIVolumeCloneTaskID = "pi_volume_clone_task_id" + PITargetStorageTier = "pi_target_storage_tier" + + // IBM PI Volume Group + PIVolumeGroupName = "pi_volume_group_name" + PIVolumeGroupConsistencyGroupName = "pi_consistency_group_name" + PIVolumeGroupID = "pi_volume_group_id" + PIVolumeGroupAction = "pi_volume_group_action" + PIVolumeOnboardingID = "pi_volume_onboarding_id" + + // Disaster Recovery Location + PIDRLocation = "location" + + // VPN + PIVPNConnectionId = "connection_id" + PIVPNConnectionStatus = "connection_status" + PIVPNConnectionDeadPeerDetection = "dead_peer_detections" + PIVPNConnectionDeadPeerDetectionAction = "action" + PIVPNConnectionDeadPeerDetectionInterval = "interval" + PIVPNConnectionDeadPeerDetectionThreshold = "threshold" + PIVPNConnectionLocalGatewayAddress = "local_gateway_address" + PIVPNConnectionVpnGatewayAddress = "gateway_address" + + // Cloud Connections + PICloudConnectionTransitEnabled = "pi_cloud_connection_transit_enabled" + + // SPP Placement Group + + Attr_SPPPlacementGroupID = "spp_placement_group_id" + Attr_SPPPlacementGroupMembers = "members" + Attr_SPPPlacementGroupPolicy = "policy" + Attr_SPPPlacementGroupName = "name" + + // status + // common status states + StatusShutoff = "SHUTOFF" + StatusActive = "ACTIVE" + StatusResize = "RESIZE" + StatusError = "ERROR" + StatusBuild = "BUILD" + StatusPending = "PENDING" + SctionStart = "start" + SctionStop = "stop" + + // volume clone task status + VolumeCloneCompleted = "completed" + VolumeCloneRunning = "running" + + // Workspaces + Attr_WorkspaceCapabilities = "pi_workspace_capabilities" + Attr_WorkspaceDetails = "pi_workspace_details" + Attr_WorkspaceID = "pi_workspace_id" + Attr_WorkspaceLocation = "pi_workspace_location" + Attr_WorkspaceName = "pi_workspace_name" + Attr_WorkspaceStatus = "pi_workspace_status" + Attr_WorkspaceType = "pi_workspace_type" + + // Datacenter + Arg_DatacenterZone = "pi_datacenter_zone" + Attr_DatacenterCapabilities = "pi_datacenter_capabilities" + Attr_DatacenterLocation = "pi_datacenter_location" + Attr_DatacenterStatus = "pi_datacenter_status" + Attr_DatacenterType = "pi_datacenter_type" + Attr_DatacenterHref = "pi_datacenter_href" + + // IBM PI Workspace + PIWorkspaceName = "pi_name" + PIWorkspaceDatacenter = "pi_datacenter" + PIWorkspaceResourceGroup = "pi_resource_group_id" + PIWorkspacePlan = "pi_plan" + PIVirtualOpticalDevice = "pi_virtual_optical_device" +) diff --git a/ibm/service/power/resource_ibm_pi_volume_onboarding.go b/ibm/service/power/resource_ibm_pi_volume_onboarding.go index 340b13a513..f05eccc6f4 100644 --- a/ibm/service/power/resource_ibm_pi_volume_onboarding.go +++ b/ibm/service/power/resource_ibm_pi_volume_onboarding.go @@ -8,23 +8,13 @@ import ( "fmt" "time" - st "github.com/IBM-Cloud/power-go-client/clients/instance" - "github.com/IBM-Cloud/power-go-client/helpers" + "github.com/IBM-Cloud/power-go-client/clients/instance" "github.com/IBM-Cloud/power-go-client/power/models" "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" ) -const ( - piOnboardingVolumes = "pi_onboarding_volumes" - piAuxiliaryVolumes = "pi_auxiliary_volumes" - piAuxiliaryVolumeName = "pi_auxiliary_volume_name" - piSourceCRN = "pi_source_crn" - piDisplayName = "pi_display_name" - piDescription = "pi_description" -) - func ResourceIBMPIVolumeOnboarding() *schema.Resource { return &schema.Resource{ CreateContext: resourceIBMPIVolumeOnboardingCreate, @@ -39,7 +29,6 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource { Schema: map[string]*schema.Schema{ -// Arguments Arg_CloudInstanceID: { Description: "Cloud Instance ID - This is the service_instance_id.", ForceNew: true, @@ -47,30 +36,30 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource { Type: schema.TypeString, }, - piOnboardingVolumes: { + Arg_OnboardingVolumes: { Type: schema.TypeList, Required: true, ForceNew: true, MinItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - piSourceCRN: { + Arg_SourceCRN: { Description: "CRN of source ServiceBroker instance from where auxiliary volumes need to be onboarded", Required: true, Type: schema.TypeString, }, - piAuxiliaryVolumes: { + Arg_AuxiliaryVolumes: { Type: schema.TypeList, Optional: true, MinItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - piAuxiliaryVolumeName: { + Arg_AuxiliaryVolumeName: { Description: "Auxiliary volume name at storage host level", Required: true, Type: schema.TypeString, }, - piDisplayName: { + Arg_DisplayName: { Description: "Display name of auxVolumeName once onboarded,auxVolumeName will be set to display name if not provided.", Optional: true, Type: schema.TypeString, @@ -81,7 +70,7 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource { }, }, }, - piDescription: { + Arg_Description: { Computed: true, Description: "Description of the volume onboarding operation", Optional: true, @@ -148,10 +137,10 @@ func resourceIBMPIVolumeOnboardingCreate(ctx context.Context, d *schema.Resource if err != nil { return diag.FromErr(err) } - cloudInstanceID := d.Get(helpers.PICloudInstanceId).(string) - client := st.NewIBMPIVolumeOnboardingClient(ctx, sess, cloudInstanceID) + cloudInstanceID := d.Get(Arg_CloudInstanceID).(string) + client := instance.NewIBMPIVolumeOnboardingClient(ctx, sess, cloudInstanceID) - vol, err := expandCreateVolumeOnboarding(d.Get(piOnboardingVolumes).([]interface{})) + vol, err := expandCreateVolumeOnboarding(d.Get(Arg_OnboardingVolumes).([]interface{})) if err != nil { return diag.FromErr(err) } @@ -160,7 +149,7 @@ func resourceIBMPIVolumeOnboardingCreate(ctx context.Context, d *schema.Resource Volumes: vol, } - if v, ok := d.GetOk(piDescription); ok { + if v, ok := d.GetOk(Arg_Description); ok { body.Description = v.(string) } @@ -185,21 +174,21 @@ func resourceIBMPIVolumeOnboardingRead(ctx context.Context, d *schema.ResourceDa return diag.FromErr(err) } - client := st.NewIBMPIVolumeOnboardingClient(ctx, sess, cloudInstanceID) + client := instance.NewIBMPIVolumeOnboardingClient(ctx, sess, cloudInstanceID) onboardingData, err := client.Get(onboardingID) if err != nil { return diag.FromErr(err) } - d.Set("onboarding_id", *onboardingData.ID) - d.Set("create_time", onboardingData.CreationTimestamp.String()) - d.Set(piDescription, onboardingData.Description) - d.Set("input_volumes", onboardingData.InputVolumes) - d.Set("progress", onboardingData.Progress) - d.Set("status", onboardingData.Status) - d.Set("results_onboarded_volumes", onboardingData.Results.OnboardedVolumes) - d.Set("results_volume_onboarding_failures", flattenVolumeOnboardingFailures(onboardingData.Results.VolumeOnboardingFailures)) + d.Set(Attr_OnboardingId, *onboardingData.ID) + d.Set(Attr_CreateTime, onboardingData.CreationTimestamp.String()) + d.Set(Arg_Description, onboardingData.Description) + d.Set(Attr_InputVolumes, onboardingData.InputVolumes) + d.Set(Attr_Progress, onboardingData.Progress) + d.Set(Attr_Status, onboardingData.Status) + d.Set(Attr_ResultsOnboardedVolumes, onboardingData.Results.OnboardedVolumes) + d.Set(Attr_ResultsVolumeOnboardingFailures, flattenVolumeOnboardingFailures(onboardingData.Results.VolumeOnboardingFailures)) return nil } @@ -248,12 +237,12 @@ func expandAuxiliaryVolumeForOnboarding(data []interface{}) []*models.AuxiliaryV var auxVolumeName, displayName string resource := d.(map[string]interface{}) - if v, ok := resource["pi_auxiliary_volume_name"]; ok && v != "" { - auxVolumeName = resource["pi_auxiliary_volume_name"].(string) + if v, ok := resource[Arg_AuxiliaryVolumeName]; ok && v != "" { + auxVolumeName = resource[Arg_AuxiliaryVolumeName].(string) } - if v, ok := resource["pi_display_name"]; ok && v != "" { - displayName = resource["pi_display_name"].(string) + if v, ok := resource[Arg_DisplayName]; ok && v != "" { + displayName = resource[Arg_DisplayName].(string) } auxVolumeForOnboarding = append(auxVolumeForOnboarding, &models.AuxiliaryVolumeForOnboarding{ From 5af910ea6d1a69581299b6e88a35abc86e853144 Mon Sep 17 00:00:00 2001 From: Diptipowervs Date: Tue, 26 Mar 2024 18:14:38 +0530 Subject: [PATCH 4/6] Add const --- ibm/service/power/ibm_pi_constants.go | 842 +++++++++++++------------- 1 file changed, 423 insertions(+), 419 deletions(-) diff --git a/ibm/service/power/ibm_pi_constants.go b/ibm/service/power/ibm_pi_constants.go index f4e2b6d385..6e2923beaf 100644 --- a/ibm/service/power/ibm_pi_constants.go +++ b/ibm/service/power/ibm_pi_constants.go @@ -1,419 +1,423 @@ -package power - -import "time" - -const ( - // 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_SnapshotID = "pi_snapshot_id" - 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_VolumeName = "pi_volume_name" - 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_IOThrottleRate = "io_throttle_rate" - 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_OnboardingId = "onboarding_id" - 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_ServerName = "server_name" - Attr_Shareable = "shreable" - Attr_SharedCoreRatio = "shared_core_ratio" - Attr_SharedProcessorPool = "shared_processor_pool" - Attr_SharedProcessorPoolAllocatedCores = "allocated_cores" - Attr_SharedProcessorPoolAvailableCores = "available_cores" - Attr_SharedProcessorPoolHostID = "host_id" - Attr_SharedProcessorPoolID = "shared_processor_pool_id" - Attr_SharedProcessorPoolInstanceAvailabilityZone = "availability_zone" - Attr_SharedProcessorPoolInstanceCpus = "cpus" - Attr_SharedProcessorPoolInstanceId = "id" - Attr_SharedProcessorPoolInstanceMemory = "memory" - Attr_SharedProcessorPoolInstanceName = "name" - Attr_SharedProcessorPoolInstanceStatus = "status" - Attr_SharedProcessorPoolInstanceUncapped = "uncapped" - Attr_SharedProcessorPoolInstanceVcpus = "vcpus" - Attr_SharedProcessorPoolInstances = "instances" - Attr_SharedProcessorPoolName = "name" - Attr_SharedProcessorPoolPlacementGroups = "spp_placement_groups" - Attr_SharedProcessorPoolReservedCores = "reserved_cores" - Attr_SharedProcessorPoolStatus = "status" - Attr_SharedProcessorPoolStatusDetail = "status_detail" - 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" - PISAPProfileCertified = "certified" - PISAPProfileCores = "cores" - PISAPProfileMemory = "memory" - PISAPProfileID = "profile_id" - PISAPProfileType = "type" - - // DHCP - Arg_DhcpCidr = "pi_cidr" - Arg_DhcpID = "pi_dhcp_id" - Arg_DhcpCloudConnectionID = "pi_cloud_connection_id" - Arg_DhcpDnsServer = "pi_dns_server" - Arg_DhcpName = "pi_dhcp_name" - Arg_DhcpSnatEnabled = "pi_dhcp_snat_enabled" - - Attr_DhcpServers = "servers" - Attr_DhcpID = "dhcp_id" - Attr_DhcpLeases = "leases" - Attr_DhcpLeaseInstanceIP = "instance_ip" - Attr_DhcpLeaseInstanceMac = "instance_mac" - Attr_DhcpNetworkDeprecated = "network" // to deprecate - Attr_DhcpNetworkID = "network_id" - Attr_DhcpNetworkName = "network_name" - Attr_DhcpStatus = "status" - - // Instance - Arg_PVMInstanceId = "pi_instance_id" - Arg_PVMInstanceActionType = "pi_action" - Arg_PVMInstanceHealthStatus = "pi_health_status" - Arg_IBMiCSS = "pi_ibmi_css" - Arg_IBMiPHA = "pi_ibmi_pha" - Arg_IBMiRDSUsers = "pi_ibmi_rds_users" - Attr_IBMiCSS = "ibmi_css" - Attr_IBMiPHA = "ibmi_pha" - Attr_IBMiRDS = "ibmi_rds" - Attr_IBMiRDSUsers = "ibmi_rds_users" - OS_IBMI = "ibmi" - - PVMInstanceHealthOk = "OK" - PVMInstanceHealthWarning = "WARNING" - - //Added timeout values for warning and active status - warningTimeOut = 60 * time.Second - activeTimeOut = 2 * time.Minute - // power service instance capabilities - CUSTOM_VIRTUAL_CORES = "custom-virtualcores" - - PIConsoleLanguageCode = "pi_language_code" - PICloudConnectionId = "cloud_connection_id" - PICloudConnectionStatus = "status" - PICloudConnectionIBMIPAddress = "ibm_ip_address" - PICloudConnectionUserIPAddress = "user_ip_address" - PICloudConnectionPort = "port" - PICloudConnectionClassicGreSource = "gre_source_address" - PICloudConnectionConnectionMode = "connection_mode" - 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" - Arg_PIInstanceSharedProcessorPool = "pi_shared_processor_pool" - - // Placement Group - PIPlacementGroupID = "placement_group_id" - PIPlacementGroupMembers = "members" - - // Volume - PIVolumeIds = "pi_volume_ids" - PIAffinityPolicy = "pi_affinity_policy" - PIAffinityVolume = "pi_affinity_volume" - PIAffinityInstance = "pi_affinity_instance" - PIAntiAffinityInstances = "pi_anti_affinity_instances" - PIAntiAffinityVolumes = "pi_anti_affinity_volumes" - - // Volume Clone - PIVolumeCloneName = "pi_volume_clone_name" - PIVolumeCloneTaskID = "pi_volume_clone_task_id" - PITargetStorageTier = "pi_target_storage_tier" - - // IBM PI Volume Group - PIVolumeGroupName = "pi_volume_group_name" - PIVolumeGroupConsistencyGroupName = "pi_consistency_group_name" - PIVolumeGroupID = "pi_volume_group_id" - PIVolumeGroupAction = "pi_volume_group_action" - PIVolumeOnboardingID = "pi_volume_onboarding_id" - - // Disaster Recovery Location - PIDRLocation = "location" - - // VPN - PIVPNConnectionId = "connection_id" - PIVPNConnectionStatus = "connection_status" - PIVPNConnectionDeadPeerDetection = "dead_peer_detections" - PIVPNConnectionDeadPeerDetectionAction = "action" - PIVPNConnectionDeadPeerDetectionInterval = "interval" - PIVPNConnectionDeadPeerDetectionThreshold = "threshold" - PIVPNConnectionLocalGatewayAddress = "local_gateway_address" - PIVPNConnectionVpnGatewayAddress = "gateway_address" - - // Cloud Connections - PICloudConnectionTransitEnabled = "pi_cloud_connection_transit_enabled" - - // SPP Placement Group - - Attr_SPPPlacementGroupID = "spp_placement_group_id" - Attr_SPPPlacementGroupMembers = "members" - Attr_SPPPlacementGroupPolicy = "policy" - Attr_SPPPlacementGroupName = "name" - - // status - // common status states - StatusShutoff = "SHUTOFF" - StatusActive = "ACTIVE" - StatusResize = "RESIZE" - StatusError = "ERROR" - StatusBuild = "BUILD" - StatusPending = "PENDING" - SctionStart = "start" - SctionStop = "stop" - - // volume clone task status - VolumeCloneCompleted = "completed" - VolumeCloneRunning = "running" - - // Workspaces - Attr_WorkspaceCapabilities = "pi_workspace_capabilities" - Attr_WorkspaceDetails = "pi_workspace_details" - Attr_WorkspaceID = "pi_workspace_id" - Attr_WorkspaceLocation = "pi_workspace_location" - Attr_WorkspaceName = "pi_workspace_name" - Attr_WorkspaceStatus = "pi_workspace_status" - Attr_WorkspaceType = "pi_workspace_type" - - // Datacenter - Arg_DatacenterZone = "pi_datacenter_zone" - Attr_DatacenterCapabilities = "pi_datacenter_capabilities" - Attr_DatacenterLocation = "pi_datacenter_location" - Attr_DatacenterStatus = "pi_datacenter_status" - Attr_DatacenterType = "pi_datacenter_type" - Attr_DatacenterHref = "pi_datacenter_href" - - // IBM PI Workspace - PIWorkspaceName = "pi_name" - PIWorkspaceDatacenter = "pi_datacenter" - PIWorkspaceResourceGroup = "pi_resource_group_id" - PIWorkspacePlan = "pi_plan" - PIVirtualOpticalDevice = "pi_virtual_optical_device" -) +package power + +import "time" + +const ( + // 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_SnapshotID = "pi_snapshot_id" + 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" + Arg_OnboardingVolumes = "pi_onboarding_volumes" + Arg_AuxiliaryVolumes = "pi_auxiliary_volumes" + Arg_AuxiliaryVolumeName = "pi_auxiliary_volume_name" + Arg_SourceCRN = "pi_source_crn" + Arg_DisplayName = "pi_display_name" + Arg_Description = "pi_description" + + // 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_OnboardingId = "onboarding_id" + 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_ServerName = "server_name" + Attr_Shareable = "shreable" + Attr_SharedCoreRatio = "shared_core_ratio" + Attr_SharedProcessorPool = "shared_processor_pool" + Attr_SharedProcessorPoolAllocatedCores = "allocated_cores" + Attr_SharedProcessorPoolAvailableCores = "available_cores" + Attr_SharedProcessorPoolHostID = "host_id" + Attr_SharedProcessorPoolID = "shared_processor_pool_id" + Attr_SharedProcessorPoolInstanceAvailabilityZone = "availability_zone" + Attr_SharedProcessorPoolInstanceCpus = "cpus" + Attr_SharedProcessorPoolInstanceId = "id" + Attr_SharedProcessorPoolInstanceMemory = "memory" + Attr_SharedProcessorPoolInstanceName = "name" + Attr_SharedProcessorPoolInstanceStatus = "status" + Attr_SharedProcessorPoolInstanceUncapped = "uncapped" + Attr_SharedProcessorPoolInstanceVcpus = "vcpus" + Attr_SharedProcessorPoolInstances = "instances" + Attr_SharedProcessorPoolName = "name" + Attr_SharedProcessorPoolPlacementGroups = "spp_placement_groups" + Attr_SharedProcessorPoolReservedCores = "reserved_cores" + Attr_SharedProcessorPoolStatus = "status" + Attr_SharedProcessorPoolStatusDetail = "status_detail" + 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" + PISAPProfileCertified = "certified" + PISAPProfileCores = "cores" + PISAPProfileMemory = "memory" + PISAPProfileID = "profile_id" + PISAPProfileType = "type" + + // DHCP + Arg_DhcpCidr = "pi_cidr" + Arg_DhcpID = "pi_dhcp_id" + Arg_DhcpCloudConnectionID = "pi_cloud_connection_id" + Arg_DhcpDnsServer = "pi_dns_server" + Arg_DhcpName = "pi_dhcp_name" + Arg_DhcpSnatEnabled = "pi_dhcp_snat_enabled" + + Attr_DhcpServers = "servers" + Attr_DhcpID = "dhcp_id" + Attr_DhcpLeases = "leases" + Attr_DhcpLeaseInstanceIP = "instance_ip" + Attr_DhcpLeaseInstanceMac = "instance_mac" + Attr_DhcpNetworkDeprecated = "network" // to deprecate + Attr_DhcpNetworkID = "network_id" + Attr_DhcpNetworkName = "network_name" + Attr_DhcpStatus = "status" + + // Instance + Arg_PVMInstanceId = "pi_instance_id" + Arg_PVMInstanceActionType = "pi_action" + Arg_PVMInstanceHealthStatus = "pi_health_status" + Arg_IBMiCSS = "pi_ibmi_css" + Arg_IBMiPHA = "pi_ibmi_pha" + Arg_IBMiRDSUsers = "pi_ibmi_rds_users" + Attr_IBMiCSS = "ibmi_css" + Attr_IBMiPHA = "ibmi_pha" + Attr_IBMiRDS = "ibmi_rds" + Attr_IBMiRDSUsers = "ibmi_rds_users" + OS_IBMI = "ibmi" + + PVMInstanceHealthOk = "OK" + PVMInstanceHealthWarning = "WARNING" + + //Added timeout values for warning and active status + warningTimeOut = 60 * time.Second + activeTimeOut = 2 * time.Minute + // power service instance capabilities + CUSTOM_VIRTUAL_CORES = "custom-virtualcores" + + PIConsoleLanguageCode = "pi_language_code" + PICloudConnectionId = "cloud_connection_id" + PICloudConnectionStatus = "status" + PICloudConnectionIBMIPAddress = "ibm_ip_address" + PICloudConnectionUserIPAddress = "user_ip_address" + PICloudConnectionPort = "port" + PICloudConnectionClassicGreSource = "gre_source_address" + PICloudConnectionConnectionMode = "connection_mode" + 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" + Arg_PIInstanceSharedProcessorPool = "pi_shared_processor_pool" + + // Placement Group + PIPlacementGroupID = "placement_group_id" + PIPlacementGroupMembers = "members" + + // Volume + PIVolumeIds = "pi_volume_ids" + PIAffinityPolicy = "pi_affinity_policy" + PIAffinityVolume = "pi_affinity_volume" + PIAffinityInstance = "pi_affinity_instance" + PIAntiAffinityInstances = "pi_anti_affinity_instances" + PIAntiAffinityVolumes = "pi_anti_affinity_volumes" + + // Volume Clone + PIVolumeCloneName = "pi_volume_clone_name" + PIVolumeCloneTaskID = "pi_volume_clone_task_id" + PITargetStorageTier = "pi_target_storage_tier" + + // IBM PI Volume Group + PIVolumeGroupName = "pi_volume_group_name" + PIVolumeGroupConsistencyGroupName = "pi_consistency_group_name" + PIVolumeGroupID = "pi_volume_group_id" + PIVolumeGroupAction = "pi_volume_group_action" + PIVolumeOnboardingID = "pi_volume_onboarding_id" + + // Disaster Recovery Location + PIDRLocation = "location" + + // VPN + PIVPNConnectionId = "connection_id" + PIVPNConnectionStatus = "connection_status" + PIVPNConnectionDeadPeerDetection = "dead_peer_detections" + PIVPNConnectionDeadPeerDetectionAction = "action" + PIVPNConnectionDeadPeerDetectionInterval = "interval" + PIVPNConnectionDeadPeerDetectionThreshold = "threshold" + PIVPNConnectionLocalGatewayAddress = "local_gateway_address" + PIVPNConnectionVpnGatewayAddress = "gateway_address" + + // Cloud Connections + PICloudConnectionTransitEnabled = "pi_cloud_connection_transit_enabled" + + // SPP Placement Group + + Attr_SPPPlacementGroupID = "spp_placement_group_id" + Attr_SPPPlacementGroupMembers = "members" + Attr_SPPPlacementGroupPolicy = "policy" + Attr_SPPPlacementGroupName = "name" + + // status + // common status states + StatusShutoff = "SHUTOFF" + StatusActive = "ACTIVE" + StatusResize = "RESIZE" + StatusError = "ERROR" + StatusBuild = "BUILD" + StatusPending = "PENDING" + SctionStart = "start" + SctionStop = "stop" + + // volume clone task status + VolumeCloneCompleted = "completed" + VolumeCloneRunning = "running" + + // Workspaces + Attr_WorkspaceCapabilities = "pi_workspace_capabilities" + Attr_WorkspaceDetails = "pi_workspace_details" + Attr_WorkspaceID = "pi_workspace_id" + Attr_WorkspaceLocation = "pi_workspace_location" + Attr_WorkspaceName = "pi_workspace_name" + Attr_WorkspaceStatus = "pi_workspace_status" + Attr_WorkspaceType = "pi_workspace_type" + + // Datacenter + Arg_DatacenterZone = "pi_datacenter_zone" + Attr_DatacenterCapabilities = "pi_datacenter_capabilities" + Attr_DatacenterLocation = "pi_datacenter_location" + Attr_DatacenterStatus = "pi_datacenter_status" + Attr_DatacenterType = "pi_datacenter_type" + Attr_DatacenterHref = "pi_datacenter_href" + + // IBM PI Workspace + PIWorkspaceName = "pi_name" + PIWorkspaceDatacenter = "pi_datacenter" + PIWorkspaceResourceGroup = "pi_resource_group_id" + PIWorkspacePlan = "pi_plan" + PIVirtualOpticalDevice = "pi_virtual_optical_device" +) From 13252f3b3f5cbc96b281f7d641afcb51c3de95e5 Mon Sep 17 00:00:00 2001 From: Diptipowervs Date: Tue, 26 Mar 2024 18:24:07 +0530 Subject: [PATCH 5/6] Add constants --- ibm/service/power/ibm_pi_constants.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ibm/service/power/ibm_pi_constants.go b/ibm/service/power/ibm_pi_constants.go index 6e2923beaf..b422910066 100644 --- a/ibm/service/power/ibm_pi_constants.go +++ b/ibm/service/power/ibm_pi_constants.go @@ -26,6 +26,7 @@ const ( Arg_StoragePool = "pi_storage_pool" Arg_StorageType = "pi_storage_type" Arg_VTL = "vtl" + Arg_VolumeName = "pi_volume_name" Arg_VolumeGroupID = "pi_volume_group_id" Arg_VolumeID = "pi_volume_id" Arg_VolumeOnboardingID = "pi_volume_onboarding_id" @@ -100,6 +101,7 @@ const ( Attr_Hypervisor = "hypervisor" Attr_HypervisorType = "hypervisor_type" Attr_IBMIPAddress = "ibm_ip_address" + Attr_IOThrottleRate = "io_throttle_rate" Attr_ID = "id" Attr_IP = "ip" Attr_IPAddress = "ipaddress" From d3803353c22981d9d7bc7288387a583b40ed6de3 Mon Sep 17 00:00:00 2001 From: Axel Ismirlian Date: Fri, 20 Sep 2024 11:46:48 -0500 Subject: [PATCH 6/6] Fix volume onboarding refactor --- go.sum | 1 + ibm/service/power/ibm_pi_constants.go | 2 +- .../resource_ibm_pi_volume_onboarding.go | 26 +++++++++---------- .../resource_ibm_pi_volume_onboarding_test.go | 2 +- .../docs/r/pi_volume_onboarding.html.markdown | 6 ++--- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/go.sum b/go.sum index fb229b47cd..87eca8aac9 100644 --- a/go.sum +++ b/go.sum @@ -1487,6 +1487,7 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= diff --git a/ibm/service/power/ibm_pi_constants.go b/ibm/service/power/ibm_pi_constants.go index b422910066..677c264d6f 100644 --- a/ibm/service/power/ibm_pi_constants.go +++ b/ibm/service/power/ibm_pi_constants.go @@ -156,7 +156,7 @@ const ( Attr_Networks = "networks" Attr_NumberOfVolumes = "number_of_volumes" Attr_Onboardings = "onboardings" - Attr_OnboardingId = "onboarding_id" + Attr_OnboardingID = "onboarding_id" Attr_OperatingSystem = "operating_system" Attr_PVMInstanceID = "pvm_instance_id" Attr_PVMInstances = "pvm_instances" diff --git a/ibm/service/power/resource_ibm_pi_volume_onboarding.go b/ibm/service/power/resource_ibm_pi_volume_onboarding.go index f05eccc6f4..231ae25a87 100644 --- a/ibm/service/power/resource_ibm_pi_volume_onboarding.go +++ b/ibm/service/power/resource_ibm_pi_volume_onboarding.go @@ -35,12 +35,7 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource { Required: true, Type: schema.TypeString, }, - Arg_OnboardingVolumes: { - Type: schema.TypeList, - Required: true, - ForceNew: true, - MinItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ Arg_SourceCRN: { @@ -69,6 +64,10 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource { }, }, }, + ForceNew: true, + MinItems: 1, + Required: true, + Type: schema.TypeList, }, Arg_Description: { Computed: true, @@ -83,17 +82,17 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource { Description: "Indicates the create-time of volume onboarding operation", Type: schema.TypeString, }, - Attr_OnboardingId: { - Computed: true, - Description: "Indicates the volume onboarding operation id", - Type: schema.TypeString, - }, Attr_InputVolumes: { Computed: true, Description: "List of volumes requested to be onboarded", Elem: &schema.Schema{Type: schema.TypeString}, Type: schema.TypeList, }, + Attr_OnboardingID: { + Computed: true, + Description: "Indicates the volume onboarding operation id", + Type: schema.TypeString, + }, Attr_Progress: { Computed: true, Description: "Indicates the progress of volume onboarding operation", @@ -106,7 +105,6 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource { Type: schema.TypeList, }, Attr_ResultsVolumeOnboardingFailures: { - Type: schema.TypeList, Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -121,7 +119,9 @@ func ResourceIBMPIVolumeOnboarding() *schema.Resource { Elem: &schema.Schema{Type: schema.TypeString}, Type: schema.TypeList, }, - }}, + }, + }, + Type: schema.TypeList, }, Attr_Status: { Computed: true, @@ -181,7 +181,7 @@ func resourceIBMPIVolumeOnboardingRead(ctx context.Context, d *schema.ResourceDa return diag.FromErr(err) } - d.Set(Attr_OnboardingId, *onboardingData.ID) + d.Set(Attr_OnboardingID, *onboardingData.ID) d.Set(Attr_CreateTime, onboardingData.CreationTimestamp.String()) d.Set(Arg_Description, onboardingData.Description) d.Set(Attr_InputVolumes, onboardingData.InputVolumes) diff --git a/ibm/service/power/resource_ibm_pi_volume_onboarding_test.go b/ibm/service/power/resource_ibm_pi_volume_onboarding_test.go index 002d65e628..e4198eddf3 100644 --- a/ibm/service/power/resource_ibm_pi_volume_onboarding_test.go +++ b/ibm/service/power/resource_ibm_pi_volume_onboarding_test.go @@ -82,5 +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) } diff --git a/website/docs/r/pi_volume_onboarding.html.markdown b/website/docs/r/pi_volume_onboarding.html.markdown index 413cbeaea6..1569d07016 100644 --- a/website/docs/r/pi_volume_onboarding.html.markdown +++ b/website/docs/r/pi_volume_onboarding.html.markdown @@ -86,8 +86,8 @@ In addition to all argument reference list, you can access the following attribu The `ibm_pi_volume_onboarding` resource can be imported by using `pi_cloud_instance_id` and `onboarding_id`. -**Example** +### Example -``` -$ terraform import ibm_pi_volume_onboarding.example d7bec597-4726-451f-8a63-e62e6f19c32c/49fba6c9-23f8-40bc-9899-aca322ee7d5b +```bash +terraform import ibm_pi_volume_onboarding.example d7bec597-4726-451f-8a63-e62e6f19c32c/49fba6c9-23f8-40bc-9899-aca322ee7d5b ```