From 358a755e43b07b9454904df9d3c3fae3340058f1 Mon Sep 17 00:00:00 2001 From: rasmith Date: Tue, 28 Apr 2026 13:14:59 -0500 Subject: [PATCH] [CI][AMD][BugFix] Update request URL in test_moriio_connector to match vllm-router compatibility changes (#41076) Signed-off-by: Randall Smith --- .../unit/test_moriio_connector.py | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/v1/kv_connector/unit/test_moriio_connector.py b/tests/v1/kv_connector/unit/test_moriio_connector.py index 902957e183..16d34d9089 100644 --- a/tests/v1/kv_connector/unit/test_moriio_connector.py +++ b/tests/v1/kv_connector/unit/test_moriio_connector.py @@ -3,6 +3,7 @@ import importlib.util import os import subprocess +import uuid from unittest.mock import MagicMock, patch import msgspec @@ -99,6 +100,11 @@ def _setup_kv_transfer_request( "remote_engine_id": "test_engine", } ) + zmq_addr = f"host:{remote_host},handshake:{fake_port},notify:{fake_port}" + fake_uuid = uuid.uuid4().hex + request.request_id = ( + f"___prefill_addr_{zmq_addr}___decode_addr_{zmq_addr}_{fake_uuid}" + ) return request @@ -254,13 +260,14 @@ def test_write_mode_saves_local_block_ids(): do_remote_decode=True, do_remote_prefill=False, ) + + # Setup KV transfer params and embed ZMQ addrs in request_id before + # adding to scheduler so the ID is consistent everywhere. + request = _setup_kv_transfer_request(request) request_id = request.request_id scheduler.add_request(request) - # Fake Config - request = _setup_kv_transfer_request(request) - # Remote Prefill, triggers MoRIIOConnectorMetadata. scheduler_output = scheduler.schedule() kv_connector_metadata = scheduler_output.kv_connector_metadata @@ -312,13 +319,14 @@ def test_write_mode_with_chunked_prefill_saves_local_block_ids(): do_remote_decode=True, do_remote_prefill=False, ) + + # Setup KV transfer params and embed ZMQ addrs in request_id before + # adding to scheduler so the ID is consistent everywhere. + request = _setup_kv_transfer_request(request) request_id = request.request_id scheduler.add_request(request) - # Fake Config - request = _setup_kv_transfer_request(request) - # Remote Prefill with chunked prefill, triggers multiple schedules. expected_counts = [(0, 0, 0), (0, 0, 0), (1, 0, 0)] kv_connector_metadata = None @@ -363,6 +371,10 @@ def test_read_mode_loads_remote_block_ids(moriio_read_mode): do_remote_decode=False, do_remote_prefill=True, ) + + # Setup KV transfer params and embed ZMQ addrs in request_id before + # adding to scheduler so the ID is consistent everywhere. + request = _setup_kv_transfer_request(request) request_id = request.request_id scheduler.add_request(request) @@ -370,8 +382,6 @@ def test_read_mode_loads_remote_block_ids(moriio_read_mode): 0 ].req_to_blocks[request_id] - request = _setup_kv_transfer_request(request) - # Set remote block ids to be fetched. request.kv_transfer_params["remote_block_ids"] = block_list