Merge branch 'waiting'

megaport/common.go

@@ -93,8 +93,7 @@ func compareNillableUints(a *uint64, b uint64) bool {
 
 func waitUntilVxcIsConfigured(client *api.Client, productUid string, timeout time.Duration) error {
 	scc := &resource.StateChangeConf{
-		Pending: []string{api.ProductStatusDeployable},
-		Target:  []string{api.ProductStatusConfigured, api.ProductStatusLive},
+		Target: []string{api.ProductStatusConfigured, api.ProductStatusLive},
 		Refresh: func() (interface{}, string, error) {
 			v, err := client.GetVxc(productUid)
 			if err != nil {

megaport/resource_megaport_port.go

@@ -98,6 +98,9 @@ func resourceMegaportPortCreate(d *schema.ResourceData, m interface{}) error {
 		return err
 	}
 	d.SetId(*uid)
+	if err := waitUntilPortIsConfigured(cfg.Client, *uid, 5*time.Minute); err != nil {
+		return err
+	}
 	return resourceMegaportPortRead(d, m)
 }
 
@@ -111,6 +114,9 @@ func resourceMegaportPortUpdate(d *schema.ResourceData, m interface{}) error {
 	}); err != nil {
 		return err
 	}
+	if err := waitUntilPortIsConfigured(cfg.Client, d.Id(), 5*time.Minute); err != nil {
+		return err
+	}
 	return resourceMegaportPortRead(d, m)
 }
 
@@ -125,3 +131,26 @@ func resourceMegaportPortDelete(d *schema.ResourceData, m interface{}) error {
 	}
 	return nil
 }
+
+func waitUntilPortIsConfigured(client *api.Client, productUid string, timeout time.Duration) error {
+	scc := &resource.StateChangeConf{
+		Target: []string{api.ProductStatusConfigured, api.ProductStatusLive},
+		Refresh: func() (interface{}, string, error) {
+			v, err := client.GetPort(productUid)
+			if err != nil {
+				log.Printf("[ERROR] Could not retrieve Port while waiting for setup to finish: %v", err)
+				return nil, "", err
+			}
+			if v == nil {
+				return nil, "", nil
+			}
+			return v, v.ProvisioningStatus, nil
+		},
+		Timeout:    timeout,
+		MinTimeout: 10 * time.Second,
+		Delay:      5 * time.Second,
+	}
+	log.Printf("[INFO] Waiting for Port (%s) to be configured", productUid)
+	_, err := scc.WaitForState()
+	return err
+}