Skip to content

Commit 6519664

Browse files
ismirliaismirlia
committed
Refactor Cloud Connection
1 parent 7f0333b commit 6519664

6 files changed

+388
-365
lines changed

‎ibm/service/power/ibm_pi_constants.go

Lines changed: 132 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -4,118 +4,131 @@ import "time"
44

55
const (
66
// Arguments
7-
Arg_Action = "pi_action"
8-
Arg_AffinityInstance = "pi_affinity_instance"
9-
Arg_AffinityPolicy = "pi_affinity_policy"
10-
Arg_AffinityVolume = "pi_affinity_volume"
11-
Arg_AntiAffinityInstances = "pi_anti_affinity_instances"
12-
Arg_AntiAffinityVolumes = "pi_anti_affinity_volumes"
13-
Arg_BootVolumeReplicationEnabled = "pi_boot_volume_replication_enabled"
14-
Arg_Cidr = "pi_cidr"
15-
Arg_CloudConnectionID = "pi_cloud_connection_id"
16-
Arg_CloudConnectionName = "pi_cloud_connection_name"
17-
Arg_CloudInstanceID = "pi_cloud_instance_id"
18-
Arg_ConsistencyGroupName = "pi_consistency_group_name"
19-
Arg_Datacenter = "pi_datacenter"
20-
Arg_DatacenterZone = "pi_datacenter_zone"
21-
Arg_DeploymentTarget = "pi_deployment_target"
22-
Arg_DeploymentType = "pi_deployment_type"
23-
Arg_Description = "pi_description"
24-
Arg_DestinationPorts = "pi_destination_ports"
25-
Arg_DhcpID = "pi_dhcp_id"
26-
Arg_DhcpName = "pi_dhcp_name"
27-
Arg_DhcpSnatEnabled = "pi_dhcp_snat_enabled"
28-
Arg_DnsServer = "pi_dns_server"
29-
Arg_HealthStatus = "pi_health_status"
30-
Arg_Host = "pi_host"
31-
Arg_HostGroupID = "pi_host_group_id"
32-
Arg_HostID = "pi_host_id"
33-
Arg_Hosts = "pi_hosts"
34-
Arg_IBMiCSS = "pi_ibmi_css"
35-
Arg_IBMiPHA = "pi_ibmi_pha"
36-
Arg_IBMiRDSUsers = "pi_ibmi_rds_users"
37-
Arg_ImageID = "pi_image_id"
38-
Arg_ImageImportDetails = "pi_image_import_details"
39-
Arg_ImageName = "pi_image_name"
40-
Arg_InstanceID = "pi_instance_id"
41-
Arg_InstanceName = "pi_instance_name"
42-
Arg_IPAddress = "pi_ip_address"
43-
Arg_Key = "pi_ssh_key"
44-
Arg_KeyName = "pi_key_name"
45-
Arg_KeyPairName = "pi_key_pair_name"
46-
Arg_LanguageCode = "pi_language_code"
47-
Arg_LicenseRepositoryCapacity = "pi_license_repository_capacity"
48-
Arg_Memory = "pi_memory"
49-
Arg_Name = "pi_name"
50-
Arg_Network = "pi_network"
51-
Arg_NetworkAddressGroupID = "pi_network_address_group_id"
52-
Arg_NetworkAddressGroupMemberID = "pi_network_address_group_member_id"
53-
Arg_NetworkID = "pi_network_id"
54-
Arg_NetworkInterfaceID = "pi_network_interface_id"
55-
Arg_NetworkName = "pi_network_name"
56-
Arg_NetworkSecurityGroupID = "pi_network_security_group_id"
57-
Arg_NetworkSecurityGroupMemberID = "pi_network_security_group_member_id"
58-
Arg_NetworkSecurityGroupRuleID = "pi_network_security_group_rule_id"
59-
Arg_PinPolicy = "pi_pin_policy"
60-
Arg_PlacementGroupID = "pi_placement_group_id"
61-
Arg_PlacementGroupName = "pi_placement_group_name"
62-
Arg_PlacementGroupPolicy = "pi_placement_group_policy"
63-
Arg_Plan = "pi_plan"
64-
Arg_Processors = "pi_processors"
65-
Arg_ProcType = "pi_proc_type"
66-
Arg_Protocol = "pi_protocol"
67-
Arg_Remote = "pi_remote"
68-
Arg_Remove = "pi_remove"
69-
Arg_Replicants = "pi_replicants"
70-
Arg_ReplicationEnabled = "pi_replication_enabled"
71-
Arg_ReplicationPolicy = "pi_replication_policy"
72-
Arg_ReplicationScheme = "pi_replication_scheme"
73-
Arg_ReplicationSites = "pi_replication_sites"
74-
Arg_ResourceGroupID = "pi_resource_group_id"
75-
Arg_SAP = "sap"
76-
Arg_SAPDeploymentType = "pi_sap_deployment_type"
77-
Arg_SAPProfileID = "pi_sap_profile_id"
78-
Arg_Secondaries = "pi_secondaries"
79-
Arg_SharedProcessorPool = "pi_shared_processor_pool"
80-
Arg_SharedProcessorPoolHostGroup = "pi_shared_processor_pool_host_group"
81-
Arg_SharedProcessorPoolID = "pi_shared_processor_pool_id"
82-
Arg_SharedProcessorPoolName = "pi_shared_processor_pool_name"
83-
Arg_SharedProcessorPoolPlacementGroupID = "pi_shared_processor_pool_placement_group_id"
84-
Arg_SharedProcessorPoolPlacementGroups = "pi_shared_processor_pool_placement_groups"
85-
Arg_SharedProcessorPoolReservedCores = "pi_shared_processor_pool_reserved_cores"
86-
Arg_SnapshotID = "pi_snapshot_id"
87-
Arg_SnapShotName = "pi_snap_shot_name"
88-
Arg_SourcePorts = "pi_source_ports"
89-
Arg_SPPPlacementGroupID = "pi_spp_placement_group_id"
90-
Arg_SPPPlacementGroupName = "pi_spp_placement_group_name"
91-
Arg_SPPPlacementGroupPolicy = "pi_spp_placement_group_policy"
92-
Arg_SSHKey = "pi_ssh_key"
93-
Arg_StorageConnection = "pi_storage_connection"
94-
Arg_StoragePool = "pi_storage_pool"
95-
Arg_StoragePoolAffinity = "pi_storage_pool_affinity"
96-
Arg_StorageType = "pi_storage_type"
97-
Arg_SysType = "pi_sys_type"
98-
Arg_Target = "pi_target"
99-
Arg_TargetStorageTier = "pi_target_storage_tier"
100-
Arg_Type = "pi_type"
101-
Arg_UserData = "pi_user_data"
102-
Arg_UserTags = "pi_user_tags"
103-
Arg_VirtualCoresAssigned = "pi_virtual_cores_assigned"
104-
Arg_VirtualOpticalDevice = "pi_virtual_optical_device"
105-
Arg_VolumeCloneName = "pi_volume_clone_name"
106-
Arg_VolumeCloneTaskID = "pi_volume_clone_task_id"
107-
Arg_VolumeGroupID = "pi_volume_group_id"
108-
Arg_VolumeGroupName = "pi_volume_group_name"
109-
Arg_VolumeID = "pi_volume_id"
110-
Arg_VolumeIDs = "pi_volume_ids"
111-
Arg_VolumeName = "pi_volume_name"
112-
Arg_VolumeOnboardingID = "pi_volume_onboarding_id"
113-
Arg_VolumePool = "pi_volume_pool"
114-
Arg_VolumeShareable = "pi_volume_shareable"
115-
Arg_VolumeSize = "pi_volume_size"
116-
Arg_VolumeSnapshotID = "pi_volume_snapshot_id"
117-
Arg_VolumeType = "pi_volume_type"
118-
Arg_VTL = "vtl"
7+
Arg_Action = "pi_action"
8+
Arg_AffinityInstance = "pi_affinity_instance"
9+
Arg_AffinityPolicy = "pi_affinity_policy"
10+
Arg_AffinityVolume = "pi_affinity_volume"
11+
Arg_AntiAffinityInstances = "pi_anti_affinity_instances"
12+
Arg_AntiAffinityVolumes = "pi_anti_affinity_volumes"
13+
Arg_BootVolumeReplicationEnabled = "pi_boot_volume_replication_enabled"
14+
Arg_Cidr = "pi_cidr"
15+
Arg_CloudConnectionClassicEnabled = "pi_cloud_connection_classic_enabled"
16+
Arg_CloudConnectionGlobalRouting = "pi_cloud_connection_global_routing"
17+
Arg_CloudConnectionGreCidr = "pi_cloud_connection_gre_cidr"
18+
Arg_CloudConnectionGreDestinationAddress = "pi_cloud_connection_gre_destination_address"
19+
Arg_CloudConnectionID = "pi_cloud_connection_id"
20+
Arg_CloudConnectionMetered = "pi_cloud_connection_metered"
21+
Arg_CloudConnectionName = "pi_cloud_connection_name"
22+
Arg_CloudConnectionNetworks = "pi_cloud_connection_networks"
23+
Arg_CloudConnectionSpeed = "pi_cloud_connection_speed"
24+
Arg_CloudConnectionTransitEnabled = "pi_cloud_connection_transit_enabled"
25+
Arg_CloudConnectionVPCCRNs = "pi_cloud_connection_vpc_crns"
26+
Arg_CloudConnectionVPCEnabled = "pi_cloud_connection_vpc_enabled"
27+
Arg_CloudInstanceID = "pi_cloud_instance_id"
28+
Arg_ConsistencyGroupName = "pi_consistency_group_name"
29+
Arg_Datacenter = "pi_datacenter"
30+
Arg_DatacenterZone = "pi_datacenter_zone"
31+
Arg_DeploymentTarget = "pi_deployment_target"
32+
Arg_DeploymentType = "pi_deployment_type"
33+
Arg_Description = "pi_description"
34+
Arg_DestinationPorts = "pi_destination_ports"
35+
Arg_DhcpID = "pi_dhcp_id"
36+
Arg_DhcpName = "pi_dhcp_name"
37+
Arg_DhcpSnatEnabled = "pi_dhcp_snat_enabled"
38+
Arg_DnsServer = "pi_dns_server"
39+
Arg_HealthStatus = "pi_health_status"
40+
Arg_Host = "pi_host"
41+
Arg_HostGroupID = "pi_host_group_id"
42+
Arg_HostID = "pi_host_id"
43+
Arg_Hosts = "pi_hosts"
44+
Arg_IBMiCSS = "pi_ibmi_css"
45+
Arg_IBMiPHA = "pi_ibmi_pha"
46+
Arg_IBMiRDSUsers = "pi_ibmi_rds_users"
47+
Arg_ImageID = "pi_image_id"
48+
Arg_ImageImportDetails = "pi_image_import_details"
49+
Arg_ImageName = "pi_image_name"
50+
Arg_InstanceID = "pi_instance_id"
51+
Arg_InstanceName = "pi_instance_name"
52+
Arg_IPAddress = "pi_ip_address"
53+
Arg_Key = "pi_ssh_key"
54+
Arg_KeyName = "pi_key_name"
55+
Arg_KeyPairName = "pi_key_pair_name"
56+
Arg_LanguageCode = "pi_language_code"
57+
Arg_LicenseRepositoryCapacity = "pi_license_repository_capacity"
58+
Arg_Memory = "pi_memory"
59+
Arg_Name = "pi_name"
60+
Arg_Network = "pi_network"
61+
Arg_NetworkAddressGroupID = "pi_network_address_group_id"
62+
Arg_NetworkAddressGroupMemberID = "pi_network_address_group_member_id"
63+
Arg_NetworkID = "pi_network_id"
64+
Arg_NetworkInterfaceID = "pi_network_interface_id"
65+
Arg_NetworkName = "pi_network_name"
66+
Arg_NetworkSecurityGroupID = "pi_network_security_group_id"
67+
Arg_NetworkSecurityGroupMemberID = "pi_network_security_group_member_id"
68+
Arg_NetworkSecurityGroupRuleID = "pi_network_security_group_rule_id"
69+
Arg_PinPolicy = "pi_pin_policy"
70+
Arg_PlacementGroupID = "pi_placement_group_id"
71+
Arg_PlacementGroupName = "pi_placement_group_name"
72+
Arg_PlacementGroupPolicy = "pi_placement_group_policy"
73+
Arg_Plan = "pi_plan"
74+
Arg_Processors = "pi_processors"
75+
Arg_ProcType = "pi_proc_type"
76+
Arg_Protocol = "pi_protocol"
77+
Arg_PVMInstanceActionType = "pi_action"
78+
Arg_PVMInstanceHealthStatus = "pi_health_status"
79+
Arg_PVMInstanceId = "pi_instance_id"
80+
Arg_Remote = "pi_remote"
81+
Arg_Remove = "pi_remove"
82+
Arg_Replicants = "pi_replicants"
83+
Arg_ReplicationEnabled = "pi_replication_enabled"
84+
Arg_ReplicationPolicy = "pi_replication_policy"
85+
Arg_ReplicationScheme = "pi_replication_scheme"
86+
Arg_ReplicationSites = "pi_replication_sites"
87+
Arg_ResourceGroupID = "pi_resource_group_id"
88+
Arg_SAP = "sap"
89+
Arg_SAPDeploymentType = "pi_sap_deployment_type"
90+
Arg_SAPProfileID = "pi_sap_profile_id"
91+
Arg_Secondaries = "pi_secondaries"
92+
Arg_SharedProcessorPool = "pi_shared_processor_pool"
93+
Arg_SharedProcessorPoolHostGroup = "pi_shared_processor_pool_host_group"
94+
Arg_SharedProcessorPoolID = "pi_shared_processor_pool_id"
95+
Arg_SharedProcessorPoolName = "pi_shared_processor_pool_name"
96+
Arg_SharedProcessorPoolPlacementGroupID = "pi_shared_processor_pool_placement_group_id"
97+
Arg_SharedProcessorPoolPlacementGroups = "pi_shared_processor_pool_placement_groups"
98+
Arg_SharedProcessorPoolReservedCores = "pi_shared_processor_pool_reserved_cores"
99+
Arg_SnapshotID = "pi_snapshot_id"
100+
Arg_SnapShotName = "pi_snap_shot_name"
101+
Arg_SourcePorts = "pi_source_ports"
102+
Arg_SPPPlacementGroupID = "pi_spp_placement_group_id"
103+
Arg_SPPPlacementGroupName = "pi_spp_placement_group_name"
104+
Arg_SPPPlacementGroupPolicy = "pi_spp_placement_group_policy"
105+
Arg_SSHKey = "pi_ssh_key"
106+
Arg_StorageConnection = "pi_storage_connection"
107+
Arg_StoragePool = "pi_storage_pool"
108+
Arg_StoragePoolAffinity = "pi_storage_pool_affinity"
109+
Arg_StorageType = "pi_storage_type"
110+
Arg_SysType = "pi_sys_type"
111+
Arg_Target = "pi_target"
112+
Arg_TargetStorageTier = "pi_target_storage_tier"
113+
Arg_Type = "pi_type"
114+
Arg_UserData = "pi_user_data"
115+
Arg_UserTags = "pi_user_tags"
116+
Arg_VirtualCoresAssigned = "pi_virtual_cores_assigned"
117+
Arg_VirtualOpticalDevice = "pi_virtual_optical_device"
118+
Arg_VolumeCloneName = "pi_volume_clone_name"
119+
Arg_VolumeCloneTaskID = "pi_volume_clone_task_id"
120+
Arg_VolumeGroupID = "pi_volume_group_id"
121+
Arg_VolumeGroupName = "pi_volume_group_name"
122+
Arg_VolumeID = "pi_volume_id"
123+
Arg_VolumeIDs = "pi_volume_ids"
124+
Arg_VolumeName = "pi_volume_name"
125+
Arg_VolumeOnboardingID = "pi_volume_onboarding_id"
126+
Arg_VolumePool = "pi_volume_pool"
127+
Arg_VolumeShareable = "pi_volume_shareable"
128+
Arg_VolumeSize = "pi_volume_size"
129+
Arg_VolumeSnapshotID = "pi_volume_snapshot_id"
130+
Arg_VolumeType = "pi_volume_type"
131+
Arg_VTL = "vtl"
119132

120133
// Attributes
121134
Attr_Access = "access"
@@ -449,6 +462,7 @@ const (
449462
Attach = "attach"
450463
BYOL = "byol"
451464
Capped = "capped"
465+
Create = "create"
452466
Critical = "CRITICAL"
453467
CUSTOM_VIRTUAL_CORES = "custom-virtualcores"
454468
Dedicated = "dedicated"
@@ -491,6 +505,7 @@ const (
491505
UserTagType = "user"
492506
Vlan = "vlan"
493507
vSCSI = "vSCSI"
508+
Update = "update"
494509
Warning = "WARNING"
495510

496511
// Actions
@@ -541,9 +556,11 @@ const (
541556
State_VerifyResize = "verify_resize"
542557

543558
// Timeout values
544-
Timeout_Active = 2 * time.Minute
545-
Timeout_Delay = 60 * time.Second
546-
Timeout_Warning = 60 * time.Second
559+
Timeout_Active = 2 * time.Minute
560+
Timeout_Delay = 60 * time.Second
561+
Timeout_Warning = 60 * time.Second
562+
vpcRetryCount = 2
563+
vpcRetryDuration = time.Minute
547564

548565
// TODO: Second Half Cleanup, remove extra variables
549566

@@ -559,7 +576,4 @@ const (
559576
PIVPNConnectionDeadPeerDetectionThreshold = "threshold"
560577
PIVPNConnectionLocalGatewayAddress = "local_gateway_address"
561578
PIVPNConnectionVpnGatewayAddress = "gateway_address"
562-
563-
// Cloud Connections
564-
PICloudConnectionTransitEnabled = "pi_cloud_connection_transit_enabled"
565579
)

0 commit comments

Comments
 (0)