provider/openstack: openstack_compute_floatingip_associate_v2 resource (#12190)

This commit adds the openstack_compute_floatingip_associate_v2
resource which specifically handles associating a floating IP
address to an instance. This can be used instead of the existing
floating_ip options in the openstack_compute_instance_v2 resource.
This commit is contained in:
Joe Topjian 2017-03-01 22:18:57 -07:00 committed by Paul Stack
parent bb7b6d1088
commit 1dba855daf
6 changed files with 616 additions and 32 deletions

View File

@ -0,0 +1,28 @@
package openstack
import (
"testing"
"github.com/hashicorp/terraform/helper/resource"
)
func TestAccOpenStackComputeV2FloatingIPAssociate_importBasic(t *testing.T) {
resourceName := "openstack_compute_floatingip_associate_v2.fip_1"
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeV2FloatingIPAssociateDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccComputeV2FloatingIPAssociate_basic,
},
resource.TestStep{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

View File

@ -147,6 +147,7 @@ func Provider() terraform.ResourceProvider {
"openstack_compute_secgroup_v2": resourceComputeSecGroupV2(),
"openstack_compute_servergroup_v2": resourceComputeServerGroupV2(),
"openstack_compute_floatingip_v2": resourceComputeFloatingIPV2(),
"openstack_compute_floatingip_associate_v2": resourceComputeFloatingIPAssociateV2(),
"openstack_compute_volume_attach_v2": resourceComputeVolumeAttachV2(),
"openstack_fw_firewall_v1": resourceFWFirewallV1(),
"openstack_fw_policy_v1": resourceFWPolicyV1(),

View File

@ -0,0 +1,130 @@
package openstack
import (
"fmt"
"log"
"strings"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
"github.com/hashicorp/terraform/helper/schema"
)
func resourceComputeFloatingIPAssociateV2() *schema.Resource {
return &schema.Resource{
Create: resourceComputeFloatingIPAssociateV2Create,
Read: resourceComputeFloatingIPAssociateV2Read,
Delete: resourceComputeFloatingIPAssociateV2Delete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},
Schema: map[string]*schema.Schema{
"region": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
DefaultFunc: schema.EnvDefaultFunc("OS_REGION_NAME", ""),
},
"floating_ip": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"instance_id": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"fixed_ip": &schema.Schema{
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
},
}
}
func resourceComputeFloatingIPAssociateV2Create(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
computeClient, err := config.computeV2Client(GetRegion(d))
if err != nil {
return fmt.Errorf("Error creating OpenStack compute client: %s", err)
}
floatingIP := d.Get("floating_ip").(string)
fixedIP := d.Get("fixed_ip").(string)
instanceId := d.Get("instance_id").(string)
associateOpts := floatingips.AssociateOpts{
FloatingIP: floatingIP,
FixedIP: fixedIP,
}
log.Printf("[DEBUG] Associate Options: %#v", associateOpts)
err = floatingips.AssociateInstance(computeClient, instanceId, associateOpts).ExtractErr()
if err != nil {
return fmt.Errorf("Error associating Floating IP: %s", err)
}
// There's an API call to get this information, but it has been
// deprecated. The Neutron API could be used, but I'm trying not
// to mix service APIs. Therefore, a faux ID will be used.
id := fmt.Sprintf("%s/%s/%s", floatingIP, instanceId, fixedIP)
d.SetId(id)
// This API call is synchronous, so Create won't return until the IP
// is attached. No need to wait for a state.
return resourceComputeFloatingIPAssociateV2Read(d, meta)
}
func resourceComputeFloatingIPAssociateV2Read(d *schema.ResourceData, meta interface{}) error {
// Obtain relevant info from parsing the ID
floatingIP, instanceId, fixedIP, err := parseComputeFloatingIPAssociateId(d.Id())
if err != nil {
return err
}
d.Set("floating_ip", floatingIP)
d.Set("instance_id", instanceId)
d.Set("fixed_ip", fixedIP)
d.Set("region", GetRegion(d))
return nil
}
func resourceComputeFloatingIPAssociateV2Delete(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
computeClient, err := config.computeV2Client(GetRegion(d))
if err != nil {
return fmt.Errorf("Error creating OpenStack compute client: %s", err)
}
floatingIP := d.Get("floating_ip").(string)
instanceId := d.Get("instance_id").(string)
disassociateOpts := floatingips.DisassociateOpts{
FloatingIP: floatingIP,
}
log.Printf("[DEBUG] Disssociate Options: %#v", disassociateOpts)
err = floatingips.DisassociateInstance(computeClient, instanceId, disassociateOpts).ExtractErr()
if err != nil {
return fmt.Errorf("Error disassociating floating IP: %s", err)
}
return nil
}
func parseComputeFloatingIPAssociateId(id string) (string, string, string, error) {
idParts := strings.Split(id, "/")
if len(idParts) < 3 {
return "", "", "", fmt.Errorf("Unable to determine floating ip association ID")
}
floatingIP := idParts[0]
instanceId := idParts[1]
fixedIP := idParts[2]
return floatingIP, instanceId, fixedIP, nil
}

View File

@ -0,0 +1,324 @@
package openstack
import (
"fmt"
"testing"
"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
func TestAccComputeV2FloatingIPAssociate_basic(t *testing.T) {
var instance servers.Server
var fip floatingips.FloatingIP
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeV2FloatingIPAssociateDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccComputeV2FloatingIPAssociate_basic,
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeV2InstanceExists("openstack_compute_instance_v2.instance_1", &instance),
testAccCheckNetworkingV2FloatingIPExists("openstack_networking_floatingip_v2.fip_1", &fip),
testAccCheckComputeV2FloatingIPAssociateAssociated(&fip, &instance, 1),
),
},
},
})
}
func TestAccComputeV2FloatingIPAssociate_fixedIP(t *testing.T) {
var instance servers.Server
var fip floatingips.FloatingIP
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeV2FloatingIPAssociateDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccComputeV2FloatingIPAssociate_fixedIP,
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeV2InstanceExists("openstack_compute_instance_v2.instance_1", &instance),
testAccCheckNetworkingV2FloatingIPExists("openstack_networking_floatingip_v2.fip_1", &fip),
testAccCheckComputeV2FloatingIPAssociateAssociated(&fip, &instance, 1),
),
},
},
})
}
func TestAccComputeV2FloatingIPAssociate_attachToFirstNetwork(t *testing.T) {
var instance servers.Server
var fip floatingips.FloatingIP
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeV2FloatingIPAssociateDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccComputeV2FloatingIPAssociate_attachToFirstNetwork,
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeV2InstanceExists("openstack_compute_instance_v2.instance_1", &instance),
testAccCheckNetworkingV2FloatingIPExists("openstack_networking_floatingip_v2.fip_1", &fip),
testAccCheckComputeV2FloatingIPAssociateAssociated(&fip, &instance, 1),
),
},
},
})
}
func TestAccComputeV2FloatingIPAssociate_attachToSecondNetwork(t *testing.T) {
var instance servers.Server
var fip floatingips.FloatingIP
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeV2FloatingIPAssociateDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccComputeV2FloatingIPAssociate_attachToSecondNetwork,
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeV2InstanceExists("openstack_compute_instance_v2.instance_1", &instance),
testAccCheckNetworkingV2FloatingIPExists("openstack_networking_floatingip_v2.fip_1", &fip),
testAccCheckComputeV2FloatingIPAssociateAssociated(&fip, &instance, 2),
),
},
},
})
}
func TestAccComputeV2FloatingIPAssociate_attachNew(t *testing.T) {
var instance servers.Server
var fip_1 floatingips.FloatingIP
var fip_2 floatingips.FloatingIP
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeV2FloatingIPAssociateDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccComputeV2FloatingIPAssociate_attachNew_1,
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeV2InstanceExists("openstack_compute_instance_v2.instance_1", &instance),
testAccCheckNetworkingV2FloatingIPExists("openstack_networking_floatingip_v2.fip_1", &fip_1),
testAccCheckNetworkingV2FloatingIPExists("openstack_networking_floatingip_v2.fip_2", &fip_2),
testAccCheckComputeV2FloatingIPAssociateAssociated(&fip_1, &instance, 1),
),
},
resource.TestStep{
Config: testAccComputeV2FloatingIPAssociate_attachNew_2,
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeV2InstanceExists("openstack_compute_instance_v2.instance_1", &instance),
testAccCheckNetworkingV2FloatingIPExists("openstack_networking_floatingip_v2.fip_1", &fip_1),
testAccCheckNetworkingV2FloatingIPExists("openstack_networking_floatingip_v2.fip_2", &fip_2),
testAccCheckComputeV2FloatingIPAssociateAssociated(&fip_2, &instance, 1),
),
},
},
})
}
func testAccCheckComputeV2FloatingIPAssociateDestroy(s *terraform.State) error {
config := testAccProvider.Meta().(*Config)
computeClient, err := config.computeV2Client(OS_REGION_NAME)
if err != nil {
return fmt.Errorf("Error creating OpenStack compute client: %s", err)
}
for _, rs := range s.RootModule().Resources {
if rs.Type != "openstack_compute_floatingip_associate_v2" {
continue
}
floatingIP, instanceId, _, err := parseComputeFloatingIPAssociateId(rs.Primary.ID)
if err != nil {
return err
}
instance, err := servers.Get(computeClient, instanceId).Extract()
if err != nil {
// If the error is a 404, then the instance does not exist,
// and therefore the floating IP cannot be associated to it.
if _, ok := err.(gophercloud.ErrDefault404); ok {
return nil
}
return err
}
// But if the instance still exists, then walk through its known addresses
// and see if there's a floating IP.
for _, networkAddresses := range instance.Addresses {
for _, element := range networkAddresses.([]interface{}) {
address := element.(map[string]interface{})
if address["OS-EXT-IPS:type"] == "floating" {
return fmt.Errorf("Floating IP %s is still attached to instance %s", floatingIP, instanceId)
}
}
}
}
return nil
}
func testAccCheckComputeV2FloatingIPAssociateAssociated(
fip *floatingips.FloatingIP, instance *servers.Server, n int) resource.TestCheckFunc {
return func(s *terraform.State) error {
config := testAccProvider.Meta().(*Config)
computeClient, err := config.computeV2Client(OS_REGION_NAME)
newInstance, err := servers.Get(computeClient, instance.ID).Extract()
if err != nil {
return err
}
// Walk through the instance's addresses and find the match
i := 0
for _, networkAddresses := range newInstance.Addresses {
i += 1
if i != n {
continue
}
for _, element := range networkAddresses.([]interface{}) {
address := element.(map[string]interface{})
if address["OS-EXT-IPS:type"] == "floating" && address["addr"] == fip.FloatingIP {
return nil
}
}
}
return fmt.Errorf("Floating IP %s was not attached to instance %s", fip.FloatingIP, instance.ID)
}
}
const testAccComputeV2FloatingIPAssociate_basic = `
resource "openstack_compute_instance_v2" "instance_1" {
name = "instance_1"
security_groups = ["default"]
}
resource "openstack_networking_floatingip_v2" "fip_1" {
}
resource "openstack_compute_floatingip_associate_v2" "fip_1" {
floating_ip = "${openstack_networking_floatingip_v2.fip_1.address}"
instance_id = "${openstack_compute_instance_v2.instance_1.id}"
}
`
const testAccComputeV2FloatingIPAssociate_fixedIP = `
resource "openstack_compute_instance_v2" "instance_1" {
name = "instance_1"
security_groups = ["default"]
}
resource "openstack_networking_floatingip_v2" "fip_1" {
}
resource "openstack_compute_floatingip_associate_v2" "fip_1" {
floating_ip = "${openstack_networking_floatingip_v2.fip_1.address}"
instance_id = "${openstack_compute_instance_v2.instance_1.id}"
fixed_ip = "${openstack_compute_instance_v2.instance_1.access_ip_v4}"
}
`
var testAccComputeV2FloatingIPAssociate_attachToFirstNetwork = fmt.Sprintf(`
resource "openstack_compute_instance_v2" "instance_1" {
name = "instance_1"
security_groups = ["default"]
network {
uuid = "%s"
}
}
resource "openstack_networking_floatingip_v2" "fip_1" {
}
resource "openstack_compute_floatingip_associate_v2" "fip_1" {
floating_ip = "${openstack_networking_floatingip_v2.fip_1.address}"
instance_id = "${openstack_compute_instance_v2.instance_1.id}"
fixed_ip = "${openstack_compute_instance_v2.instance_1.network.0.fixed_ip_v4}"
}
`, OS_NETWORK_ID)
var testAccComputeV2FloatingIPAssociate_attachToSecondNetwork = fmt.Sprintf(`
resource "openstack_networking_network_v2" "network_1" {
name = "network_1"
}
resource "openstack_networking_subnet_v2" "subnet_1" {
name = "subnet_1"
network_id = "${openstack_networking_network_v2.network_1.id}"
cidr = "192.168.1.0/24"
ip_version = 4
enable_dhcp = true
no_gateway = true
}
resource "openstack_compute_instance_v2" "instance_1" {
name = "instance_1"
security_groups = ["default"]
network {
uuid = "${openstack_networking_network_v2.network_1.id}"
}
network {
uuid = "%s"
}
}
resource "openstack_networking_floatingip_v2" "fip_1" {
}
resource "openstack_compute_floatingip_associate_v2" "fip_1" {
floating_ip = "${openstack_networking_floatingip_v2.fip_1.address}"
instance_id = "${openstack_compute_instance_v2.instance_1.id}"
fixed_ip = "${openstack_compute_instance_v2.instance_1.network.1.fixed_ip_v4}"
}
`, OS_NETWORK_ID)
const testAccComputeV2FloatingIPAssociate_attachNew_1 = `
resource "openstack_compute_instance_v2" "instance_1" {
name = "instance_1"
security_groups = ["default"]
}
resource "openstack_networking_floatingip_v2" "fip_1" {
}
resource "openstack_networking_floatingip_v2" "fip_2" {
}
resource "openstack_compute_floatingip_associate_v2" "fip_1" {
floating_ip = "${openstack_networking_floatingip_v2.fip_1.address}"
instance_id = "${openstack_compute_instance_v2.instance_1.id}"
}
`
const testAccComputeV2FloatingIPAssociate_attachNew_2 = `
resource "openstack_compute_instance_v2" "instance_1" {
name = "instance_1"
security_groups = ["default"]
}
resource "openstack_networking_floatingip_v2" "fip_1" {
}
resource "openstack_networking_floatingip_v2" "fip_2" {
}
resource "openstack_compute_floatingip_associate_v2" "fip_1" {
floating_ip = "${openstack_networking_floatingip_v2.fip_2.address}"
instance_id = "${openstack_compute_instance_v2.instance_1.id}"
}
`

View File

@ -0,0 +1,98 @@
---
layout: "openstack"
page_title: "OpenStack: openstack_compute_floatingip_associate_v2"
sidebar_current: "docs-openstack-resource-compute-floatingip-associate-v2"
description: |-
Associate a floating IP to an instance
---
# openstack\_compute\_floatingip_associate_v2
Associate a floating IP to an instance. This can be used instead of the
`floating_ip` options in `openstack_compute_instance_v2`.
## Example Usage
### Automatically detect the correct network
```
resource "openstack_compute_instance_v2" "instance_1" {
name = "instance_1"
image_id = "ad091b52-742f-469e-8f3c-fd81cadf0743"
flavor_id = 3
key_pair = "my_key_pair_name"
security_groups = ["default"]
}
resource "openstack_networking_floatingip_v2" "fip_1" {
pool = "my_pool"
}
resource "openstack_compute_floatingip_associate_v2" "fip_1" {
floating_ip = "${openstack_networking_floatingip_v2.fip_1.address}"
instance_id = "${openstack_compute_instance_v2.instance_1.id}"
}
```
### Explicitly set the network to attach to
```
resource "openstack_compute_instance_v2" "instance_1" {
name = "instance_1"
image_id = "ad091b52-742f-469e-8f3c-fd81cadf0743"
flavor_id = 3
key_pair = "my_key_pair_name"
security_groups = ["default"]
network {
name = "my_network"
}
network {
name = "default"
}
}
resource "openstack_networking_floatingip_v2" "fip_1" {
pool = "my_pool"
}
resource "openstack_compute_floatingip_associate_v2" "fip_1" {
floating_ip = "${openstack_networking_floatingip_v2.fip_1.address}"
instance_id = "${openstack_compute_instance_v2.instance_1.id}"
fixed_ip = "${openstack_compute_instance_v2.instance_1.network.1.fixed_ip_v4}"
}
```
## Argument Reference
The following arguments are supported:
* `region` - (Required) The region in which to obtain the V2 Compute client.
Keypairs are associated with accounts, but a Compute client is needed to
create one. If omitted, the `OS_REGION_NAME` environment variable is used.
Changing this creates a new floatingip_associate.
* `floating_ip` - (Required) The floating IP to associate.
* `instance_id` - (Required) The instance to associte the floating IP with.
* `fixed_ip` - (Optional) The specific IP address to direct traffic to.
## Attributes Reference
The following attributes are exported:
* `region` - See Argument Reference above.
* `floating_ip` - See Argument Reference above.
* `instance_id` - See Argument Reference above.
* `fixed_ip` - See Argument Reference above.
## Import
This resource can be imported by specifying all three arguments, separated
by a forward slash:
```
$ terraform import openstack_compute_floatingip_associate_v2.fip_1 <floating_ip>/<instance_id>/<fixed_ip>
```

View File

@ -40,6 +40,9 @@
<li<%= sidebar_current("docs-openstack-resource-compute-floatingip-v2") %>>
<a href="/docs/providers/openstack/r/compute_floatingip_v2.html">openstack_compute_floatingip_v2</a>
</li>
<li<%= sidebar_current("docs-openstack-resource-compute-floatingip-associate-v2") %>>
<a href="/docs/providers/openstack/r/compute_floatingip_associate_v2.html">openstack_compute_floatingip_associate_v2</a>
</li>
<li<%= sidebar_current("docs-openstack-resource-compute-instance-v2") %>>
<a href="/docs/providers/openstack/r/compute_instance_v2.html">openstack_compute_instance_v2</a>
</li>