Gateway conformance: Enable HTTPRouteInvalidParentRefNotMatchingListe…

…nerPort test (projectcontour#4913)

Use NoMatchingParent reason when sectionname/port don't match

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
Signed-off-by: yy <yang.yang@daocloud.io>

internal/dag/builder_test.go

@@ -2423,7 +2423,7 @@ func TestDAGInsertGatewayAPI(t *testing.T) {
 					Spec: gatewayapi_v1beta1.HTTPRouteSpec{
 						CommonRouteSpec: gatewayapi_v1beta1.CommonRouteSpec{
 							ParentRefs: []gatewayapi_v1beta1.ParentReference{
-								gatewayapi.GatewayListenerParentRef("projectcontour", "contour", "http-listener"),
+								gatewayapi.GatewayListenerParentRef("projectcontour", "contour", "http-listener", 0),
 							},
 						},
 						Hostnames: []gatewayapi_v1beta1.Hostname{
@@ -2444,7 +2444,7 @@ func TestDAGInsertGatewayAPI(t *testing.T) {
 
 						CommonRouteSpec: gatewayapi_v1beta1.CommonRouteSpec{
 							ParentRefs: []gatewayapi_v1beta1.ParentReference{
-								gatewayapi.GatewayListenerParentRef("projectcontour", "contour", "https-listener"),
+								gatewayapi.GatewayListenerParentRef("projectcontour", "contour", "https-listener", 0),
 							},
 						},
 						Hostnames: []gatewayapi_v1beta1.Hostname{

internal/dag/gatewayapi_processor.go

@@ -285,14 +285,21 @@ func (p *GatewayAPIProcessor) getListenersForRouteParentRef(
 	var selectedListeners []*listenerInfo
 	for _, validListener := range validListeners {
 		// We've already verified the parent ref is for this Gateway,
-		// now check if it has a listener name specified.
-		if routeParentRef.SectionName == nil || *routeParentRef.SectionName == validListener.listener.Name {
+		// now check if it has a listener name and port specified.
+		// Both need to match the listener if specified.
+		if (routeParentRef.SectionName == nil || *routeParentRef.SectionName == validListener.listener.Name) &&
+			(routeParentRef.Port == nil || *routeParentRef.Port == validListener.listener.Port) {
 			selectedListeners = append(selectedListeners, validListener)
 		}
 	}
 
 	if len(selectedListeners) == 0 {
-		routeParentStatusAccessor.AddCondition(gatewayapi_v1beta1.RouteConditionAccepted, metav1.ConditionFalse, status.ReasonListenersNotReady, "No listeners are ready for this parent ref")
+		routeParentStatusAccessor.AddCondition(
+			gatewayapi_v1beta1.RouteConditionAccepted,
+			metav1.ConditionFalse,
+			gatewayapi_v1beta1.RouteReasonNoMatchingParent,
+			"No listeners match this parent ref",
+		)
 		return nil
 	}
 

internal/dag/gatewayapi_processor_test.go

@@ -572,7 +572,7 @@ func TestGetListenersForRouteParentRef(t *testing.T) {
 		},
 
 		"section name specified, matches first listener": {
-			routeParentRef: gatewayapi.GatewayListenerParentRef("projectcontour", "contour", "http-1"),
+			routeParentRef: gatewayapi.GatewayListenerParentRef("projectcontour", "contour", "http-1", 0),
 			routeNamespace: "projectcontour",
 			routeKind:      "HTTPRoute",
 			listeners: []*listenerInfo{
@@ -602,7 +602,7 @@ func TestGetListenersForRouteParentRef(t *testing.T) {
 			want: []int{0},
 		},
 		"section name specified, matches second listener": {
-			routeParentRef: gatewayapi.GatewayListenerParentRef("projectcontour", "contour", "http-2"),
+			routeParentRef: gatewayapi.GatewayListenerParentRef("projectcontour", "contour", "http-2", 0),
 			routeNamespace: "projectcontour",
 			routeKind:      "HTTPRoute",
 			listeners: []*listenerInfo{
@@ -632,7 +632,7 @@ func TestGetListenersForRouteParentRef(t *testing.T) {
 			want: []int{1},
 		},
 		"section name specified, does not match listener": {
-			routeParentRef: gatewayapi.GatewayListenerParentRef("projectcontour", "contour", "different-listener-name"),
+			routeParentRef: gatewayapi.GatewayListenerParentRef("projectcontour", "contour", "different-listener-name", 0),
 			routeNamespace: "projectcontour",
 			routeKind:      "HTTPRoute",
 			listeners: []*listenerInfo{