IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

provider/openstack: gophercloud migration: lbaas v2

Browse Source
This commit is contained in:
Joe Topjian 2016-09-04 02:54:05 +00:00
parent e2526002ff
commit d04cfb1ab5
11 changed files with 38 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/providers/openstack/resource_openstack_lb_listener_v2.go
View File

@ -8,8 +8,8 @@ import (
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/rackspace/gophercloud" "github.com/gophercloud/gophercloud"
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas_v2/listeners" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/listeners"
) )
func resourceListenerV2() *schema.Resource { func resourceListenerV2() *schema.Resource {
@ -285,7 +285,7 @@ func waitForListenerDelete(networkingClient *gophercloud.ServiceClient, listener
listener, err := listeners.Get(networkingClient, listenerID).Extract() listener, err := listeners.Get(networkingClient, listenerID).Extract()
if err != nil { if err != nil {
errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError) errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
if !ok { if !ok {
return listener, "ACTIVE", err return listener, "ACTIVE", err
} }
@ -298,7 +298,7 @@ func waitForListenerDelete(networkingClient *gophercloud.ServiceClient, listener
log.Printf("[DEBUG] Openstack LBaaSV2 listener: %+v", listener) log.Printf("[DEBUG] Openstack LBaaSV2 listener: %+v", listener)
err = listeners.Delete(networkingClient, listenerID).ExtractErr() err = listeners.Delete(networkingClient, listenerID).ExtractErr()
if err != nil { if err != nil {
errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError) errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
if !ok { if !ok {
return listener, "ACTIVE", err return listener, "ACTIVE", err
} }

2
builtin/providers/openstack/resource_openstack_lb_listener_v2_test.go
View File

@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/listeners"
"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/networking/v2/extensions/lbaas_v2/listeners"
) )
func TestAccLBV2Listener_basic(t *testing.T) { func TestAccLBV2Listener_basic(t *testing.T) {

8
builtin/providers/openstack/resource_openstack_lb_loadbalancer_v2.go
View File

@ -8,8 +8,8 @@ import (
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/rackspace/gophercloud" "github.com/gophercloud/gophercloud"
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas_v2/loadbalancers" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/loadbalancers"
) )
func resourceLoadBalancerV2() *schema.Resource { func resourceLoadBalancerV2() *schema.Resource {
@ -228,7 +228,7 @@ func waitForLoadBalancerDelete(networkingClient *gophercloud.ServiceClient, lbID
lb, err := loadbalancers.Get(networkingClient, lbID).Extract() lb, err := loadbalancers.Get(networkingClient, lbID).Extract()
if err != nil { if err != nil {
errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError) errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
if !ok { if !ok {
return lb, "ACTIVE", err return lb, "ACTIVE", err
} }
@ -241,7 +241,7 @@ func waitForLoadBalancerDelete(networkingClient *gophercloud.ServiceClient, lbID
log.Printf("[DEBUG] Openstack LoadBalancerV2: %+v", lb) log.Printf("[DEBUG] Openstack LoadBalancerV2: %+v", lb)
err = loadbalancers.Delete(networkingClient, lbID).ExtractErr() err = loadbalancers.Delete(networkingClient, lbID).ExtractErr()
if err != nil { if err != nil {
errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError) errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
if !ok { if !ok {
return lb, "ACTIVE", err return lb, "ACTIVE", err
} }

5
builtin/providers/openstack/resource_openstack_lb_loadbalancer_v2_test.go
View File

@ -2,12 +2,11 @@ package openstack
import ( import (
"fmt" "fmt"
"log"
"testing" "testing"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/loadbalancers"
"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/networking/v2/extensions/lbaas_v2/loadbalancers"
) )
func TestAccLBV2LoadBalancer_basic(t *testing.T) { func TestAccLBV2LoadBalancer_basic(t *testing.T) {
@ -42,8 +41,6 @@ func testAccCheckLBV2LoadBalancerDestroy(s *terraform.State) error {
} }
for _, rs := range s.RootModule().Resources { for _, rs := range s.RootModule().Resources {
log.Printf("[FINDME] rs TYPE is: %#v", rs.Type)
if rs.Type != "openstack_lb_loadbalancer_v2" { if rs.Type != "openstack_lb_loadbalancer_v2" {
continue continue
} }

2
builtin/providers/openstack/resource_openstack_lb_member_v1_test.go
View File

@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/members"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/members"
) )
func TestAccLBV1Member_basic(t *testing.T) { func TestAccLBV1Member_basic(t *testing.T) {

28
builtin/providers/openstack/resource_openstack_lb_member_v2.go
View File

@ -8,8 +8,8 @@ import (
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/rackspace/gophercloud" "github.com/gophercloud/gophercloud"
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas_v2/pools" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/pools"
) )
func resourceMemberV2() *schema.Resource { func resourceMemberV2() *schema.Resource {
@ -99,9 +99,8 @@ func resourceMemberV2Create(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Error creating OpenStack networking client: %s", err) return fmt.Errorf("Error creating OpenStack networking client: %s", err)
} }
subnetID := d.Get("subnet_id").(string)
adminStateUp := d.Get("admin_state_up").(bool) adminStateUp := d.Get("admin_state_up").(bool)
createOpts := pools.MemberCreateOpts{ createOpts := pools.CreateMemberOpts{
Name: d.Get("name").(string), Name: d.Get("name").(string),
TenantID: d.Get("tenant_id").(string), TenantID: d.Get("tenant_id").(string),
Address: d.Get("address").(string), Address: d.Get("address").(string),
@ -109,15 +108,16 @@ func resourceMemberV2Create(d *schema.ResourceData, meta interface{}) error {
Weight: d.Get("weight").(int), Weight: d.Get("weight").(int),
AdminStateUp: &adminStateUp, AdminStateUp: &adminStateUp,
} }
// Must omit if not set // Must omit if not set
if subnetID != "" { if v, ok := d.GetOk("subnet_id"); ok {
createOpts.SubnetID = subnetID createOpts.SubnetID = v.(string)
} }
poolID := d.Get("pool_id").(string) poolID := d.Get("pool_id").(string)
log.Printf("[DEBUG] Create Options: %#v", createOpts) log.Printf("[DEBUG] Create Options: %#v", createOpts)
member, err := pools.CreateAssociateMember(networkingClient, poolID, createOpts).ExtractMember() member, err := pools.CreateMember(networkingClient, poolID, createOpts).Extract()
if err != nil { if err != nil {
return fmt.Errorf("Error creating OpenStack LBaaSV2 member: %s", err) return fmt.Errorf("Error creating OpenStack LBaaSV2 member: %s", err)
} }
@ -151,7 +151,7 @@ func resourceMemberV2Read(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Error creating OpenStack networking client: %s", err) return fmt.Errorf("Error creating OpenStack networking client: %s", err)
} }
member, err := pools.GetAssociateMember(networkingClient, d.Get("pool_id").(string), d.Id()).ExtractMember() member, err := pools.GetMember(networkingClient, d.Get("pool_id").(string), d.Id()).Extract()
if err != nil { if err != nil {
return CheckDeleted(d, err, "LBV2 Member") return CheckDeleted(d, err, "LBV2 Member")
} }
@ -177,7 +177,7 @@ func resourceMemberV2Update(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Error creating OpenStack networking client: %s", err) return fmt.Errorf("Error creating OpenStack networking client: %s", err)
} }
var updateOpts pools.MemberUpdateOpts var updateOpts pools.UpdateMemberOpts
if d.HasChange("name") { if d.HasChange("name") {
updateOpts.Name = d.Get("name").(string) updateOpts.Name = d.Get("name").(string)
} }
@ -191,7 +191,7 @@ func resourceMemberV2Update(d *schema.ResourceData, meta interface{}) error {
log.Printf("[DEBUG] Updating OpenStack LBaaSV2 Member %s with options: %+v", d.Id(), updateOpts) log.Printf("[DEBUG] Updating OpenStack LBaaSV2 Member %s with options: %+v", d.Id(), updateOpts)
_, err = pools.UpdateAssociateMember(networkingClient, d.Get("pool_id").(string), d.Id(), updateOpts).ExtractMember() _, err = pools.UpdateMember(networkingClient, d.Get("pool_id").(string), d.Id(), updateOpts).Extract()
if err != nil { if err != nil {
return fmt.Errorf("Error updating OpenStack LBaaSV2 Member: %s", err) return fmt.Errorf("Error updating OpenStack LBaaSV2 Member: %s", err)
} }
@ -226,7 +226,7 @@ func resourceMemberV2Delete(d *schema.ResourceData, meta interface{}) error {
func waitForMemberActive(networkingClient *gophercloud.ServiceClient, poolID string, memberID string) resource.StateRefreshFunc { func waitForMemberActive(networkingClient *gophercloud.ServiceClient, poolID string, memberID string) resource.StateRefreshFunc {
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
member, err := pools.GetAssociateMember(networkingClient, poolID, memberID).ExtractMember() member, err := pools.GetMember(networkingClient, poolID, memberID).Extract()
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
@ -241,9 +241,9 @@ func waitForMemberDelete(networkingClient *gophercloud.ServiceClient, poolID str
return func() (interface{}, string, error) { return func() (interface{}, string, error) {
log.Printf("[DEBUG] Attempting to delete OpenStack LBaaSV2 Member %s", memberID) log.Printf("[DEBUG] Attempting to delete OpenStack LBaaSV2 Member %s", memberID)
member, err := pools.GetAssociateMember(networkingClient, poolID, memberID).ExtractMember() member, err := pools.GetMember(networkingClient, poolID, memberID).Extract()
if err != nil { if err != nil {
errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError) errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
if !ok { if !ok {
return member, "ACTIVE", err return member, "ACTIVE", err
} }
@ -256,7 +256,7 @@ func waitForMemberDelete(networkingClient *gophercloud.ServiceClient, poolID str
log.Printf("[DEBUG] Openstack LBaaSV2 Member: %+v", member) log.Printf("[DEBUG] Openstack LBaaSV2 Member: %+v", member)
err = pools.DeleteMember(networkingClient, poolID, memberID).ExtractErr() err = pools.DeleteMember(networkingClient, poolID, memberID).ExtractErr()
if err != nil { if err != nil {
errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError) errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
if !ok { if !ok {
return member, "ACTIVE", err return member, "ACTIVE", err
} }

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

@ -2,12 +2,11 @@ package openstack
import ( import (
"fmt" "fmt"
"log"
"testing" "testing"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/pools"
"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/networking/v2/extensions/lbaas_v2/pools"
) )
func TestAccLBV2Member_basic(t *testing.T) { func TestAccLBV2Member_basic(t *testing.T) {
@ -42,14 +41,11 @@ func testAccCheckLBV2MemberDestroy(s *terraform.State) error {
} }
for _, rs := range s.RootModule().Resources { for _, rs := range s.RootModule().Resources {
log.Printf("[FINDME] rs TYPE is: %T", rs)
if rs.Type != "openstack_lb_member_v2" { if rs.Type != "openstack_lb_member_v2" {
continue continue
} }
log.Printf("[FINDME] rs.Primary.Attributes: %#v", rs.Primary.Attributes) _, err := pools.GetMember(networkingClient, rs.Primary.Attributes["pool_id"], rs.Primary.ID).Extract()
_, err := pools.GetAssociateMember(networkingClient, rs.Primary.Attributes["pool_id"], rs.Primary.ID).ExtractMember()
if err == nil { if err == nil {
return fmt.Errorf("Member still exists: %s", rs.Primary.ID) return fmt.Errorf("Member still exists: %s", rs.Primary.ID)
} }
@ -75,7 +71,7 @@ func testAccCheckLBV2MemberExists(t *testing.T, n string, member *pools.Member)
return fmt.Errorf("(testAccCheckLBV2MemberExists) Error creating OpenStack networking client: %s", err) return fmt.Errorf("(testAccCheckLBV2MemberExists) Error creating OpenStack networking client: %s", err)
} }
found, err := pools.GetAssociateMember(networkingClient, rs.Primary.Attributes["pool_id"], rs.Primary.ID).ExtractMember() found, err := pools.GetMember(networkingClient, rs.Primary.Attributes["pool_id"], rs.Primary.ID).Extract()
if err != nil { if err != nil {
return err return err
} }

8
builtin/providers/openstack/resource_openstack_lb_monitor_v2.go
View File

@ -8,8 +8,8 @@ import (
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/rackspace/gophercloud" "github.com/gophercloud/gophercloud"
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas_v2/monitors" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/monitors"
) )
func resourceMonitorV2() *schema.Resource { func resourceMonitorV2() *schema.Resource {
@ -258,7 +258,7 @@ func waitForMonitorDelete(networkingClient *gophercloud.ServiceClient, monitorID
monitor, err := monitors.Get(networkingClient, monitorID).Extract() monitor, err := monitors.Get(networkingClient, monitorID).Extract()
if err != nil { if err != nil {
errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError) errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
if !ok { if !ok {
return monitor, "ACTIVE", err return monitor, "ACTIVE", err
} }
@ -271,7 +271,7 @@ func waitForMonitorDelete(networkingClient *gophercloud.ServiceClient, monitorID
log.Printf("[DEBUG] Openstack LBaaSV2 Monitor: %+v", monitor) log.Printf("[DEBUG] Openstack LBaaSV2 Monitor: %+v", monitor)
err = monitors.Delete(networkingClient, monitorID).ExtractErr() err = monitors.Delete(networkingClient, monitorID).ExtractErr()
if err != nil { if err != nil {
errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError) errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
if !ok { if !ok {
return monitor, "ACTIVE", err return monitor, "ACTIVE", err
} }

6
builtin/providers/openstack/resource_openstack_lb_monitor_v2_test.go
View File

@ -2,12 +2,11 @@ package openstack
import ( import (
"fmt" "fmt"
"log"
"testing" "testing"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/monitors"
"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/networking/v2/extensions/lbaas_v2/monitors"
) )
func TestAccLBV2Monitor_basic(t *testing.T) { func TestAccLBV2Monitor_basic(t *testing.T) {
@ -44,13 +43,10 @@ func testAccCheckLBV2MonitorDestroy(s *terraform.State) error {
} }
for _, rs := range s.RootModule().Resources { for _, rs := range s.RootModule().Resources {
log.Printf("[FINDME] rs TYPE is: %T", rs)
if rs.Type != "openstack_lb_monitor_v2" { if rs.Type != "openstack_lb_monitor_v2" {
continue continue
} }
log.Printf("[FINDME] rs.Primary.Attributes: %#v", rs.Primary.Attributes)
_, err := monitors.Get(networkingClient, rs.Primary.ID).Extract() _, err := monitors.Get(networkingClient, rs.Primary.ID).Extract()
if err == nil { if err == nil {
return fmt.Errorf("Monitor still exists: %s", rs.Primary.ID) return fmt.Errorf("Monitor still exists: %s", rs.Primary.ID)

8
builtin/providers/openstack/resource_openstack_lb_pool_v2.go
View File

@ -8,8 +8,8 @@ import (
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/rackspace/gophercloud" "github.com/gophercloud/gophercloud"
"github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas_v2/pools" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/pools"
) )
func resourcePoolV2() *schema.Resource { func resourcePoolV2() *schema.Resource {
@ -291,7 +291,7 @@ func waitForPoolDelete(networkingClient *gophercloud.ServiceClient, poolID strin
pool, err := pools.Get(networkingClient, poolID).Extract() pool, err := pools.Get(networkingClient, poolID).Extract()
if err != nil { if err != nil {
errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError) errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
if !ok { if !ok {
return pool, "ACTIVE", err return pool, "ACTIVE", err
} }
@ -304,7 +304,7 @@ func waitForPoolDelete(networkingClient *gophercloud.ServiceClient, poolID strin
log.Printf("[DEBUG] Openstack LBaaSV2 Pool: %+v", pool) log.Printf("[DEBUG] Openstack LBaaSV2 Pool: %+v", pool)
err = pools.Delete(networkingClient, poolID).ExtractErr() err = pools.Delete(networkingClient, poolID).ExtractErr()
if err != nil { if err != nil {
errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError) errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
if !ok { if !ok {
return pool, "ACTIVE", err return pool, "ACTIVE", err
} }

5
builtin/providers/openstack/resource_openstack_lb_pool_v2_test.go
View File

@ -2,12 +2,11 @@ package openstack
import ( import (
"fmt" "fmt"
"log"
"testing" "testing"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/pools"
"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/networking/v2/extensions/lbaas_v2/pools"
) )
func TestAccLBV2Pool_basic(t *testing.T) { func TestAccLBV2Pool_basic(t *testing.T) {
@ -42,8 +41,6 @@ func testAccCheckLBV2PoolDestroy(s *terraform.State) error {
} }
for _, rs := range s.RootModule().Resources { for _, rs := range s.RootModule().Resources {
log.Printf("[FINDME] rs TYPE is: %T", rs)
if rs.Type != "openstack_lb_pool_v2" { if rs.Type != "openstack_lb_pool_v2" {
continue continue
} }