Refactor(conformance): merge similar helper functions and make the condition check on inferencePool stricter (#1261)

* refactor restructure the conformance tests.

* refactor merge helper functions and strict the test cases.

Author: zetxqx

conformance/tests/epp_unavailable_fail_open.go

@@ -57,7 +57,7 @@ var EppUnAvailableFailOpen = suite.ConformanceTest{
 		httpRouteNN := types.NamespacedName{Name: "httproute-for-failopen-pool-gw", Namespace: resources.AppBackendNamespace}
 		gatewayNN := resources.SecondaryGatewayNN
 		k8sutils.HTTPRouteMustBeAcceptedAndResolved(t, s.Client, s.TimeoutConfig, httpRouteNN, gatewayNN)
-		k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, resources.SecondaryInferencePoolNN)
+		k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, resources.SecondaryInferencePoolNN, gatewayNN)
 		gwAddr := k8sutils.GetGatewayEndpoint(t, s.Client, s.TimeoutConfig, gatewayNN)
 
 		pods, err := k8sutils.GetPodsWithLabel(t, s.Client, resources.AppBackendNamespace,

conformance/tests/gateway_following_epp_routing.go

@@ -63,7 +63,7 @@ var GatewayFollowingEPPRouting = suite.ConformanceTest{
 
 		t.Log("Verifying HTTPRoute and InferencePool are accepted and the Gateway has an address.")
 		k8sutils.HTTPRouteMustBeAcceptedAndResolved(t, s.Client, s.TimeoutConfig, httpRouteNN, gatewayNN)
-		k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN)
+		k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN, gatewayNN)
 		gwAddr := k8sutils.GetGatewayEndpoint(t, s.Client, s.TimeoutConfig, gatewayNN)
 
 		t.Logf("Fetching backend pods with labels: %v", backendPodLabels)

conformance/tests/inferencepool_accepted.go

@@ -43,14 +43,15 @@ var InferencePoolAccepted = suite.ConformanceTest{
 	},
 	Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
 		poolNN := resources.PrimaryInferencePoolNN
+		gatewayNN := resources.PrimaryGatewayNN
 
 		t.Run("InferencePool should have Accepted condition set to True", func(t *testing.T) {
 			acceptedCondition := metav1.Condition{
 				Type:   string(gatewayv1.GatewayConditionAccepted),
 				Status: metav1.ConditionTrue,
 				Reason: "", // "" means we don't strictly check the Reason for this basic test.
 			}
-			k8sutils.InferencePoolMustHaveCondition(t, s.Client, poolNN, acceptedCondition)
+			k8sutils.InferencePoolMustHaveCondition(t, s.Client, poolNN, gatewayNN, acceptedCondition)
 		})
 	},
 }

conformance/tests/inferencepool_httproute_port_validation.go

@@ -52,7 +52,7 @@ var InferencePoolHTTPRoutePortValidation = suite.ConformanceTest{
 			path := "/test-port-unspecified"
 
 			k8sutils.HTTPRouteMustBeAcceptedAndResolved(t, s.Client, s.TimeoutConfig, routeNN, gatewayNN)
-			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN)
+			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN, gatewayNN)
 
 			trafficutils.MakeRequestAndExpectSuccess(
 				t,
@@ -74,7 +74,7 @@ var InferencePoolHTTPRoutePortValidation = suite.ConformanceTest{
 			path := "/test-port-matching"
 
 			k8sutils.HTTPRouteMustBeAcceptedAndResolved(t, s.Client, s.TimeoutConfig, routeNN, gatewayNN)
-			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN)
+			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN, gatewayNN)
 
 			trafficutils.MakeRequestAndExpectSuccess(
 				t,
@@ -97,7 +97,7 @@ var InferencePoolHTTPRoutePortValidation = suite.ConformanceTest{
 			path := "/test-port-non-matching"
 
 			k8sutils.HTTPRouteMustBeAcceptedAndResolved(t, s.Client, s.TimeoutConfig, routeNN, gatewayNN)
-			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN)
+			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN, gatewayNN)
 
 			trafficutils.MakeRequestAndExpectSuccess(
 				t,

conformance/tests/inferencepool_invalid_epp_service.go

@@ -65,7 +65,7 @@ var InferencePoolInvalidEPPService = suite.ConformanceTest{
 				Status: metav1.ConditionFalse,
 				Reason: "", // "" means we don't strictly check the Reason for this basic test.
 			}
-			k8sutils.InferencePoolMustHaveCondition(t, s.Client, poolNN, acceptedCondition)
+			k8sutils.InferencePoolMustHaveCondition(t, s.Client, poolNN, gwNN, acceptedCondition)
 		})
 
 		t.Run("Request to a route with an invalid backend reference receives a 500 response", func(t *testing.T) {

conformance/tests/inferencepool_resolvedrefs_condition.go

@@ -72,7 +72,8 @@ var InferencePoolParentStatus = suite.ConformanceTest{
 		gwSecondaryAddr := k8sutils.GetGatewayEndpoint(t, s.Client, s.TimeoutConfig, gatewaySecondaryNN)
 
 		t.Run("InferencePool should show Accepted:True by parents and be routable via multiple HTTPRoutes", func(t *testing.T) {
-			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN)
+			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN, gatewayPrimaryNN)
+			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN, gatewaySecondaryNN)
 			t.Logf("InferencePool %s has parent status Accepted:True as expected with two references.", poolNN.String())
 
 			trafficutils.MakeRequestAndExpectSuccess(
@@ -112,7 +113,7 @@ var InferencePoolParentStatus = suite.ConformanceTest{
 			t.Logf("Waiting for %v for Gateway conditions to update after deleting HTTPRoute %s", inferenceTimeoutConfig.HTTPRouteDeletionReconciliationTimeout, httpRoutePrimaryNN.String())
 			time.Sleep(inferenceTimeoutConfig.HTTPRouteDeletionReconciliationTimeout)
 
-			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN)
+			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN, gatewaySecondaryNN)
 			t.Logf("InferencePool %s still has parent status Accepted:True as expected with one reference remaining.", poolNN.String())
 
 			trafficutils.MakeRequestAndExpectSuccess(

conformance/utils/kubernetes/helpers.go

@@ -69,7 +69,7 @@ func checkCondition(t *testing.T, conditions []metav1.Condition, expectedConditi
 // InferencePoolMustHaveCondition waits for the specified InferencePool resource
 // to exist and report the expected status condition within one of its parent statuses.
 // It polls the InferencePool's status until the condition is met or the timeout occurs.
-func InferencePoolMustHaveCondition(t *testing.T, c client.Reader, poolNN types.NamespacedName, expectedCondition metav1.Condition) {
+func InferencePoolMustHaveCondition(t *testing.T, c client.Reader, poolNN types.NamespacedName, gateway types.NamespacedName, expectedCondition metav1.Condition) {
 	t.Helper() // Marks this function as a test helper
 
 	var timeoutConfig = config.DefaultInferenceExtensionTimeoutConfig()
@@ -104,9 +104,11 @@ func InferencePoolMustHaveCondition(t *testing.T, c client.Reader, poolNN types.
 			}
 
 			for _, parentStatus := range pool.Status.Parents {
-				if checkCondition(t, parentStatus.Conditions, expectedCondition) {
-					conditionFound = true
-					return true, nil
+				if parentStatus.GatewayRef.Namespace != nil && string(*parentStatus.GatewayRef.Namespace) == gateway.Namespace && string(parentStatus.GatewayRef.Name) == gateway.Name {
+					if checkCondition(t, parentStatus.Conditions, expectedCondition) {
+						conditionFound = true
+						return true, nil
+					}
 				}
 			}
 			return false, nil
@@ -242,8 +244,8 @@ func HTTPRouteMustBeAcceptedAndResolved(t *testing.T, c client.Client, timeoutCo
 
 // InferencePoolMustBeAcceptedByParent waits for the specified InferencePool
 // to report an Accepted condition with status True and reason "Accepted"
-// from at least one of its parent Gateways.
-func InferencePoolMustBeAcceptedByParent(t *testing.T, c client.Reader, poolNN types.NamespacedName) {
+// from the input Gateway.
+func InferencePoolMustBeAcceptedByParent(t *testing.T, c client.Reader, poolNN, gatewayNN types.NamespacedName) {
 	t.Helper()
 
 	acceptedByParentCondition := metav1.Condition{
@@ -253,28 +255,10 @@ func InferencePoolMustBeAcceptedByParent(t *testing.T, c client.Reader, poolNN t
 	}
 
 	t.Logf("Waiting for InferencePool %s to be Accepted by a parent Gateway (Reason: %s)", poolNN.String(), gatewayv1.GatewayReasonAccepted)
-	InferencePoolMustHaveCondition(t, c, poolNN, acceptedByParentCondition)
+	InferencePoolMustHaveCondition(t, c, poolNN, gatewayNN, acceptedByParentCondition)
 	t.Logf("InferencePool %s is Accepted by a parent Gateway (Reason: %s)", poolNN.String(), gatewayv1.GatewayReasonAccepted)
 }
 
-// InferencePoolMustBeRouteAccepted waits for the specified InferencePool resource
-// to exist and report an Accepted condition with Type=RouteConditionAccepted,
-// Status=True, and Reason=RouteReasonAccepted within one of its parent statuses.
-func InferencePoolMustBeRouteAccepted(t *testing.T, c client.Reader, poolNN types.NamespacedName) {
-	t.Helper()
-
-	expectedPoolCondition := metav1.Condition{
-		Type:   string(gatewayv1.RouteConditionAccepted),
-		Status: metav1.ConditionTrue,
-		Reason: string(gatewayv1.RouteReasonAccepted),
-	}
-
-	// Call the existing generic helper with the predefined condition
-	InferencePoolMustHaveCondition(t, c, poolNN, expectedPoolCondition)
-	t.Logf("InferencePool %s successfully verified with RouteAccepted condition (Type: %s, Status: %s, Reason: %s).",
-		poolNN.String(), expectedPoolCondition.Type, expectedPoolCondition.Status, expectedPoolCondition.Reason)
-}
-
 // HTTPRouteAndInferencePoolMustBeAcceptedAndRouteAccepted waits for the specified HTTPRoute
 // to be Accepted and have its references resolved by the specified Gateway,
 // AND for the specified InferencePool to be "RouteAccepted" using the specific
@@ -289,7 +273,7 @@ func HTTPRouteAndInferencePoolMustBeAcceptedAndRouteAccepted(
 	var timeoutConfig = config.DefaultInferenceExtensionTimeoutConfig()
 
 	HTTPRouteMustBeAcceptedAndResolved(t, c, timeoutConfig.TimeoutConfig, routeNN, gatewayNN)
-	InferencePoolMustBeRouteAccepted(t, c, poolNN)
+	InferencePoolMustBeAcceptedByParent(t, c, poolNN, gatewayNN)
 	t.Logf("Successfully verified: HTTPRoute %s (Gateway %s) is Accepted & Resolved, and InferencePool %s is RouteAccepted.",
 		routeNN.String(), gatewayNN.String(), poolNN.String())
 }