Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ELB]: opentelekomcloud_lb_member_v3 zero weight fix #2432

Merged
merged 2 commits into from Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -51,6 +51,39 @@ func TestLBMemberV3_basic(t *testing.T) {
})
}

func TestLBMemberV3_ZeroWeight(t *testing.T) {
var member members.Member
t.Parallel()
qts := []*quotas.ExpectedQuota{
{Q: quotas.LbPool, Count: 1},
{Q: quotas.LoadBalancer, Count: 1},
}
quotas.BookMany(t, qts)

resource.Test(t, resource.TestCase{
PreCheck: func() { common.TestAccPreCheck(t) },
ProviderFactories: common.TestAccProviderFactories,
CheckDestroy: testLBMemberDestroy,
Steps: []resource.TestStep{
{
Config: testLBMemberV3ZeroWeight,
Check: resource.ComposeTestCheckFunc(
testLBMemberV3Exists(resourceMemberName, &member),
resource.TestCheckResourceAttr(resourceMemberName, "name", "member-1"),
resource.TestCheckResourceAttr(resourceMemberName, "weight", "0"),
),
},
{
Config: testLBMemberV3Basic,
Check: resource.ComposeTestCheckFunc(
testLBMemberV3Exists(resourceMemberName, &member),
resource.TestCheckResourceAttr(resourceMemberName, "weight", "0"),
),
},
},
})
}

func TestLBMemberV3_import(t *testing.T) {
t.Parallel()
qts := []*quotas.ExpectedQuota{
Expand Down Expand Up @@ -185,3 +218,31 @@ resource "opentelekomcloud_lb_member_v3" "member" {
weight = 0
}
`, common.DataSourceSubnet, env.OS_AVAILABILITY_ZONE)

var testLBMemberV3ZeroWeight = fmt.Sprintf(`
%s

resource "opentelekomcloud_lb_loadbalancer_v3" "lb" {
name = "loadbalancer_1"
router_id = data.opentelekomcloud_vpc_subnet_v1.shared_subnet.vpc_id
network_ids = [data.opentelekomcloud_vpc_subnet_v1.shared_subnet.network_id]

ip_target_enable = true

availability_zones = ["%s"]
}

resource "opentelekomcloud_lb_pool_v3" "pool" {
loadbalancer_id = opentelekomcloud_lb_loadbalancer_v3.lb.id
lb_algorithm = "ROUND_ROBIN"
protocol = "TCP"
}

resource "opentelekomcloud_lb_member_v3" "member" {
name = "member-1"
pool_id = opentelekomcloud_lb_pool_v3.pool.id
address = cidrhost(data.opentelekomcloud_vpc_subnet_v1.shared_subnet.cidr, 3)
protocol_port = 8080
weight = 0
}
`, common.DataSourceSubnet, env.OS_AVAILABILITY_ZONE)
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
golangsdk "github.com/opentelekomcloud/gophertelekomcloud"
"github.com/opentelekomcloud/gophertelekomcloud/openstack/common/pointerto"
"github.com/opentelekomcloud/gophertelekomcloud/openstack/elb/v3/members"
"github.com/opentelekomcloud/terraform-provider-opentelekomcloud/opentelekomcloud/common"
"github.com/opentelekomcloud/terraform-provider-opentelekomcloud/opentelekomcloud/common/cfg"
Expand Down Expand Up @@ -96,10 +97,12 @@ func resourceLBMemberV3Create(ctx context.Context, d *schema.ResourceData, meta
ProjectID: d.Get("project_id").(string),
SubnetID: d.Get("subnet_id").(string),
}
if w, ok := d.GetOk("weight"); ok {
weight := w.(int)
opts.Weight = &weight

weight := common.CheckNull("weight", d)
if !weight {
opts.Weight = pointerto.Int(d.Get("weight").(int))
}

member, err := members.Create(client, poolID(d), opts).Extract()
if err != nil {
return fmterr.Errorf("error creating LB pool member v3: %w", err)
Expand Down
@@ -0,0 +1,4 @@
---
fixes:
- |
**[ELB]** Fix zero ``weight`` assignment of ``resource/opentelekomcloud_lb_member_v3`` (`#2432 <https://github.com/opentelekomcloud/terraform-provider-opentelekomcloud/pull/2432>`_)