Skip to content

Add some more unit tests for BBR #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions pkg/body-based-routing/handlers/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (s *Server) Process(srv extProcPb.ExternalProcessor_ProcessServer) error {
loggerVerbose := logger.V(logutil.VERBOSE)
loggerVerbose.Info("Processing")

var streamedBody []byte
streamedBody := &streamedBody{}

for {
select {
Expand Down Expand Up @@ -105,17 +105,22 @@ func (s *Server) Process(srv extProcPb.ExternalProcessor_ProcessServer) error {
}
}

func (s *Server) processRequestBody(ctx context.Context, body *extProcPb.HttpBody, streamedBody []byte, logger logr.Logger) ([]*extProcPb.ProcessingResponse, error) {
type streamedBody struct {
body []byte
}

func (s *Server) processRequestBody(ctx context.Context, body *extProcPb.HttpBody, streamedBody *streamedBody, logger logr.Logger) ([]*extProcPb.ProcessingResponse, error) {
loggerVerbose := logger.V(logutil.VERBOSE)

var requestBody map[string]interface{}
if s.streaming {
// In the stream case, we can receive multiple request bodies.
streamedBody = append(streamedBody, body.Body...)

if body.EndOfStream {
if !body.EndOfStream {
streamedBody.body = append(streamedBody.body, body.Body...)
return nil, nil
} else {
loggerVerbose.Info("Flushing stream buffer")
err := json.Unmarshal(streamedBody, &requestBody)
err := json.Unmarshal(streamedBody.body, &requestBody)
if err != nil {
logger.V(logutil.DEFAULT).Error(err, "Error unmarshaling request body")
}
Expand Down
145 changes: 145 additions & 0 deletions pkg/body-based-routing/handlers/server_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
/*
Copyright 2025 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package handlers

import (
"context"
"testing"

basepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
"github.com/google/go-cmp/cmp"
"google.golang.org/protobuf/testing/protocmp"
"sigs.k8s.io/controller-runtime/pkg/log"
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
)

func TestProcessRequestBody(t *testing.T) {
ctx := logutil.NewTestLoggerIntoContext(context.Background())

cases := []struct {
desc string
streaming bool
bodys []*extProcPb.HttpBody
want []*extProcPb.ProcessingResponse
}{
{
desc: "no-streaming",
bodys: []*extProcPb.HttpBody{
{
Body: mapToBytes(t, map[string]any{
"model": "foo",
}),
},
},
want: []*extProcPb.ProcessingResponse{
{
Response: &extProcPb.ProcessingResponse_RequestBody{
RequestBody: &extProcPb.BodyResponse{
Response: &extProcPb.CommonResponse{
// Necessary so that the new headers are used in the routing decision.
ClearRouteCache: true,
HeaderMutation: &extProcPb.HeaderMutation{
SetHeaders: []*basepb.HeaderValueOption{
{
Header: &basepb.HeaderValue{
Key: modelHeader,
RawValue: []byte("foo"),
},
},
},
},
},
},
},
},
},
},
{
desc: "streaming",
streaming: true,
bodys: []*extProcPb.HttpBody{
{
Body: mapToBytes(t, map[string]any{
"model": "foo",
}),
},
{
EndOfStream: true,
},
},
want: []*extProcPb.ProcessingResponse{
{
Response: &extProcPb.ProcessingResponse_RequestHeaders{
RequestHeaders: &extProcPb.HeadersResponse{
Response: &extProcPb.CommonResponse{
ClearRouteCache: true,
HeaderMutation: &extProcPb.HeaderMutation{
SetHeaders: []*basepb.HeaderValueOption{
{
Header: &basepb.HeaderValue{
Key: modelHeader,
RawValue: []byte("foo"),
},
},
},
},
},
},
},
},
{
Response: &extProcPb.ProcessingResponse_RequestBody{
RequestBody: &extProcPb.BodyResponse{
Response: &extProcPb.CommonResponse{
BodyMutation: &extProcPb.BodyMutation{
Mutation: &extProcPb.BodyMutation_StreamedResponse{
StreamedResponse: &extProcPb.StreamedBodyResponse{
Body: mapToBytes(t, map[string]any{
"model": "foo",
}),
EndOfStream: true,
},
},
},
},
},
},
},
},
},
}

for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
srv := NewServer(tc.streaming)
streamedBody := &streamedBody{}
for i, body := range tc.bodys {
got, err := srv.processRequestBody(context.Background(), body, streamedBody, log.FromContext(ctx))
if err != nil {
t.Fatalf("processRequestBody(): %v", err)
}

if i == len(tc.bodys)-1 {
if diff := cmp.Diff(tc.want, got, protocmp.Transform()); diff != "" {
t.Errorf("processRequestBody returned unexpected response, diff(-want, +got): %v", diff)
}
}
}
})
}
}