Skip to content

Commit 265aac5

Browse files
committed
feat(ppnlb): Fix test
1 parent 049caa5 commit 265aac5

File tree

3 files changed

+12
-47
lines changed

3 files changed

+12
-47
lines changed

common/github.com/IBM/vpc-go-sdk/vpcv1/vpc_v1.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30321,6 +30321,7 @@ func (vpc *VpcV1) CreateLoadBalancerPoolMemberWithContext(ctx context.Context, c
3032130321
builder.AddHeader("Content-Type", "application/json")
3032230322

3032330323
builder.AddQuery("version", fmt.Sprint(*vpc.Version))
30324+
builder.AddQuery("maturity", fmt.Sprint("development"))
3032430325
builder.AddQuery("generation", fmt.Sprint(*vpc.Generation))
3032530326

3032630327
body := make(map[string]interface{})
@@ -30733,6 +30734,8 @@ func (vpc *VpcV1) DeleteLoadBalancerPoolMemberWithContext(ctx context.Context, d
3073330734
}
3073430735

3073530736
builder.AddQuery("version", fmt.Sprint(*vpc.Version))
30737+
builder.AddQuery("maturity", fmt.Sprint("development"))
30738+
3073630739
builder.AddQuery("generation", fmt.Sprint(*vpc.Generation))
3073730740

3073830741
request, err := builder.Build()
@@ -31165,6 +31168,7 @@ func (vpc *VpcV1) GetLoadBalancerPoolMemberWithContext(ctx context.Context, getL
3116531168
builder.AddHeader("Accept", "application/json")
3116631169

3116731170
builder.AddQuery("version", fmt.Sprint(*vpc.Version))
31171+
builder.AddQuery("maturity", fmt.Sprint("development"))
3116831172
builder.AddQuery("generation", fmt.Sprint(*vpc.Generation))
3116931173

3117031174
request, err := builder.Build()
@@ -31891,6 +31895,7 @@ func (vpc *VpcV1) ReplaceLoadBalancerPoolMembersWithContext(ctx context.Context,
3189131895
builder.AddHeader("Content-Type", "application/json")
3189231896

3189331897
builder.AddQuery("version", fmt.Sprint(*vpc.Version))
31898+
builder.AddQuery("maturity", fmt.Sprint("development"))
3189431899
builder.AddQuery("generation", fmt.Sprint(*vpc.Generation))
3189531900

3189631901
body := make(map[string]interface{})
@@ -32384,6 +32389,7 @@ func (vpc *VpcV1) UpdateLoadBalancerPoolMemberWithContext(ctx context.Context, u
3238432389
builder.AddHeader("Content-Type", "application/merge-patch+json")
3238532390

3238632391
builder.AddQuery("version", fmt.Sprint(*vpc.Version))
32392+
builder.AddQuery("maturity", fmt.Sprint("development"))
3238732393
builder.AddQuery("generation", fmt.Sprint(*vpc.Generation))
3238832394

3238932395
_, err = builder.SetBodyContentJSON(updateLoadBalancerPoolMemberOptions.LoadBalancerPoolMemberPatch)

ibm/service/vpc/data_source_ibm_is_lb_profile.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@ func DataSourceIBMISLbProfile() *schema.Resource {
107107
},
108108
},
109109
},
110-
"reserved_ip_type": {
111-
Type: schema.TypeString,
112-
Computed: true,
113-
Description: "The Reserved IP Target support for a load balancer profile, one of [fixed, dependent]",
114-
},
115110
"route_mode_supported": {
116111
Type: schema.TypeBool,
117112
Computed: true,

ibm/service/vpc/resource_ibm_is_lb_pool_member_test.go

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -239,38 +239,21 @@ func TestAccIBMISLBPoolMember_basic_network_target_reservedIP(t *testing.T) {
239239
nlbPoolName := fmt.Sprintf("tfnlbpoolc%d", acctest.RandIntRange(10, 100))
240240

241241
nlbName := fmt.Sprintf("tfnlbcreate%d", acctest.RandIntRange(10, 100))
242-
nlbName1 := fmt.Sprintf("tfnlbupdate%d", acctest.RandIntRange(10, 100))
243242

244-
sshname := "terraform-test-ssh-key"
245-
vsiName := fmt.Sprintf("tf-instance-%d", acctest.RandIntRange(10, 100))
246-
publicKey := strings.TrimSpace(`
247-
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVERRN7/9484SOBJ3HSKxxNG5JN8owAjy5f9yYwcUg+JaUVuytn5Pv3aeYROHGGg+5G346xaq3DAwX6Y5ykr2fvjObgncQBnuU5KHWCECO/4h8uWuwh/kfniXPVjFToc+gnkqA+3RKpAecZhFXwfalQ9mMuYGFxn+fwn8cYEApsJbsEmb0iJwPiZ5hjFC8wREuiTlhPHDgkBLOiycd20op2nXzDbHfCHInquEe/gYxEitALONxm0swBOwJZwlTDOB7C6y2dzlrtxr1L59m7pCkWI4EtTRLvleehBoj3u7jB4usR
248-
`)
249243
resource.Test(t, resource.TestCase{
250244
PreCheck: func() { acc.TestAccPreCheck(t) },
251245
Providers: acc.TestAccProviders,
252246
CheckDestroy: testAccCheckIBMISLBPoolMemberDestroy,
253247
Steps: []resource.TestStep{
254248
{
255249
Config: testAccCheckIBMISLBPoolMemberIDConfigWithReservedIPTarget(
256-
vpcname, subnetname, resIpSubnetName, acc.ISZoneName, acc.ISCIDR, sshname, publicKey, acc.IsImageName,
257-
vsiName, nlbName, nlbPoolName),
250+
vpcname, subnetname, acc.ISZoneName, acc.ISCIDR, resIpSubnetName, nlbName, nlbPoolName),
258251
Check: resource.ComposeTestCheckFunc(
259252
testAccCheckIBMISLBPoolMemberExists("ibm_is_lb_pool_member.testacc_nlb_mem", lb),
260253
resource.TestCheckResourceAttr(
261254
"ibm_is_lb_pool_member.testacc_nlb_mem", "weight", "20"),
262255
),
263256
},
264-
{
265-
Config: testAccCheckIBMISLBPoolMemberIDConfigWithReservedIPTarget(
266-
vpcname, subnetname, resIpSubnetName, acc.ISZoneName, acc.ISCIDR, sshname, publicKey, acc.IsImageName,
267-
vsiName, nlbName1, nlbPoolName),
268-
Check: resource.ComposeTestCheckFunc(
269-
testAccCheckIBMISLBPoolMemberExists("ibm_is_lb_pool_member.testacc_nlb_mem", lb),
270-
resource.TestCheckResourceAttr(
271-
"ibm_is_lb_pool_member.testacc_nlb_mem", "port", "8080"),
272-
),
273-
},
274257
},
275258
})
276259
}
@@ -589,8 +572,7 @@ func testAccCheckIBMISLBPoolMemberIDConfigWithLBTarget(vpcname, subnetname, zone
589572
`, vpcname, subnetname, zone, cidr, albName, nlbName, nlbPoolName)
590573
}
591574

592-
func testAccCheckIBMISLBPoolMemberIDConfigWithReservedIPTarget(vpcname, subnetname, resIpSubnetName, zone, cidr, sshname, publickey,
593-
isImageName, vsiName, nlbName, nlbPoolName string) string {
575+
func testAccCheckIBMISLBPoolMemberIDConfigWithReservedIPTarget(vpcname, subnetname, zone, cidr, resIpSubnetName, nlbName, nlbPoolName string) string {
594576
return fmt.Sprintf(`
595577
resource "ibm_is_vpc" "testacc_vpc" {
596578
name = "%s"
@@ -605,28 +587,11 @@ func testAccCheckIBMISLBPoolMemberIDConfigWithReservedIPTarget(vpcname, subnetna
605587
subnet = ibm_is_subnet.testacc_subnet.id
606588
name = "%s"
607589
}
608-
resource "ibm_is_ssh_key" "testacc_sshkey" {
609-
name = "%s"
610-
public_key = "%s"
611-
}
612-
data "ibm_is_image" "ds_image" {
613-
name = "%s"
614-
}
615-
resource "ibm_is_instance" "testacc_instance" {
616-
name = "%s"
617-
image = data.ibm_is_image.ds_image.id
618-
profile = "%s"
619-
primary_network_interface {
620-
subnet = ibm_is_subnet.testacc_subnet.id
621-
}
622-
vpc = ibm_is_vpc.testacc_vpc.id
623-
zone = "%s"
624-
keys = [ibm_is_ssh_key.testacc_sshkey.id]
625-
}
626590
resource "ibm_is_lb" "testacc_NLB" {
627591
name = "%s"
628592
subnets = ["${ibm_is_subnet.testacc_subnet.id}"]
629-
profile = "network-fixed"
593+
profile = "network-private-path"
594+
type = "private_path"
630595
}
631596
resource "ibm_is_lb_pool" "testacc_nlb_pool" {
632597
name = "%s"
@@ -643,8 +608,7 @@ func testAccCheckIBMISLBPoolMemberIDConfigWithReservedIPTarget(vpcname, subnetna
643608
pool = "${element(split("/",ibm_is_lb_pool.testacc_nlb_pool.id),1)}"
644609
port = 8080
645610
weight = 20
646-
target_id = "${ibm_is_subnet_reserved_ip.testacc_subnet.id}"
611+
target_id = "${element(split("/",ibm_is_subnet_reserved_ip.testacc_rip.id),1)}"
647612
}
648-
`, vpcname, subnetname, resIpSubnetName, zone, cidr, sshname, publickey, isImageName, vsiName,
649-
acc.InstanceProfileName, zone, nlbName, nlbPoolName)
613+
`, vpcname, subnetname, zone, cidr, resIpSubnetName, nlbName, nlbPoolName)
650614
}

0 commit comments

Comments
 (0)