e2e

Author: dspo

internal/provider/adc/translator/httproute.go

@@ -9,6 +9,7 @@ import (
 	"go.uber.org/zap"
 	discoveryv1 "k8s.io/api/discovery/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/ptr"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	"github.com/api7/api7-ingress-controller/api/common"
@@ -352,6 +353,7 @@ func (t *Translator) TranslateHTTPRoute(tctx *provider.TranslateContext, httpRou
 			route.Name = name
 			route.ID = id.GenID(name)
 			route.Labels = labels
+			route.EnableWebsocket = ptr.To(true)
 			routes = append(routes, route)
 		}
 		t.fillHTTPRoutePolicies(tctx, rule, routes)

test/e2e/gatewayapi/httproute.go

@@ -262,6 +262,7 @@ spec:
     - path:
         type: Exact
         value: /get
+      name: get
     backendRefs:
     - name: httpbin-service-e2e-test
       port: 80
@@ -288,6 +289,30 @@ spec:
     backendRefs:
     - name: httpbin-service-e2e-test
       port: 80
+`
+		var httpRoutePolicy = `
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoutePolicy
+metadata:
+  name: httpRoutePolicy0
+spec:
+  targetRefs:
+  - group: gateway.apisix.io
+    kind: HTTPRoute
+    name: httpbin
+    sectionName: get
+  - group: gateway.apisix.io
+    kind: HTTPRoute
+    name: httpbin
+    sectionName: put
+- group: gateway.apisix.io
+    kind: HTTPRoute
+    name: httpbin-1
+    sectionName: get
+priority: 10
+vars:
+- ["http_x_hrp_name", "==", "httpRoutePolicy0"]
+- ["arg_hrp_name", "==", "httpRoutePolicy0"]
 `
 
 		var prefixRouteByStatus = `
@@ -396,7 +421,7 @@ spec:
 				Status(404)
 		})
 
-		It("HTTPRoute Vars Match", func() {
+		FIt("HTTPRoute Vars Match", func() {
 			By("create HTTPRoute")
 			ResourceApplied("HTTPRoute", "httpbin", varsRoute, 1)
 
@@ -413,6 +438,26 @@ spec:
 				WithHeader("X-Route-Name", "httpbin").
 				Expect().
 				Status(http.StatusOK)
+
+			By("create HTTPRoutePolicy")
+			ResourceApplied("HTTPRoutePolicy", "httpRoutePolicy0", httpRoutePolicy, 1)
+
+			By("access dataplane to check the HTTPRoutePolicy")
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("httpbin.example").
+				WithHeader("X-Route-Name", "httpbin").
+				Expect().
+				Status(http.StatusNotFound)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("httpbin.example").
+				WithHeader("X-Route-Name", "httpbin").
+				WithHeader("X-HRP-Name", "httpRoutePolicy0").
+				WithQuery("hrp_name", "httpRoutePolicy0").
+				Expect().
+				Status(http.StatusOK)
 		})
 	})