unassign floating IP prior to removal

ecloud/resource_instance.go

@@ -537,9 +537,31 @@ func resourceInstanceDelete(d *schema.ResourceData, meta interface{}) error {
 	//remove floating ip if set
 	if len(d.Get("floating_ip_id").(string)) > 1 {
 		fip := d.Get("floating_ip_id").(string)
+
+		log.Printf("[DEBUG] Unassigning floating ip with ID [%s]", fip)
+
+		taskID, err := service.UnassignFloatingIP(fip)
+		if err != nil {
+			switch err.(type) {
+			case *ecloudservice.FloatingIPNotFoundError:
+				log.Printf("[DEBUG] Floating IP with ID [%s] not found. Skipping unassign.", fip)
+			default:
+				return fmt.Errorf("Error unassigning floating ip with ID [%s]: %s", fip, err)
+			}
+		}
+
+		_, err = waitForResourceState(
+			ecloudservice.TaskStatusComplete.String(),
+			TaskStatusRefreshFunc(service, taskID),
+			d.Timeout(schema.TimeoutDelete),
+		)
+		if err != nil {
+			return fmt.Errorf("Error waiting for floating ip with ID [%s] to be unassigned: %w", d.Id(), err)
+		}
+
 		log.Printf("[DEBUG] Removing floating ip with ID [%s]", fip)
 
-		taskID, err := service.DeleteFloatingIP(fip)
+		taskID, err = service.DeleteFloatingIP(fip)
 		if err != nil {
 			switch err.(type) {
 			case *ecloudservice.FloatingIPNotFoundError: