Skip to content

Commit b4973e2

Browse files
michaelkadmichaelkad
committed
[D] Network Security Group
[R] Add NSG [R] Add NSG Action [R] Add NSG Member [R] Add NSG Member test [R] Add NSG Rule
1 parent 9bf509e commit b4973e2

22 files changed

+3169
-34
lines changed

‎ibm/acctest/acctest.go‎

Lines changed: 65 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -203,40 +203,44 @@ var (
203203
// For Power Colo
204204

205205
var (
206-
Pi_auxiliary_volume_name string
207-
Pi_cloud_instance_id string
208-
Pi_dhcp_id string
209-
Pi_host_group_id string
210-
Pi_host_id string
211-
Pi_image string
212-
Pi_image_bucket_access_key string
213-
Pi_image_bucket_file_name string
214-
Pi_image_bucket_name string
215-
Pi_image_bucket_region string
216-
Pi_image_bucket_secret_key string
217-
Pi_instance_name string
218-
Pi_key_name string
206+
Pi_auxiliary_volume_name string
207+
Pi_cloud_instance_id string
208+
Pi_dhcp_id string
209+
Pi_host_group_id string
210+
Pi_host_id string
211+
Pi_image string
212+
Pi_image_bucket_access_key string
213+
Pi_image_bucket_file_name string
214+
Pi_image_bucket_name string
215+
Pi_image_bucket_region string
216+
Pi_image_bucket_secret_key string
217+
Pi_instance_name string
218+
Pi_key_name string
219219
Pi_network_address_group_id string
220-
Pi_network_name string
221-
Pi_placement_group_name string
222-
Pi_replication_volume_name string
223-
Pi_resource_group_id string
224-
Pi_sap_image string
225-
Pi_shared_processor_pool_id string
226-
Pi_snapshot_id string
227-
Pi_spp_placement_group_id string
228-
Pi_target_storage_tier string
229-
Pi_volume_clone_task_id string
230-
Pi_volume_group_id string
231-
Pi_volume_group_name string
232-
Pi_volume_id string
233-
Pi_volume_name string
234-
Pi_volume_onboarding_id string
235-
Pi_volume_onboarding_source_crn string
236-
PiCloudConnectionName string
237-
PiSAPProfileID string
238-
PiStoragePool string
239-
PiStorageType string
220+
Pi_network_name string
221+
Pi_network_security_group_id string
222+
Pi_network_security_group_rule_id string
223+
Pi_placement_group_name string
224+
Pi_remote_id string
225+
Pi_remote_type string
226+
Pi_replication_volume_name string
227+
Pi_resource_group_id string
228+
Pi_sap_image string
229+
Pi_shared_processor_pool_id string
230+
Pi_snapshot_id string
231+
Pi_spp_placement_group_id string
232+
Pi_target_storage_tier string
233+
Pi_volume_clone_task_id string
234+
Pi_volume_group_id string
235+
Pi_volume_group_name string
236+
Pi_volume_id string
237+
Pi_volume_name string
238+
Pi_volume_onboarding_id string
239+
Pi_volume_onboarding_source_crn string
240+
PiCloudConnectionName string
241+
PiSAPProfileID string
242+
PiStoragePool string
243+
PiStorageType string
240244
)
241245

242246
var (
@@ -1063,6 +1067,18 @@ func init() {
10631067
fmt.Println("[INFO] Set the environment variable PI_NETWORK_NAME for testing ibm_pi_network_name resource else it is set to default value 'terraform-test-power'")
10641068
}
10651069

1070+
Pi_network_security_group_id = os.Getenv("PI_NETWORK_SECURITY_GROUP_ID")
1071+
if Pi_network_security_group_id == "" {
1072+
Pi_network_security_group_id = "terraform-test-power"
1073+
fmt.Println("[INFO] Set the environment variable PI_NETWORK_SECURITY_GROUP_ID for testing ibm_pi_network_security_group resource else it is set to default value 'terraform-test-power'")
1074+
}
1075+
1076+
Pi_network_security_group_rule_id = os.Getenv("PI_NETWORK_SECURITY_GROUP_RULE_ID")
1077+
if Pi_network_security_group_rule_id == "" {
1078+
Pi_network_security_group_rule_id = "terraform-test-power"
1079+
fmt.Println("[INFO] Set the environment variable PI_NETWORK_SECURITY_GROUP_RULE_ID for testing ibm_pi_network_security_group resource else it is set to default value 'terraform-test-power'")
1080+
}
1081+
10661082
Pi_volume_name = os.Getenv("PI_VOLUME_NAME")
10671083
if Pi_volume_name == "" {
10681084
Pi_volume_name = "terraform-test-power"
@@ -1152,21 +1168,37 @@ func init() {
11521168
Pi_placement_group_name = "tf-pi-placement-group"
11531169
fmt.Println("[WARN] Set the environment variable PI_PLACEMENT_GROUP_NAME for testing ibm_pi_placement_group resource else it is set to default value 'tf-pi-placement-group'")
11541170
}
1171+
1172+
Pi_remote_id = os.Getenv("PI_REMOTE_ID")
1173+
if Pi_remote_id == "" {
1174+
Pi_remote_id = "terraform-test-power"
1175+
fmt.Println("[WARN] Set the environment variable PI_REMOTE_ID for testing ibm_pi_network_security_group resource else it is set to default value 'terraform-test-power'")
1176+
}
1177+
1178+
Pi_remote_type = os.Getenv("PI_REMOTE_TYPE")
1179+
if Pi_remote_type == "" {
1180+
Pi_remote_type = "terraform-test-power"
1181+
fmt.Println("[WARN] Set the environment variable PI_REMOTE_TYPE for testing ibm_pi_network_security_group resource else it is set to default value 'terraform-test-power'")
1182+
}
1183+
11551184
Pi_spp_placement_group_id = os.Getenv("PI_SPP_PLACEMENT_GROUP_ID")
11561185
if Pi_spp_placement_group_id == "" {
11571186
Pi_spp_placement_group_id = "tf-pi-spp-placement-group"
11581187
fmt.Println("[WARN] Set the environment variable PI_SPP_PLACEMENT_GROUP_ID for testing ibm_pi_spp_placement_group resource else it is set to default value 'tf-pi-spp-placement-group'")
11591188
}
1189+
11601190
PiStoragePool = os.Getenv("PI_STORAGE_POOL")
11611191
if PiStoragePool == "" {
11621192
PiStoragePool = "terraform-test-power"
11631193
fmt.Println("[INFO] Set the environment variable PI_STORAGE_POOL for testing ibm_pi_storage_pool_capacity else it is set to default value 'terraform-test-power'")
11641194
}
1195+
11651196
PiStorageType = os.Getenv("PI_STORAGE_TYPE")
11661197
if PiStorageType == "" {
11671198
PiStorageType = "terraform-test-power"
11681199
fmt.Println("[INFO] Set the environment variable PI_STORAGE_TYPE for testing ibm_pi_storage_type_capacity else it is set to default value 'terraform-test-power'")
11691200
}
1201+
11701202
// Added for resource capture instance testing
11711203
Pi_capture_storage_image_path = os.Getenv("PI_CAPTURE_STORAGE_IMAGE_PATH")
11721204
if Pi_capture_storage_image_path == "" {

‎ibm/flex/structures.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,22 @@ func FlattenIntList(list []int) []interface{} {
127127
return vs
128128
}
129129

130+
func ExpandInt64List(input []interface{}) []int64 {
131+
vs := make([]int64, len(input))
132+
for i, v := range input {
133+
vs[i] = v.(int64)
134+
}
135+
return vs
136+
}
137+
138+
func FlattenInt64List(list []int64) []interface{} {
139+
vs := make([]interface{}, len(list))
140+
for i, v := range list {
141+
vs[i] = v
142+
}
143+
return vs
144+
}
145+
130146
func NewStringSet(f schema.SchemaSetFunc, in []string) *schema.Set {
131147
var out = make([]interface{}, len(in), len(in))
132148
for i, v := range in {

‎ibm/provider/provider.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,8 @@ func Provider() *schema.Provider {
654654
"ibm_pi_network_address_group": power.DataSourceIBMPINetworkAddressGroup(),
655655
"ibm_pi_network_address_groups": power.DataSourceIBMPINetworkAddressGroups(),
656656
"ibm_pi_network_port": power.DataSourceIBMPINetworkPort(),
657+
"ibm_pi_network_security_group": power.DataSourceIBMPINetworkSecurityGroup(),
658+
"ibm_pi_network_security_groups": power.DataSourceIBMPINetworkSecurityGroups(),
657659
"ibm_pi_network": power.DataSourceIBMPINetwork(),
658660
"ibm_pi_networks": power.DataSourceIBMPINetworks(),
659661
"ibm_pi_placement_group": power.DataSourceIBMPIPlacementGroup(),
@@ -1303,6 +1305,10 @@ func Provider() *schema.Provider {
13031305
"ibm_pi_network_address_group_member": power.ResourceIBMPINetworkAddressGroupMember(),
13041306
"ibm_pi_network_address_group": power.ResourceIBMPINetworkAddressGroup(),
13051307
"ibm_pi_network_port_attach": power.ResourceIBMPINetworkPortAttach(),
1308+
"ibm_pi_network_security_group_action": power.ResourceIBMPINetworkSecurityGroupAction(),
1309+
"ibm_pi_network_security_group_member": power.ResourceIBMPINetworkSecurityGroupMember(),
1310+
"ibm_pi_network_security_group_rule": power.ResourceIBMPINetworkSecurityGroupRule(),
1311+
"ibm_pi_network_security_group": power.ResourceIBMPINetworkSecurityGroup(),
13061312
"ibm_pi_network": power.ResourceIBMPINetwork(),
13071313
"ibm_pi_placement_group": power.ResourceIBMPIPlacementGroup(),
13081314
"ibm_pi_shared_processor_pool": power.ResourceIBMPISharedProcessorPool(),

0 commit comments

Comments
 (0)