From bcfb522af6c3adc3c880d9df600b3b01cffe19bb Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 29 Oct 2020 12:05:08 +0100 Subject: [PATCH] TT#95650 fix invite_reinvite_*transcoding Change-Id: I37d59c433c0112dcd5449a8afdab5499fec894e9 --- .../0004_test.yml.tt2 | 52 ------------------ .../0005_test.yml.tt2 | 54 ++++++++++++++----- .../0014_test.yml.tt2 | 22 -------- .../0004_test.yml.tt2 | 22 -------- 4 files changed, 42 insertions(+), 108 deletions(-) delete mode 100644 scenarios/invite_reinvite_caller_transcoding/0004_test.yml.tt2 delete mode 100644 scenarios/invite_reinvite_caller_transcoding/0014_test.yml.tt2 delete mode 100644 scenarios/invite_reinvite_transcoding/0004_test.yml.tt2 diff --git a/scenarios/invite_reinvite_caller_transcoding/0004_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0004_test.yml.tt2 deleted file mode 100644 index 095cdebb..00000000 --- a/scenarios/invite_reinvite_caller_transcoding/0004_test.yml.tt2 +++ /dev/null @@ -1,52 +0,0 @@ -flow: - - start|DEFAULT_ROUTE: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_LEG_B: - - start|DEFAULT_SEND: - - exit|DEFAULT_SEND: - - exit|DEFAULT_SEND: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - 'INVITE sip:004321001@127.0.2.1:\d+;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' - - 'Content-Type: application/sdp' - - 'Contact: ' - - 'Content-Length:\s+\d+' - - 'a=rtpmap:8 PCMA/8000' -sip_out: - - [ - 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ', - 'CSeq: \d+ INVITE', - 'Server: Sipwise NGCP Proxy', - 'Content-Length: 0', - ] - - [ - 'INVITE sip:004321001@127.0.2.1:\d+;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', - 'Content-Type: application/sdp', - 'Contact: ', - 'Content-Length:\s+\d+', - 'a=rtpmap:8 PCMA/8000', - ] diff --git a/scenarios/invite_reinvite_caller_transcoding/0005_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0005_test.yml.tt2 index 7f8fd8c0..095cdebb 100644 --- a/scenarios/invite_reinvite_caller_transcoding/0005_test.yml.tt2 +++ b/scenarios/invite_reinvite_caller_transcoding/0005_test.yml.tt2 @@ -1,22 +1,52 @@ flow: - - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: + - start|DEFAULT_ROUTE: - start|ROUTE_ENTRY: - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: + - start|ROUTE_LEG_B: + - start|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - exit|DEFAULT_SEND: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'SIP/2.0 100 Connecting' + - 'INVITE sip:004321001@127.0.2.1:\d+;transport=udp SIP/2.0' - 'From: ;tag=[\w-]+' - - 'To: ' + - 'To: ' - 'CSeq: \d+ INVITE' - - 'Server: Sipwise NGCP Application' - - 'Content-Length: 0' -sip_out: [] + - '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' + - 'Content-Type: application/sdp' + - 'Contact: ' + - 'Content-Length:\s+\d+' + - 'a=rtpmap:8 PCMA/8000' +sip_out: + - [ + 'SIP/2.0 100 Trying', + 'From: ;tag=[\w-]+', + 'To: ', + 'CSeq: \d+ INVITE', + 'Server: Sipwise NGCP Proxy', + 'Content-Length: 0', + ] + - [ + 'INVITE sip:004321001@127.0.2.1:\d+;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', + 'Content-Type: application/sdp', + 'Contact: ', + 'Content-Length:\s+\d+', + 'a=rtpmap:8 PCMA/8000', + ] diff --git a/scenarios/invite_reinvite_caller_transcoding/0014_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0014_test.yml.tt2 deleted file mode 100644 index 7f8fd8c0..00000000 --- a/scenarios/invite_reinvite_caller_transcoding/0014_test.yml.tt2 +++ /dev/null @@ -1,22 +0,0 @@ -flow: - - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - 'SIP/2.0 100 Connecting' - - 'From: ;tag=[\w-]+' - - 'To: ' - - 'CSeq: \d+ INVITE' - - 'Server: Sipwise NGCP Application' - - 'Content-Length: 0' -sip_out: [] diff --git a/scenarios/invite_reinvite_transcoding/0004_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0004_test.yml.tt2 deleted file mode 100644 index 5c81c984..00000000 --- a/scenarios/invite_reinvite_transcoding/0004_test.yml.tt2 +++ /dev/null @@ -1,22 +0,0 @@ -flow: - - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - 'SIP/2.0 100 Connecting' - - 'From: ;tag=[\w-]+' - - 'To: ' - - 'CSeq: \d+ INVITE' - - 'Server: Sipwise NGCP Application' - - 'Content-Length: 0' -sip_out: []