Fixed openstack_lb_loadbalancer_v2 flavor selection. (gophercloud#904)

Incorporates gophercloud upstream fix.

gophercloud#1743

The openstack_lb_loadbalancer_v2 flavor attribute is now
`flavor_id` to match the Neutron LBaaSv2 and Octavia
api attribute.

go.mod

@@ -1,7 +1,7 @@
 module github.com/terraform-providers/terraform-provider-openstack
 
 require (
-	github.com/gophercloud/gophercloud v0.4.1-0.20191011151343-9c34d1968ad7
+	github.com/gophercloud/gophercloud v0.5.1-0.20191016015529-6f9cb195db52
 	github.com/gophercloud/utils v0.0.0-20190829151529-94e6842399e5
 	github.com/hashicorp/terraform-plugin-sdk v1.0.0
 	github.com/mitchellh/go-homedir v1.1.0

go.sum

@@ -69,6 +69,8 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 github.com/gophercloud/gophercloud v0.0.0-20190212181753-892256c46858/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gophercloud/gophercloud v0.4.1-0.20191011151343-9c34d1968ad7 h1:IFWEXgvvAQ/XNtnBSsfrZt7bXtKZCGJGtsPU/Ur/VDQ=
 github.com/gophercloud/gophercloud v0.4.1-0.20191011151343-9c34d1968ad7/go.mod h1:b1k/BkBA9smzYde6p6zYLIe5JNAEoJzUWaIRh+9A/j0=
+github.com/gophercloud/gophercloud v0.5.1-0.20191016015529-6f9cb195db52 h1:wgVapaBReQLPQl3eyMG5Rr4NTAqwmGvJecroIBpwgGI=
+github.com/gophercloud/gophercloud v0.5.1-0.20191016015529-6f9cb195db52/go.mod h1:b1k/BkBA9smzYde6p6zYLIe5JNAEoJzUWaIRh+9A/j0=
 github.com/gophercloud/utils v0.0.0-20190829151529-94e6842399e5 h1:W6TC1Dd95ocK2YK5jLmKmh1lg+oZaXdLl+CRP7pUdfA=
 github.com/gophercloud/utils v0.0.0-20190829151529-94e6842399e5/go.mod h1:SZ9FTKibIotDtCrxAU/evccoyu1yhKST6hgBvwTB5Eg=
 github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=

openstack/resource_openstack_lb_loadbalancer_v2.go

@@ -78,7 +78,7 @@ func resourceLoadBalancerV2() *schema.Resource {
 				Optional: true,
 			},
 
-			"flavor": {
+			"flavor_id": {
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
@@ -122,7 +122,7 @@ func resourceLoadBalancerV2Create(d *schema.ResourceData, meta interface{}) erro
 		TenantID:     d.Get("tenant_id").(string),
 		VipAddress:   d.Get("vip_address").(string),
 		AdminStateUp: &adminStateUp,
-		Flavor:       d.Get("flavor").(string),
+		FlavorID:     d.Get("flavor_id").(string),
 		Provider:     lbProvider,
 	}
 
@@ -176,7 +176,7 @@ func resourceLoadBalancerV2Read(d *schema.ResourceData, meta interface{}) error
 	d.Set("vip_address", lb.VipAddress)
 	d.Set("vip_port_id", lb.VipPortID)
 	d.Set("admin_state_up", lb.AdminStateUp)
-	d.Set("flavor", lb.Flavor)
+	d.Set("flavor_id", lb.FlavorID)
 	d.Set("loadbalancer_provider", lb.Provider)
 	d.Set("region", GetRegion(d, config))
 

vendor/modules.txt

@@ -75,8 +75,9 @@ github.com/google/go-cmp/cmp/internal/value
 github.com/google/uuid
 # github.com/googleapis/gax-go/v2 v2.0.5
 github.com/googleapis/gax-go/v2
-# github.com/gophercloud/gophercloud v0.4.1-0.20191011151343-9c34d1968ad7
+github.com/gophercloud/gophercloud v0.5.1-0.20191016015529-6f9cb195db52
 github.com/gophercloud/gophercloud
+github.com/gophercloud/gophercloud/internal
 github.com/gophercloud/gophercloud/openstack
 github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/quotasets
 github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions
@@ -104,10 +105,13 @@ github.com/gophercloud/gophercloud/openstack/containerinfra/v1/clusters
 github.com/gophercloud/gophercloud/openstack/containerinfra/v1/clustertemplates
 github.com/gophercloud/gophercloud/openstack/db/v1/configurations
 github.com/gophercloud/gophercloud/openstack/db/v1/databases
+github.com/gophercloud/gophercloud/openstack/db/v1/datastores
 github.com/gophercloud/gophercloud/openstack/db/v1/instances
 github.com/gophercloud/gophercloud/openstack/db/v1/users
 github.com/gophercloud/gophercloud/openstack/dns/v2/recordsets
 github.com/gophercloud/gophercloud/openstack/dns/v2/zones
+github.com/gophercloud/gophercloud/openstack/identity/v2/tenants
+github.com/gophercloud/gophercloud/openstack/identity/v2/tokens
 github.com/gophercloud/gophercloud/openstack/identity/v3/applicationcredentials
 github.com/gophercloud/gophercloud/openstack/identity/v3/endpoints
 github.com/gophercloud/gophercloud/openstack/identity/v3/groups
@@ -121,7 +125,10 @@ github.com/gophercloud/gophercloud/openstack/imageservice/v2/images
 github.com/gophercloud/gophercloud/openstack/imageservice/v2/members
 github.com/gophercloud/gophercloud/openstack/keymanager/v1/containers
 github.com/gophercloud/gophercloud/openstack/keymanager/v1/secrets
+github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies
 github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners
+github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors
+github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools
 github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags
 github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/dns
 github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/external
@@ -162,6 +169,7 @@ github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/vpnaas/sit
 github.com/gophercloud/gophercloud/openstack/networking/v2/networks
 github.com/gophercloud/gophercloud/openstack/networking/v2/ports
 github.com/gophercloud/gophercloud/openstack/networking/v2/subnets
+github.com/gophercloud/gophercloud/openstack/objectstorage/v1/accounts
 github.com/gophercloud/gophercloud/openstack/objectstorage/v1/containers
 github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects
 github.com/gophercloud/gophercloud/openstack/objectstorage/v1/swauth
@@ -173,18 +181,10 @@ github.com/gophercloud/gophercloud/openstack/sharedfilesystems/v2/securityservic
 github.com/gophercloud/gophercloud/openstack/sharedfilesystems/v2/sharenetworks
 github.com/gophercloud/gophercloud/openstack/sharedfilesystems/v2/shares
 github.com/gophercloud/gophercloud/openstack/sharedfilesystems/v2/snapshots
-github.com/gophercloud/gophercloud/pagination
-github.com/gophercloud/gophercloud/openstack/identity/v2/tokens
 github.com/gophercloud/gophercloud/openstack/utils
-github.com/gophercloud/gophercloud/openstack/db/v1/datastores
-github.com/gophercloud/gophercloud/internal
-github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies
-github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools
-github.com/gophercloud/gophercloud/openstack/objectstorage/v1/accounts
+github.com/gophercloud/gophercloud/pagination
 github.com/gophercloud/gophercloud/testhelper
 github.com/gophercloud/gophercloud/testhelper/client
-github.com/gophercloud/gophercloud/openstack/identity/v2/tenants
-github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors
 # github.com/gophercloud/utils v0.0.0-20190829151529-94e6842399e5
 github.com/gophercloud/utils/openstack/clientconfig
 # github.com/hashicorp/errwrap v1.0.0

website/docs/r/lb_loadbalancer_v2.html.markdown

@@ -47,7 +47,7 @@ The following arguments are supported:
 * `admin_state_up` - (Optional) The administrative state of the Loadbalancer.
     A valid value is true (UP) or false (DOWN).
 
-* `flavor` - (Optional) The UUID of a flavor. Changing this creates a new
+* `flavor_id` - (Optional) The UUID of a flavor. Changing this creates a new
     loadbalancer.
 
 * `loadbalancer_provider` - (Optional) The name of the provider. Changing this
@@ -68,7 +68,7 @@ The following attributes are exported:
 * `tenant_id` - See Argument Reference above.
 * `vip_address` - See Argument Reference above.
 * `admin_state_up` - See Argument Reference above.
-* `flavor` - See Argument Reference above.
+* `flavor_id` - See Argument Reference above.
 * `loadbalancer_provider` - See Argument Reference above.
 * `security_group_ids` - See Argument Reference above.
 * `vip_port_id` - The Port ID of the Load Balancer IP.