HYPERFLEET-590 - test: automate Clusters Resource Type - Workflow Validation

configs/config.yaml

@@ -85,3 +85,24 @@ log:
   # Log output: stdout, stderr
   # Can be overridden by: HYPERFLEET_LOG_OUTPUT
   output: stdout
+
+# ============================================================================
+# Adapter Configuration
+# ============================================================================
+
+adapters:
+  # Required adapters for cluster resources
+  # List of adapter names that must be present and have correct conditions
+  # when validating cluster adapter execution
+  #
+  # Can be overridden by: HYPERFLEET_ADAPTERS_CLUSTER (comma-separated)
+  cluster:
+    - "cl-namespace"
+
+  # Required adapters for nodepool resources
+  # List of adapter names that must be present and have correct conditions
+  # when validating nodepool adapter execution
+  #
+  # Can be overridden by: HYPERFLEET_ADAPTERS_NODEPOOL (comma-separated)
+  nodepool:
+    - "np-configmap"

e2e/cluster/creation.go

@@ -1,88 +1,169 @@
 package cluster
 
 import (
-	"context"
+    "context"
 
-	"github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega" //nolint:staticcheck // dot import for test readability
+    "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega" //nolint:staticcheck // dot import for test readability
 
-	"github.com/openshift-hyperfleet/hyperfleet-e2e/pkg/helper"
-	"github.com/openshift-hyperfleet/hyperfleet-e2e/pkg/labels"
+    "github.com/openshift-hyperfleet/hyperfleet-e2e/pkg/api/openapi"
+    "github.com/openshift-hyperfleet/hyperfleet-e2e/pkg/client"
+    "github.com/openshift-hyperfleet/hyperfleet-e2e/pkg/helper"
+    "github.com/openshift-hyperfleet/hyperfleet-e2e/pkg/labels"
 )
 
-var lifecycleTestName = "[Suite: cluster][baseline] Full Cluster Creation Flow on GCP"
+var lifecycleTestName = "[Suite: cluster][baseline] Clusters Resource Type - Workflow Validation"
 
 var _ = ginkgo.Describe(lifecycleTestName,
-	ginkgo.Label(labels.Tier0),
-	func() {
-		var h *helper.Helper
-		var clusterID string
-
-		ginkgo.BeforeEach(func() {
-			h = helper.New()
-		})
-
-		ginkgo.It("should create GCP cluster and transition to Ready state with all adapters healthy", func(ctx context.Context) {
-			ginkgo.By("submitting cluster creation request via POST /api/hyperfleet/v1/clusters")
-			cluster, err := h.Client.CreateClusterFromPayload(ctx, "testdata/payloads/clusters/gcp.json")
-			Expect(err).NotTo(HaveOccurred(), "failed to create cluster")
-
-			ginkgo.By("verifying API response (HTTP 201 Created)")
-			Expect(cluster.Id).NotTo(BeNil(), "cluster ID should be generated")
-			clusterID = *cluster.Id
-			ginkgo.GinkgoWriter.Printf("Created cluster ID: %s\n", clusterID)
-
-			Expect(cluster.Status).NotTo(BeNil(), "cluster status should be present")
-			/** <TODO>
-			Expect(cluster.Status.Phase).To(Equal(openapi.NotReady), "cluster should be in NotReady phase initially")
-
-						 Cluster final status depends on all deployed adapter result, this is still in progress.
-			             Will update this part once adapter scope is finalized.
-						ginkgo.By("monitoring cluster status - waiting for phase transition to Ready")
-						err = h.WaitForClusterPhase(ctx, clusterID, openapi.Ready, h.Cfg.Timeouts.Cluster.Ready)
-						Expect(err).NotTo(HaveOccurred(), "cluster should reach Ready phase")
-
-						ginkgo.By("verifying all adapter conditions via /clusters/{id}/statuses endpoint")
-						const expectedAdapterCount = 1 // GCP cluster expects 1 adapter
-						Eventually(func(g Gomega) {
-							statuses, err := h.Client.GetClusterStatuses(ctx, clusterID)
-							g.Expect(err).NotTo(HaveOccurred(), "failed to get cluster statuses")
-							g.Expect(statuses.Items).To(HaveLen(expectedAdapterCount),
-								"expected %d adapter(s), got %d", expectedAdapterCount, len(statuses.Items))
-
-							for _, adapter := range statuses.Items {
-								hasApplied := h.HasCondition(adapter.Conditions, client.ConditionTypeApplied, openapi.True)
-								g.Expect(hasApplied).To(BeTrue(),
-									"adapter %s should have Applied=True", adapter.Adapter)
-
-								hasAvailable := h.HasCondition(adapter.Conditions, client.ConditionTypeAvailable, openapi.True)
-								g.Expect(hasAvailable).To(BeTrue(),
-									"adapter %s should have Available=True", adapter.Adapter)
-
-								hasHealth := h.HasCondition(adapter.Conditions, client.ConditionTypeHealth, openapi.True)
-								g.Expect(hasHealth).To(BeTrue(),
-									"adapter %s should have Health=True", adapter.Adapter)
-							}
-						}, h.Cfg.Timeouts.Adapter.Processing, h.Cfg.Polling.Interval).Should(Succeed())
-
-						ginkgo.By("verifying final cluster state")
-						finalCluster, err := h.Client.GetCluster(ctx, clusterID)
-						Expect(err).NotTo(HaveOccurred(), "failed to get final cluster state")
-						Expect(finalCluster.Status).NotTo(BeNil(), "cluster status should be present")
-						Expect(finalCluster.Status.Phase).To(Equal(openapi.Ready), "cluster phase should be Ready")
-						**/
-		})
-
-		ginkgo.AfterEach(func(ctx context.Context) {
-			// Skip cleanup if helper not initialized or no cluster created
-			if h == nil || clusterID == "" {
-				return
-			}
-
-			ginkgo.By("cleaning up cluster " + clusterID)
-			if err := h.CleanupTestCluster(ctx, clusterID); err != nil {
-				ginkgo.GinkgoWriter.Printf("Warning: failed to cleanup cluster %s: %v\n", clusterID, err)
-			}
-		})
-	},
+    ginkgo.Label(labels.Tier0),
+    func() {
+        var h *helper.Helper
+        var clusterID string
+
+        ginkgo.BeforeEach(func() {
+            h = helper.New()
+        })
+
+        // This test validates the end-to-end cluster lifecycle workflow:
+        // 1. Cluster creation via API with initial condition validation
+        // 2. Required adapter execution with comprehensive metadata validation
+        // 3. Final cluster state verification (Ready and Available conditions)
+        ginkgo.It("should validate complete workflow for clusters resource type from creation to Ready state",
+            func(ctx context.Context) {
+                ginkgo.By("Submit an API request to create a Cluster resource")
+                cluster, err := h.Client.CreateClusterFromPayload(ctx, "testdata/payloads/clusters/cluster-request.json")
+                Expect(err).NotTo(HaveOccurred(), "failed to create cluster")
+                Expect(cluster.Id).NotTo(BeNil(), "cluster ID should be generated")
+                clusterID = *cluster.Id
+                ginkgo.GinkgoWriter.Printf("Created cluster ID: %s\n", clusterID)
+                Expect(cluster.Status).NotTo(BeNil(), "cluster status should be present")
+
+                ginkgo.By("Verify initial status of cluster")
+                // Verify initial conditions are False, indicating workflow has not completed yet
+                // This ensures the cluster starts in the correct initial state
+                hasReadyFalse := h.HasResourceCondition(cluster.Status.Conditions,
+                    client.ConditionTypeReady, openapi.ResourceConditionStatusFalse)
+                Expect(hasReadyFalse).To(BeTrue(),
+                    "initial cluster conditions should have Ready=False")
+
+                hasAvailableFalse := h.HasResourceCondition(cluster.Status.Conditions,
+                    client.ConditionTypeAvailable, openapi.ResourceConditionStatusFalse)
+                Expect(hasAvailableFalse).To(BeTrue(),
+                    "initial cluster conditions should have Available=False")
+
+                ginkgo.By("Verify required adapter execution results")
+                // Validate required adapters from config have completed successfully
+                // If an adapter fails, we can identify which specific adapter failed
+                Eventually(func(g Gomega) {
+                    statuses, err := h.Client.GetClusterStatuses(ctx, clusterID)
+                    g.Expect(err).NotTo(HaveOccurred(), "failed to get cluster statuses")
+                    g.Expect(statuses.Items).NotTo(BeEmpty(), "at least one adapter should have executed")
+
+                    // Build a map of adapter statuses for easy lookup
+                    adapterMap := make(map[string]openapi.AdapterStatus)
+                    for _, adapter := range statuses.Items {
+                        adapterMap[adapter.Adapter] = adapter
+                    }
+
+                    // Validate each required adapter from config
+                    for _, requiredAdapter := range h.Cfg.Adapters.Cluster {
+                        adapter, exists := adapterMap[requiredAdapter]
+                        g.Expect(exists).To(BeTrue(),
+                            "required adapter %s should be present in adapter statuses", requiredAdapter)
+
+                        // Validate adapter-level metadata
+                        g.Expect(adapter.CreatedTime).NotTo(BeZero(),
+                            "adapter %s should have valid created_time", adapter.Adapter)
+                        g.Expect(adapter.LastReportTime).NotTo(BeZero(),
+                            "adapter %s should have valid last_report_time", adapter.Adapter)
+                        g.Expect(adapter.ObservedGeneration).To(Equal(int32(1)),
+                            "adapter %s should have observed_generation=1 for new creation request", adapter.Adapter)
+
+                        hasApplied := h.HasAdapterCondition(
+                            adapter.Conditions,
+                            client.ConditionTypeApplied,
+                            openapi.AdapterConditionStatusTrue,
+                        )
+                        g.Expect(hasApplied).To(BeTrue(),
+                            "adapter %s should have Applied=True", adapter.Adapter)
+
+                        hasAvailable := h.HasAdapterCondition(
+                            adapter.Conditions,
+                            client.ConditionTypeAvailable,
+                            openapi.AdapterConditionStatusTrue,
+                        )
+                        g.Expect(hasAvailable).To(BeTrue(),
+                            "adapter %s should have Available=True", adapter.Adapter)
+
+                        hasHealth := h.HasAdapterCondition(
+                            adapter.Conditions,
+                            client.ConditionTypeHealth,
+                            openapi.AdapterConditionStatusTrue,
+                        )
+                        g.Expect(hasHealth).To(BeTrue(),
+                            "adapter %s should have Health=True", adapter.Adapter)
+
+                        // Validate condition metadata for each condition
+                        for _, condition := range adapter.Conditions {
+                            g.Expect(condition.Reason).NotTo(BeNil(),
+                                "adapter %s condition %s should have non-nil reason", adapter.Adapter, condition.Type)
+                            g.Expect(*condition.Reason).NotTo(BeEmpty(),
+                                "adapter %s condition %s should have non-empty reason", adapter.Adapter, condition.Type)
+
+                            g.Expect(condition.Message).NotTo(BeNil(),
+                                "adapter %s condition %s should have non-nil message", adapter.Adapter, condition.Type)
+                            g.Expect(*condition.Message).NotTo(BeEmpty(),
+                                "adapter %s condition %s should have non-empty message", adapter.Adapter, condition.Type)
+
+                            g.Expect(condition.LastTransitionTime).NotTo(BeZero(),
+                                "adapter %s condition %s should have valid last_transition_time", adapter.Adapter, condition.Type)
+                        }
+                    }
+                }, h.Cfg.Timeouts.Adapter.Processing, h.Cfg.Polling.Interval).Should(Succeed())
+
+                ginkgo.By("Verify final cluster state")
+                // Wait for cluster Ready condition and verify both Ready and Available conditions are True
+                // This confirms the cluster has reached the desired end state
+                err = h.WaitForClusterCondition(
+                    ctx,
+                    clusterID,
+                    client.ConditionTypeReady,
+                    openapi.ResourceConditionStatusTrue,
+                    h.Cfg.Timeouts.Cluster.Ready,
+                )
+                Expect(err).NotTo(HaveOccurred(), "cluster Ready condition should transition to True")
+
+                finalCluster, err := h.Client.GetCluster(ctx, clusterID)
+                Expect(err).NotTo(HaveOccurred(), "failed to get final cluster state")
+                Expect(finalCluster.Status).NotTo(BeNil(), "cluster status should be present")
+
+                hasReady := h.HasResourceCondition(finalCluster.Status.Conditions,
+                    client.ConditionTypeReady, openapi.ResourceConditionStatusTrue)
+                Expect(hasReady).To(BeTrue(), "cluster should have Ready=True condition")
+
+                hasAvailable := h.HasResourceCondition(finalCluster.Status.Conditions,
+                    client.ConditionTypeAvailable, openapi.ResourceConditionStatusTrue)
+                Expect(hasAvailable).To(BeTrue(), "cluster should have Available=True condition")
+
+                // Validate observedGeneration for Ready and Available conditions
+                for _, condition := range finalCluster.Status.Conditions {
+                    if condition.Type == client.ConditionTypeReady || condition.Type == client.ConditionTypeAvailable {
+                        Expect(condition.ObservedGeneration).To(Equal(int32(1)),
+                            "cluster condition %s should have observed_generation=1 for new creation request", condition.Type)
+                    }
+                }
+            })
+
+        ginkgo.AfterEach(func(ctx context.Context) {
+            // Skip cleanup if helper not initialized or no cluster created
+            if h == nil || clusterID == "" {
+                return
+            }
+
+            ginkgo.By("cleaning up cluster " + clusterID)
+            if err := h.CleanupTestCluster(ctx, clusterID); err != nil {
+                ginkgo.GinkgoWriter.Printf("Warning: failed to cleanup cluster %s: %v\n", clusterID, err)
+            }
+        })
+    },
 )