Increased default timeouts and added acceptable L2 provider target to…

… support GCP interconnect
nomical · Nov 20, 2020 · b689c56 · b689c56
1 parent c225752
commit b689c56
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/apiclient/constants.go b/apiclient/constants.go
@@ -10,6 +10,7 @@ const (
 const (
 	L2ConnectionProviderStatusProvisioning    = "PROVISIONING"
 	L2ConnectionProviderStatusPendingApproval = "PENDING_APPROVAL"
+	L2ConnectionProviderStatusProvisioned     = "PROVISIONED"
 	L2ConnectionProviderStatusNotAvailable    = "NOT_AVAILABLE"
 	L2ConnectionProviderStatusDeprovisioning  = "DEPROVISIONING"
 	L2ConnectionProviderStatusDeprovisioned   = "DEPROVISIONED"

diff --git a/ecxfabric/resource_l2_connection.go b/ecxfabric/resource_l2_connection.go
@@ -17,8 +17,8 @@ func resourceL2Connection() *schema.Resource {
 		Delete: resourceL2ConnectionDelete,
 
 		Timeouts: &schema.ResourceTimeout{
-			Create: schema.DefaultTimeout(5 * time.Minute),
-			Delete: schema.DefaultTimeout(5 * time.Minute),
+			Create: schema.DefaultTimeout(15 * time.Minute),
+			Delete: schema.DefaultTimeout(15 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{
@@ -163,6 +163,7 @@ func resourceL2ConnectionCreate(d *schema.ResourceData, m interface{}) error {
 		},
 		Target: []string{
 			apiclient.L2ConnectionProviderStatusPendingApproval,
+			apiclient.L2ConnectionProviderStatusProvisioned,
 		},
 		Refresh: l2ConnectionProviderStatusRefreshFunc(client, resp.PrimaryConnectionID),
 		Timeout: d.Timeout(schema.TimeoutCreate),

diff --git a/go.mod b/go.mod
@@ -11,6 +11,7 @@ require (
 	github.com/bmatcuk/doublestar v1.3.4 // indirect
 	github.com/fatih/color v1.10.0 // indirect
 	github.com/google/go-cmp v0.5.3 // indirect
+	github.com/gorilla/mux v1.8.0
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-getter v1.5.1 // indirect
 	github.com/hashicorp/go-hclog v0.15.0 // indirect

diff --git a/go.sum b/go.sum
@@ -235,6 +235,8 @@ github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod h
 github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod h1:gmC5oQqMDOMO1t1gq5DquX/yAU808e/4mzjjDA76+Ss=
 github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod h1:ehWUbLQJPqS0Ep+CxeD559hsm9pthPXadJNKwZkp43w=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=