ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/openstack: gophercloud migration: compute floatingip

This commit is contained in:
Joe Topjian 2016-09-04 02:52:58 +00:00
parent bb8c5cea2d
commit c8aee9118f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/providers/openstack/resource_openstack_compute_floatingip_v2.go
View File

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"log" "log"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip"
) )
func resourceComputeFloatingIPV2() *schema.Resource { func resourceComputeFloatingIPV2() *schema.Resource {
@ -58,11 +58,11 @@ func resourceComputeFloatingIPV2Create(d *schema.ResourceData, meta interface{})
return fmt.Errorf("Error creating OpenStack compute client: %s", err) return fmt.Errorf("Error creating OpenStack compute client: %s", err)
} }
createOpts := &floatingip.CreateOpts{ createOpts := &floatingips.CreateOpts{
Pool: d.Get("pool").(string), Pool: d.Get("pool").(string),
} }
log.Printf("[DEBUG] Create Options: %#v", createOpts) log.Printf("[DEBUG] Create Options: %#v", createOpts)
newFip, err := floatingip.Create(computeClient, createOpts).Extract() newFip, err := floatingips.Create(computeClient, createOpts).Extract()
if err != nil { if err != nil {
return fmt.Errorf("Error creating Floating IP: %s", err) return fmt.Errorf("Error creating Floating IP: %s", err)
} }
@ -79,7 +79,7 @@ func resourceComputeFloatingIPV2Read(d *schema.ResourceData, meta interface{}) e
return fmt.Errorf("Error creating OpenStack compute client: %s", err) return fmt.Errorf("Error creating OpenStack compute client: %s", err)
} }
fip, err := floatingip.Get(computeClient, d.Id()).Extract() fip, err := floatingips.Get(computeClient, d.Id()).Extract()
if err != nil { if err != nil {
return CheckDeleted(d, err, "floating ip") return CheckDeleted(d, err, "floating ip")
} }
@ -102,7 +102,7 @@ func resourceComputeFloatingIPV2Delete(d *schema.ResourceData, meta interface{})
} }
log.Printf("[DEBUG] Deleting Floating IP %s", d.Id()) log.Printf("[DEBUG] Deleting Floating IP %s", d.Id())
if err := floatingip.Delete(computeClient, d.Id()).ExtractErr(); err != nil { if err := floatingips.Delete(computeClient, d.Id()).ExtractErr(); err != nil {
return fmt.Errorf("Error deleting Floating IP: %s", err) return fmt.Errorf("Error deleting Floating IP: %s", err)
} }

14
builtin/providers/openstack/resource_openstack_compute_floatingip_v2_test.go
View File

@ -8,12 +8,12 @@ import (
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
"github.com/rackspace/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
) )
func TestAccComputeV2FloatingIP_basic(t *testing.T) { func TestAccComputeV2FloatingIP_basic(t *testing.T) {
var floatingIP floatingip.FloatingIP var floatingIP floatingips.FloatingIP
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -32,7 +32,7 @@ func TestAccComputeV2FloatingIP_basic(t *testing.T) {
func TestAccComputeV2FloatingIP_attach(t *testing.T) { func TestAccComputeV2FloatingIP_attach(t *testing.T) {
var instance servers.Server var instance servers.Server
var fip floatingip.FloatingIP var fip floatingips.FloatingIP
var testAccComputeV2FloatingIP_attach = fmt.Sprintf(` var testAccComputeV2FloatingIP_attach = fmt.Sprintf(`
resource "openstack_compute_floatingip_v2" "myip" { resource "openstack_compute_floatingip_v2" "myip" {
} }
@ -77,7 +77,7 @@ func testAccCheckComputeV2FloatingIPDestroy(s *terraform.State) error {
continue continue
} }
_, err := floatingip.Get(computeClient, rs.Primary.ID).Extract() _, err := floatingips.Get(computeClient, rs.Primary.ID).Extract()
if err == nil { if err == nil {
return fmt.Errorf("FloatingIP still exists") return fmt.Errorf("FloatingIP still exists")
} }
@ -86,7 +86,7 @@ func testAccCheckComputeV2FloatingIPDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckComputeV2FloatingIPExists(t *testing.T, n string, kp *floatingip.FloatingIP) resource.TestCheckFunc { func testAccCheckComputeV2FloatingIPExists(t *testing.T, n string, kp *floatingips.FloatingIP) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {
@ -103,7 +103,7 @@ func testAccCheckComputeV2FloatingIPExists(t *testing.T, n string, kp *floatingi
return fmt.Errorf("(testAccCheckComputeV2FloatingIPExists) Error creating OpenStack compute client: %s", err) return fmt.Errorf("(testAccCheckComputeV2FloatingIPExists) Error creating OpenStack compute client: %s", err)
} }
found, err := floatingip.Get(computeClient, rs.Primary.ID).Extract() found, err := floatingips.Get(computeClient, rs.Primary.ID).Extract()
if err != nil { if err != nil {
return err return err
} }