Add wait for connection to be deleted

Signed-off-by: Ayush Rangwala <[email protected]>

test/e2e/interconnections/create_test.go

@@ -43,19 +43,9 @@ func TestInterconnections_Create(t *testing.T) {
 
 				out := helper.ExecuteAndCaptureOutput(t, root)
 
-				// Need to find the current user's default org
-				// as orgId is not populated in project. Its created using default org
-				user, _, err := apiClient.UsersApi.
-					FindCurrentUser(context.Background()).
-					Include([]string{"default_organization_id"}).
-					Execute()
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				conns, _, err := apiClient.InterconnectionsApi.
-					OrganizationListInterconnections(context.Background(), user.GetDefaultOrganizationId()).
-					Execute()
+				conns, err := apiClient.InterconnectionsApi.
+					ProjectListInterconnections(context.Background(), project.GetId()).
+					ExecuteWithPagination()
 				if err != nil {
 					t.Fatal(err)
 				}

test/helper/helper.go

@@ -586,5 +586,38 @@ func CleanupInterconnection(t *testing.T, connectionId string) {
 		t.Fatalf("Error when calling `InterconnectionsApi.DeleteInterconnection`` for %v: %v\n", connectionId, err)
 	}
 
+	if err := waitForInterconnectionDeleted(apiClient, connectionId, 5*time.Minute); err != nil {
+		t.Fatal(err)
+	}
+
 	CleanupInterconnectionVC(t, connectionId)
 }
+
+func waitForInterconnectionDeleted(apiClient *metalv1.APIClient, connId string, timeout time.Duration) error {
+	ctx, cancelFunc := context.WithTimeout(context.Background(), timeout)
+	defer cancelFunc()
+
+	ticker := time.NewTicker(2 * time.Second)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ctx.Done():
+			return errors.New("Timeout while waiting for connection to be deleted")
+		case <-ticker.C:
+			conn, _, err := apiClient.InterconnectionsApi.GetInterconnection(context.Background(), connId).Execute()
+			if err != nil {
+				if strings.Contains(err.Error(), "Not Found") {
+					return nil
+				}
+				return err
+			}
+
+			if conn == nil {
+				return nil
+			}
+
+			fmt.Printf("Connection not deleted. Current status: [%s]", conn.GetStatus())
+		}
+	}
+}