Networking V2: add description to the floatingip resource (#534)

openstack/resource_openstack_networking_floatingip_v2.go

@@ -37,6 +37,10 @@ func resourceNetworkingFloatingIPV2() *schema.Resource {
 				Computed: true,
 				ForceNew: true,
 			},
+			"description": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"address": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -100,6 +104,7 @@ func resourceNetworkFloatingIPV2Create(d *schema.ResourceData, meta interface{})
 	createOpts := FloatingIPCreateOpts{
 		floatingips.CreateOpts{
 			FloatingNetworkID: poolID,
+			Description:       d.Get("description").(string),
 			FloatingIP:        d.Get("address").(string),
 			PortID:            d.Get("port_id").(string),
 			TenantID:          d.Get("tenant_id").(string),
@@ -157,6 +162,7 @@ func resourceNetworkFloatingIPV2Read(d *schema.ResourceData, meta interface{}) e
 		return CheckDeleted(d, err, "floating IP")
 	}
 
+	d.Set("description", floatingIP.Description)
 	d.Set("address", floatingIP.FloatingIP)
 	d.Set("port_id", floatingIP.PortID)
 	d.Set("fixed_ip", floatingIP.FixedIP)
@@ -180,12 +186,22 @@ func resourceNetworkFloatingIPV2Update(d *schema.ResourceData, meta interface{})
 		return fmt.Errorf("Error creating OpenStack network client: %s", err)
 	}
 
+	var hasChange bool
 	var updateOpts floatingips.UpdateOpts
 
+	if d.HasChange("description") {
+		hasChange = true
+		description := d.Get("description").(string)
+		updateOpts.Description = &description
+	}
+
 	if d.HasChange("port_id") {
+		hasChange = true
 		portID := d.Get("port_id").(string)
 		updateOpts.PortID = &portID
+	}
 
+	if hasChange {
 		log.Printf("[DEBUG] Update Options: %#v", updateOpts)
 		_, err = floatingips.Update(networkingClient, d.Id(), updateOpts).Extract()
 		if err != nil {

openstack/resource_openstack_networking_floatingip_v2_test.go

@@ -23,6 +23,7 @@ func TestAccNetworkingV2FloatingIP_basic(t *testing.T) {
 				Config: testAccNetworkingV2FloatingIP_basic,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckNetworkingV2FloatingIPExists("openstack_networking_floatingip_v2.fip_1", &fip),
+					resource.TestCheckResourceAttr("openstack_networking_floatingip_v2.fip_1", "description", "test floating IP"),
 				),
 			},
 		},
@@ -42,6 +43,7 @@ func TestAccNetworkingV2FloatingIP_fixedip_bind(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckNetworkingV2FloatingIPExists("openstack_networking_floatingip_v2.fip_1", &fip),
 					testAccCheckNetworkingV2FloatingIPBoundToCorrectIP(&fip, "192.168.199.20"),
+					resource.TestCheckResourceAttr("openstack_networking_floatingip_v2.fip_1", "description", ""),
 				),
 			},
 		},
@@ -153,6 +155,7 @@ func testAccCheckNetworkingV2InstanceFloatingIPAttach(
 
 const testAccNetworkingV2FloatingIP_basic = `
 resource "openstack_networking_floatingip_v2" "fip_1" {
+  description = "test floating IP"
 }
 `
 

website/docs/r/networking_floatingip_v2.html.markdown

@@ -31,6 +31,8 @@ The following arguments are supported:
     `region` argument of the provider is used. Changing this creates a new
     floating IP (which may or may not have a different address).
 
+* `description` - (Optional) Human-readable description for the floating IP.
+
 * `pool` - (Required) The name of the pool from which to obtain the floating
     IP. Changing this creates a new floating IP.
 
@@ -62,6 +64,7 @@ The following arguments are supported:
 The following attributes are exported:
 
 * `region` - See Argument Reference above.
+* `description` - See Argument Reference above.
 * `pool` - See Argument Reference above.
 * `address` - The actual floating IP address itself.
 * `port_id` - ID of associated port.