From ecb94c0f09f2a80ffde7bab67ede683a087f88c0 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 14 Nov 2022 10:18:24 +0100 Subject: [PATCH] Revert "TT#163700 scenarios_pbx: fix incoming_shared_line" This reverts commit 722e07cb39fee72bdc0a8e7170e100358a4a9a04. Change-Id: Id7564b6c919b7c1262a5e29c080ff8096b59346c --- .../incoming_shared_line/0023_test.yml.tt2 | 88 +++++++++++-------- 1 file changed, 53 insertions(+), 35 deletions(-) diff --git a/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 index 6e9483cb..b9cd2985 100644 --- a/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 @@ -9,55 +9,73 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|ROUTE_STOP_RTPPROXY: + - start|ROUTE_SCA_UPDATE: + - return|ROUTE_SCA_UPDATE: + - start|ROUTE_PREPARE_UA: + - return|ROUTE_PREPARE_UA: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: - - return|ROUTE_STOP_RTPPROXY: - - start|ROUTE_LOCAL: + - start|ROUTE_WITHINDLG_RTPENGINE: + - return|ROUTE_WITHINDLG_RTPENGINE: + - start|ROUTE_OUTBOUND: + - start|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - exit|DEFAULT_SEND: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'CANCEL sip:[% scenarios.2.responders.0.username %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0' - - 'To: ' - - 'From: ;tag=[\w-]+' - - 'CSeq: \d+ CANCEL' - - 'Contact: ' - - 'P-LB-Uptime: \d+' - - 'P-Asserted-Identity: ' - - 'P-Caller-UUID: [% incoming_shared_line_scenarios_pbx_test.testuser1003.uuid %]' - - 'P-Callee-UUID: [% incoming_shared_line_scenarios_pbx_test.testuser1002.uuid %]' - - 'P-NGCP-Rtpengine-Bleg: 1' - - 'P-NGCP-Caller-Info: ;ip=[% scenarios.2.ip %];port=[% scenarios.2.port %];primary=[% incoming_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]' - - 'P-NGCP-Callee-Info: ;ip=[% scenarios.2.responders.0.ip %];port=[% scenarios.2.responders.0.port %];primary=[% incoming_shared_line_scenarios_pbx_test.testuser1002.phone_number %]' - - 'P-NGCP-Presence-Caller: sip:[% scenarios.2.username %]@incoming-shared-line.scenarios-pbx.test' - - 'P-NGCP-Presence-Callee: sip:[% scenarios.0.username %]@incoming-shared-line.scenarios-pbx.test' - - 'P-D-Uri: sip:lb@127.0.0.1;lr;received=sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];socket=sip:[% server_ip %]:5060' - - 'Reason: SIP;cause=200;text="Call completed elsewhere"' - - 'Content-Length: 0' + - 'ACK sip:127.0.0.1:508[08];prxroute=1 SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'Call-Info: ;appearance-index=1' + - 'CSeq: \d+ ACK' + - 'Contact: ]+)?>' + - 'Content-Length: 0' + - 'P-NGCP-Src-Ip: [% scenarios.2.ip %]' + - 'P-NGCP-Src-Port: [% scenarios.2.port %]' + - 'P-NGCP-Src-Proto: udp' + - 'P-NGCP-Src-Af: 4' + - 'P-Sock-Info: udp:[% server_ip %]:5060' + - 'P-LB-Uptime: \d+' sip_out: - [ - 'SIP/2.0 100 Trying', - 'To: ', - 'From: ;tag=[\w-]+', - 'CSeq: \d+ CANCEL', - 'Server: Sipwise NGCP Proxy', + 'NOTIFY sip:[% scenarios.0.responders.0.username %]@', + 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'CSeq: \d+ NOTIFY', 'Content-Length: 0', + 'User-Agent: Sipwise NGCP Proxy', + 'Contact: sip:127.0.0.1:5062', + 'Call-Info: ;appearance-index=1;appearance-state=active;appearance-uri=\"\",;appearance-index=\*;appearance-state=idle', + 'Event: call-info', + 'Subscription-State: active;expires=\d+', ] - [ - 'CANCEL sip:[% scenarios.2.responders.0.username %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ', - 'CSeq: \d+ CANCEL', + 'NOTIFY sip:[% scenarios.1.responders.0.username %]@', + 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'CSeq: \d+ NOTIFY', 'Content-Length: 0', - 'Reason: SIP;cause=200;text="Call completed elsewhere"', + 'User-Agent: Sipwise NGCP Proxy', + 'Contact: sip:127.0.0.1:5062', + 'Call-Info: ;appearance-index=1;appearance-state=active;appearance-uri=\"\",;appearance-index=\*;appearance-state=idle', + 'Event: call-info', + 'Subscription-State: active;expires=\d+', ] - [ - 'SIP/2.0 200 canceling', - 'To: ;tag=[\w-]+', + 'ACK sip:127.0.0.1:508[08];prxroute=1 SIP/2.0', 'From: ;tag=[\w-]+', - 'CSeq: \d+ CANCEL', - 'Server: Sipwise NGCP Proxy', + 'To: ;tag=[\w-]+', + 'Call-Info: ;appearance-index=1', + 'CSeq: \d+ ACK', + 'Contact: ]+)?>', 'Content-Length: 0', - ] + 'P-NGCP-Src-Ip: [% scenarios.2.ip %]', + 'P-NGCP-Src-Port: [% scenarios.2.port %]', + 'P-NGCP-Src-Proto: udp', + 'P-NGCP-Src-Af: 4', + 'P-Sock-Info: udp:[% server_ip %]:5060', + 'P-LB-Uptime: \d+', + ] \ No newline at end of file