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.

Sign up for GitHub

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

Jump to bottom

[VPC] Fix issue with wrong VIP ID setting #1282

Merged
merged 3 commits into from Aug 11, 2021
Merged

[VPC] Fix issue with wrong VIP ID setting #1282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3524866
Fix panic with d.Set("id", ...)
lego963 Aug 11, 2021
876e177
Minor changes
lego963 Aug 11, 2021
df44203
Add releasenote
lego963 Aug 11, 2021
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
45 changes: 22 additions & 23 deletions opentelekomcloud/services/vpc/resource_opentelekomcloud_networking_vip_v2.go
View file
Open in desktop
Expand Up @@ -62,34 +62,34 @@ func ResourceNetworkingVIPV2() *schema.Resource {

func resourceNetworkingVIPV2Create(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
config := meta.(*cfg.Config)
networkingClient, err := config.NetworkingV2Client(config.GetRegion(d))
client, err := config.NetworkingV2Client(config.GetRegion(d))
if err != nil {
return fmterr.Errorf("error creating OpenTelekomCloud networking client: %s", err)
return fmterr.Errorf(errCreationV2Client, err)
}

// Construct CreateOpts
fixip := make([]ports.IP, 1)
fixip[0] = ports.IP{
fixIp := make([]ports.IP, 1)
fixIp[0] = ports.IP{
SubnetID: d.Get("subnet_id").(string),
IPAddress: d.Get("ip_address").(string),
}
createOpts := ports.CreateOpts{
Name: d.Get("name").(string),
NetworkID: d.Get("network_id").(string),
FixedIPs: fixip,
FixedIPs: fixIp,
DeviceOwner: "neutron:VIP_PORT",
}

log.Printf("[DEBUG] Create Options: %#v", createOpts)
vip, err := ports.Create(networkingClient, createOpts).Extract()
vip, err := ports.Create(client, createOpts).Extract()
if err != nil {
return fmterr.Errorf("error creating OpenTelekomCloud Neutron network: %s", err)
}
log.Printf("[DEBUG] Waiting for OpenTelekomCloud Neutron VIP (%s) to become available.", vip.ID)

stateConf := &resource.StateChangeConf{
Target: []string{"ACTIVE"},
Refresh: waitForNetworkVIPActive(networkingClient, vip.ID),
Refresh: waitForNetworkVIPActive(client, vip.ID),
Timeout: d.Timeout(schema.TimeoutCreate),
Delay: 5 * time.Second,
MinTimeout: 3 * time.Second,
Expand All @@ -107,12 +107,12 @@ func resourceNetworkingVIPV2Create(ctx context.Context, d *schema.ResourceData,

func resourceNetworkingVIPV2Read(_ context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
config := meta.(*cfg.Config)
networkingClient, err := config.NetworkingV2Client(config.GetRegion(d))
client, err := config.NetworkingV2Client(config.GetRegion(d))
if err != nil {
return fmterr.Errorf("error creating OpenTelekomCloud networking client: %s", err)
return fmterr.Errorf(errCreationV2Client, err)
}

vip, err := ports.Get(networkingClient, d.Id()).Extract()
vip, err := ports.Get(client, d.Id()).Extract()
if err != nil {
return diag.FromErr(common.CheckDeleted(d, err, "vip"))
}
Expand All @@ -124,7 +124,6 @@ func resourceNetworkingVIPV2Read(_ context.Context, d *schema.ResourceData, meta
d.Set("network_id", vip.NetworkID),
d.Set("name", vip.Name),
d.Set("status", vip.Status),
d.Set("id", vip.ID),
d.Set("tenant_id", vip.TenantID),
d.Set("device_owner", vip.DeviceOwner),
)
Expand All @@ -148,15 +147,15 @@ func resourceNetworkingVIPV2Read(_ context.Context, d *schema.ResourceData, meta

func resourceNetworkingVIPV2Delete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
config := meta.(*cfg.Config)
networkingClient, err := config.NetworkingV2Client(config.GetRegion(d))
client, err := config.NetworkingV2Client(config.GetRegion(d))
if err != nil {
return fmterr.Errorf("error creating OpenTelekomCloud networking client: %s", err)
return fmterr.Errorf(errCreationV2Client, err)
}

stateConf := &resource.StateChangeConf{
Pending: []string{"ACTIVE"},
Target: []string{"DELETED"},
Refresh: waitForNetworkVIPDelete(networkingClient, d.Id()),
Refresh: waitForNetworkVIPDelete(client, d.Id()),
Timeout: d.Timeout(schema.TimeoutDelete),
Delay: 5 * time.Second,
MinTimeout: 3 * time.Second,
Expand All @@ -171,9 +170,9 @@ func resourceNetworkingVIPV2Delete(ctx context.Context, d *schema.ResourceData,
return nil
}

func waitForNetworkVIPActive(networkingClient *golangsdk.ServiceClient, vipid string) resource.StateRefreshFunc {
func waitForNetworkVIPActive(client *golangsdk.ServiceClient, vipID string) resource.StateRefreshFunc {
return func() (interface{}, string, error) {
p, err := ports.Get(networkingClient, vipid).Extract()
p, err := ports.Get(client, vipID).Extract()
if err != nil {
return nil, "", err
}
Expand All @@ -187,29 +186,29 @@ func waitForNetworkVIPActive(networkingClient *golangsdk.ServiceClient, vipid st
}
}

func waitForNetworkVIPDelete(networkingClient *golangsdk.ServiceClient, vipid string) resource.StateRefreshFunc {
func waitForNetworkVIPDelete(client *golangsdk.ServiceClient, vipID string) resource.StateRefreshFunc {
return func() (interface{}, string, error) {
log.Printf("[DEBUG] Attempting to delete OpenTelekomCloud Neutron VIP %s", vipid)
log.Printf("[DEBUG] Attempting to delete OpenTelekomCloud Neutron VIP %s", vipID)

p, err := ports.Get(networkingClient, vipid).Extract()
p, err := ports.Get(client, vipID).Extract()
if err != nil {
if _, ok := err.(golangsdk.ErrDefault404); ok {
log.Printf("[DEBUG] Successfully deleted OpenTelekomCloud VIP %s", vipid)
log.Printf("[DEBUG] Successfully deleted OpenTelekomCloud VIP %s", vipID)
return p, "DELETED", nil
}
return p, "ACTIVE", err
}

err = ports.Delete(networkingClient, vipid).ExtractErr()
err = ports.Delete(client, vipID).ExtractErr()
if err != nil {
if _, ok := err.(golangsdk.ErrDefault404); ok {
log.Printf("[DEBUG] Successfully deleted OpenTelekomCloud VIP %s", vipid)
log.Printf("[DEBUG] Successfully deleted OpenTelekomCloud VIP %s", vipID)
return p, "DELETED", nil
}
return p, "ACTIVE", err
}

log.Printf("[DEBUG] OpenTelekomCloud VIP %s still active.\n", vipid)
log.Printf("[DEBUG] OpenTelekomCloud VIP %s still active.\n", vipID)
return p, "ACTIVE", nil
}
}
4 changes: 4 additions & 0 deletions releasenotes/notes/nw-vip-setid-3440c576fe75267b.yaml
View file
Open in desktop
@@ -0,0 +1,4 @@
---
fixes:
- |
**[VPC]** Fix issue with setting ``id`` in ``resource/opentelekomcloud_networking_vip_v2`` (`#1282 <https://github.com/opentelekomcloud/terraform-provider-opentelekomcloud/pull/1282>`_)