diff --git a/scripts/acceptance/verify_route_control_plane.sh b/scripts/acceptance/verify_route_control_plane.sh index 25decc00..eedfa11a 100755 --- a/scripts/acceptance/verify_route_control_plane.sh +++ b/scripts/acceptance/verify_route_control_plane.sh @@ -123,7 +123,7 @@ art_dir, group_id, route_id, public_model, shadow_model, shadow_host_id, shadow_ art = Path(art_dir) create_group = json.loads((art / "01-create-group.json").read_text())["logical_group"] update_group = json.loads((art / "06-update-group.json").read_text())["logical_group"] -update_route = json.loads((art / "07-update-route.json").read_text())["logical_group_route"] +update_route = json.loads((art / "07-update-route.json").read_text())["route"] list_routes = json.loads((art / "08-list-routes.json").read_text())["routes"] route_models = json.loads((art / "09-list-route-models.json").read_text())["models"] diff --git a/scripts/test/test_real_host_scripts.sh b/scripts/test/test_real_host_scripts.sh index e827abe3..01660046 100755 --- a/scripts/test/test_real_host_scripts.sh +++ b/scripts/test/test_real_host_scripts.sh @@ -686,7 +686,7 @@ for arg in "$@"; do http://*|https://*) url="$arg" ;; esac done -case "$method $url" in + case "$method $url" in "POST http://crm.example.com/api/logical-groups") printf '%s\n' '{"logical_group":{"logical_group_id":"p2t4-cp-1700000000","display_name":"P2T4 Control Plane p2t4-cp-1700000000","status":"active"}}' ;; @@ -694,10 +694,10 @@ case "$method $url" in printf '%s\n' '{"logical_group_model":{"public_model":"gpt-5.4","status":"active"}}' ;; "POST http://crm.example.com/api/logical-groups/p2t4-cp-1700000000/routes") - printf '%s\n' '{"logical_group_route":{"route_id":"primary-1700000000","logical_group_id":"p2t4-cp-1700000000","name":"Primary primary-1700000000","status":"active","priority":10,"weight":100,"shadow_group_id":"shadow-group-1700000000","shadow_host_id":"shadow-host-1700000000"}}' + printf '%s\n' '{"route":{"route_id":"primary-1700000000","logical_group_id":"p2t4-cp-1700000000","name":"Primary primary-1700000000","status":"active","priority":10,"weight":100,"shadow_group_id":"shadow-group-1700000000","shadow_host_id":"shadow-host-1700000000"}}' ;; "POST http://crm.example.com/api/logical-groups/p2t4-cp-1700000000/routes/primary-1700000000/models") - printf '%s\n' '{"logical_group_route_model":{"public_model":"gpt-5.4","shadow_model":"gpt-5.4","status":"active"}}' + printf '%s\n' '{"route_model":{"public_model":"gpt-5.4","shadow_model":"gpt-5.4","status":"active"}}' ;; "GET http://crm.example.com/api/logical-groups/p2t4-cp-1700000000") printf '%s\n' '{"logical_group":{"logical_group_id":"p2t4-cp-1700000000","display_name":"P2T4 Control Plane p2t4-cp-1700000000","status":"active","models":[{"public_model":"gpt-5.4"}],"routes":[{"route_id":"primary-1700000000"}]}}' @@ -706,7 +706,7 @@ case "$method $url" in printf '%s\n' '{"logical_group":{"logical_group_id":"p2t4-cp-1700000000","display_name":"P2T4 Control Plane Updated p2t4-cp-1700000000","status":"active"}}' ;; "PUT http://crm.example.com/api/logical-groups/p2t4-cp-1700000000/routes/primary-1700000000") - printf '%s\n' '{"logical_group_route":{"route_id":"primary-1700000000","logical_group_id":"p2t4-cp-1700000000","name":"Primary Route Updated","status":"active","priority":12,"weight":80,"shadow_group_id":"shadow-group-1700000000","shadow_host_id":"shadow-host-1700000000"}}' + printf '%s\n' '{"route":{"route_id":"primary-1700000000","logical_group_id":"p2t4-cp-1700000000","name":"Primary Route Updated","status":"active","priority":12,"weight":80,"shadow_group_id":"shadow-group-1700000000","shadow_host_id":"shadow-host-1700000000"}}' ;; "GET http://crm.example.com/api/logical-groups/p2t4-cp-1700000000/routes") printf '%s\n' '{"routes":[{"route_id":"primary-1700000000","weight":80}]}' @@ -774,10 +774,10 @@ case "$method $url" in printf '%s\n' '{"logical_group_model":{"public_model":"gpt-5.4","status":"active"}}' ;; "POST http://crm.example.com/api/logical-groups/p2t4-dp-1700000001/routes") - printf '%s\n' '{"logical_group_route":{"route_id":"primary-1700000001","shadow_group_id":"shadow-group-9","shadow_host_id":"shadow-host-real"}}' + printf '%s\n' '{"route":{"route_id":"primary-1700000001","shadow_group_id":"shadow-group-9","shadow_host_id":"shadow-host-real"}}' ;; "POST http://crm.example.com/api/logical-groups/p2t4-dp-1700000001/routes/primary-1700000001/models") - printf '%s\n' '{"logical_group_route_model":{"public_model":"gpt-5.4","shadow_model":"gpt-5.4"}}' + printf '%s\n' '{"route_model":{"public_model":"gpt-5.4","shadow_model":"gpt-5.4"}}' ;; "POST http://crm.example.com/api/routing/chat/completions") printf '%s\n' '{"request_id":"req-p2t4-dp-1700000001","logical_group_id":"p2t4-dp-1700000001","model":"gpt-5.4","selected_route":{"route_id":"primary-1700000001","shadow_host_id":"shadow-host-real","shadow_group_id":"shadow-group-9","shadow_model":"gpt-5.4"},"forward":{"upstream_status":200,"effective_gateway_key_source":"managed_subscription"}}' @@ -860,15 +860,15 @@ case "$method $url" in ;; "POST http://crm.example.com/api/logical-groups/p2t4-health-1700000002/routes") if [[ "$payload" == *'"route_id":"primary-1700000002"'* ]]; then - write_body '{"logical_group_route":{"route_id":"primary-1700000002"}}' + write_body '{"route":{"route_id":"primary-1700000002"}}' elif [[ "$payload" == *'"route_id":"fallback-1700000002"'* ]]; then - write_body '{"logical_group_route":{"route_id":"fallback-1700000002"}}' + write_body '{"route":{"route_id":"fallback-1700000002"}}' else - write_body '{"logical_group_route":{"route_id":"failing-1700000002"}}' + write_body '{"route":{"route_id":"failing-1700000002"}}' fi ;; "POST http://crm.example.com/api/logical-groups/p2t4-health-1700000002/routes/primary-1700000002/models"|"POST http://crm.example.com/api/logical-groups/p2t4-health-1700000002/routes/fallback-1700000002/models"|"POST http://crm.example.com/api/logical-groups/p2t4-health-1700000002/routes/failing-1700000002/models") - write_body '{"logical_group_route_model":{"public_model":"gpt-5.4","shadow_model":"gpt-5.4"}}' + write_body '{"route_model":{"public_model":"gpt-5.4","shadow_model":"gpt-5.4"}}' ;; "POST http://crm.example.com/api/routing/sticky/cooldowns") write_body '{"route_cooldown":{"route_id":"primary-1700000002","reason":"degraded"}}'