Skip to content

Commit 4aa1019

Browse files
authored
Add some more unit tests for BBR (#545)
1 parent 9bcbfe4 commit 4aa1019

File tree

2 files changed

+156
-6
lines changed

2 files changed

+156
-6
lines changed

Diff for: pkg/body-based-routing/handlers/server.go

+11-6
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (s *Server) Process(srv extProcPb.ExternalProcessor_ProcessServer) error {
4646
loggerVerbose := logger.V(logutil.VERBOSE)
4747
loggerVerbose.Info("Processing")
4848

49-
var streamedBody []byte
49+
streamedBody := &streamedBody{}
5050

5151
for {
5252
select {
@@ -105,17 +105,22 @@ func (s *Server) Process(srv extProcPb.ExternalProcessor_ProcessServer) error {
105105
}
106106
}
107107

108-
func (s *Server) processRequestBody(ctx context.Context, body *extProcPb.HttpBody, streamedBody []byte, logger logr.Logger) ([]*extProcPb.ProcessingResponse, error) {
108+
type streamedBody struct {
109+
body []byte
110+
}
111+
112+
func (s *Server) processRequestBody(ctx context.Context, body *extProcPb.HttpBody, streamedBody *streamedBody, logger logr.Logger) ([]*extProcPb.ProcessingResponse, error) {
109113
loggerVerbose := logger.V(logutil.VERBOSE)
110114

111115
var requestBody map[string]interface{}
112116
if s.streaming {
113117
// In the stream case, we can receive multiple request bodies.
114-
streamedBody = append(streamedBody, body.Body...)
115-
116-
if body.EndOfStream {
118+
if !body.EndOfStream {
119+
streamedBody.body = append(streamedBody.body, body.Body...)
120+
return nil, nil
121+
} else {
117122
loggerVerbose.Info("Flushing stream buffer")
118-
err := json.Unmarshal(streamedBody, &requestBody)
123+
err := json.Unmarshal(streamedBody.body, &requestBody)
119124
if err != nil {
120125
logger.V(logutil.DEFAULT).Error(err, "Error unmarshaling request body")
121126
}

Diff for: pkg/body-based-routing/handlers/server_test.go

+145
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
/*
2+
Copyright 2025 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package handlers
18+
19+
import (
20+
"context"
21+
"testing"
22+
23+
basepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
24+
extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
25+
"github.com/google/go-cmp/cmp"
26+
"google.golang.org/protobuf/testing/protocmp"
27+
"sigs.k8s.io/controller-runtime/pkg/log"
28+
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
29+
)
30+
31+
func TestProcessRequestBody(t *testing.T) {
32+
ctx := logutil.NewTestLoggerIntoContext(context.Background())
33+
34+
cases := []struct {
35+
desc string
36+
streaming bool
37+
bodys []*extProcPb.HttpBody
38+
want []*extProcPb.ProcessingResponse
39+
}{
40+
{
41+
desc: "no-streaming",
42+
bodys: []*extProcPb.HttpBody{
43+
{
44+
Body: mapToBytes(t, map[string]any{
45+
"model": "foo",
46+
}),
47+
},
48+
},
49+
want: []*extProcPb.ProcessingResponse{
50+
{
51+
Response: &extProcPb.ProcessingResponse_RequestBody{
52+
RequestBody: &extProcPb.BodyResponse{
53+
Response: &extProcPb.CommonResponse{
54+
// Necessary so that the new headers are used in the routing decision.
55+
ClearRouteCache: true,
56+
HeaderMutation: &extProcPb.HeaderMutation{
57+
SetHeaders: []*basepb.HeaderValueOption{
58+
{
59+
Header: &basepb.HeaderValue{
60+
Key: modelHeader,
61+
RawValue: []byte("foo"),
62+
},
63+
},
64+
},
65+
},
66+
},
67+
},
68+
},
69+
},
70+
},
71+
},
72+
{
73+
desc: "streaming",
74+
streaming: true,
75+
bodys: []*extProcPb.HttpBody{
76+
{
77+
Body: mapToBytes(t, map[string]any{
78+
"model": "foo",
79+
}),
80+
},
81+
{
82+
EndOfStream: true,
83+
},
84+
},
85+
want: []*extProcPb.ProcessingResponse{
86+
{
87+
Response: &extProcPb.ProcessingResponse_RequestHeaders{
88+
RequestHeaders: &extProcPb.HeadersResponse{
89+
Response: &extProcPb.CommonResponse{
90+
ClearRouteCache: true,
91+
HeaderMutation: &extProcPb.HeaderMutation{
92+
SetHeaders: []*basepb.HeaderValueOption{
93+
{
94+
Header: &basepb.HeaderValue{
95+
Key: modelHeader,
96+
RawValue: []byte("foo"),
97+
},
98+
},
99+
},
100+
},
101+
},
102+
},
103+
},
104+
},
105+
{
106+
Response: &extProcPb.ProcessingResponse_RequestBody{
107+
RequestBody: &extProcPb.BodyResponse{
108+
Response: &extProcPb.CommonResponse{
109+
BodyMutation: &extProcPb.BodyMutation{
110+
Mutation: &extProcPb.BodyMutation_StreamedResponse{
111+
StreamedResponse: &extProcPb.StreamedBodyResponse{
112+
Body: mapToBytes(t, map[string]any{
113+
"model": "foo",
114+
}),
115+
EndOfStream: true,
116+
},
117+
},
118+
},
119+
},
120+
},
121+
},
122+
},
123+
},
124+
},
125+
}
126+
127+
for _, tc := range cases {
128+
t.Run(tc.desc, func(t *testing.T) {
129+
srv := NewServer(tc.streaming)
130+
streamedBody := &streamedBody{}
131+
for i, body := range tc.bodys {
132+
got, err := srv.processRequestBody(context.Background(), body, streamedBody, log.FromContext(ctx))
133+
if err != nil {
134+
t.Fatalf("processRequestBody(): %v", err)
135+
}
136+
137+
if i == len(tc.bodys)-1 {
138+
if diff := cmp.Diff(tc.want, got, protocmp.Transform()); diff != "" {
139+
t.Errorf("processRequestBody returned unexpected response, diff(-want, +got): %v", diff)
140+
}
141+
}
142+
}
143+
})
144+
}
145+
}

0 commit comments

Comments
 (0)