diff --git a/scenarios/invite_peerout_rewrite/0001_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0001_test.yml.tt2 index 72a51010..aab6ff9c 100644 --- a/scenarios/invite_peerout_rewrite/0001_test.yml.tt2 +++ b/scenarios/invite_peerout_rewrite/0001_test.yml.tt2 @@ -21,9 +21,9 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^INVITE sip:004321001@' - - 'Contact: sip:testuser1002@' - - 'To: ;tag=[\w-]+' - - 'To: ' + - 'INVITE sip:4321001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ' - 'CSeq: \d+ INVITE' - 'P-LB-Uptime: \d+' - - 'P-Asserted-Identity: ' - - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]' - - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002' - - 'P-NGCP-Callee-Info: ;ip=127.0.2.1;port=\d+' - - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:127.0.2.1:\d+%3blr%3btransport%3dudp' + - 'P-Asserted-Identity: ' + - 'P-Caller-UUID: [% invite_peerout_rewrite_scenarios_test.testuser1002.uuid %]' + - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]' + - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp' - 'Content-Type: application/sdp' - 'Contact: ' - 'Content-Length:\s+\d+' sip_out: - [ 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ - 'INVITE sip:4321001@127.0.2.1:\d+;transport=udp SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ', + 'INVITE sip:4321001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', 'P-LB-Uptime: \d+', - 'P-Asserted-Identity: ', - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002', - 'P-NGCP-Callee-Info: ;ip=127.0.2.1;port=\d+', - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:127.0.2.1:\d+%3blr%3btransport%3dudp', + 'P-Asserted-Identity: ', + 'P-Caller-UUID: [% invite_peerout_rewrite_scenarios_test.testuser1002.uuid %]', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_peerout_rewrite_scenarios_test.testuser1002.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=\d+', + 'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp', 'Content-Type: application/sdp', 'Contact: ', 'Content-Length:\s+\d+', diff --git a/scenarios/invite_peerout_rewrite/0008_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0008_test.yml.tt2 index 96cdf7aa..ea4cf28b 100644 --- a/scenarios/invite_peerout_rewrite/0008_test.yml.tt2 +++ b/scenarios/invite_peerout_rewrite/0008_test.yml.tt2 @@ -15,12 +15,12 @@ flow: sip_in: - '^SIP/2.0 180 Ringing' - 'CSeq: 2 INVITE' - - 'From: