From 1c6b69e342b2def6cb15eb3f7e43eef535918a9e Mon Sep 17 00:00:00 2001 From: Joe Topjian Date: Sun, 16 Oct 2016 18:54:36 +0000 Subject: [PATCH] provider/openstack: gophercloud migration: Make PortID a *string --- builtin/providers/openstack/resource_openstack_lb_vip_v1.go | 5 +++-- .../openstack/resource_openstack_networking_floatingip_v2.go | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/builtin/providers/openstack/resource_openstack_lb_vip_v1.go b/builtin/providers/openstack/resource_openstack_lb_vip_v1.go index 06fda190de..d22bf68b0f 100644 --- a/builtin/providers/openstack/resource_openstack_lb_vip_v1.go +++ b/builtin/providers/openstack/resource_openstack_lb_vip_v1.go @@ -244,8 +244,9 @@ func resourceLBVipV1Update(d *schema.ResourceData, meta interface{}) error { // If a floating IP is found we unassign it if len(fips) == 1 { + portID := "" updateOpts := floatingips.UpdateOpts{ - PortID: "", + PortID: &portID, } if err = floatingips.Update(networkingClient, fips[0].ID, updateOpts).Err; err != nil { return err @@ -338,7 +339,7 @@ func lbVipV1AssignFloatingIP(floatingIP, portID string, networkingClient *gopher } updateOpts := floatingips.UpdateOpts{ - PortID: portID, + PortID: &portID, } if err = floatingips.Update(networkingClient, fips[0].ID, updateOpts).Err; err != nil { return err diff --git a/builtin/providers/openstack/resource_openstack_networking_floatingip_v2.go b/builtin/providers/openstack/resource_openstack_networking_floatingip_v2.go index 02c3f79264..429aab162b 100644 --- a/builtin/providers/openstack/resource_openstack_networking_floatingip_v2.go +++ b/builtin/providers/openstack/resource_openstack_networking_floatingip_v2.go @@ -139,7 +139,8 @@ func resourceNetworkFloatingIPV2Update(d *schema.ResourceData, meta interface{}) var updateOpts floatingips.UpdateOpts if d.HasChange("port_id") { - updateOpts.PortID = d.Get("port_id").(string) + portID := d.Get("port_id").(string) + updateOpts.PortID = &portID } log.Printf("[DEBUG] Update Options: %#v", updateOpts)