From bfc39229010d91f4f12c1bea1d0bd2d4a5afc4df Mon Sep 17 00:00:00 2001 From: Marco Capetta Date: Thu, 25 Feb 2021 11:36:01 +0100 Subject: [PATCH] TT#89560 Fix missing 487 message in incoming_shared_line pbx scenario Change-Id: I4fad8ef1dde532d2487ff79b99172ce4f4f03bb8 --- .../{0028_test.yml.tt2 => 0029_test.yml.tt2} | 0 .../incoming_shared_line/0031_test.yml.tt2 | 97 ------------------- .../incoming_shared_line/0032_test.yml.tt2 | 61 +++++++++--- .../incoming_shared_line/0033_test.yml.tt2 | 58 +++++++++++ .../incoming_shared_line/0036_test.yml.tt2 | 9 +- .../{0035_test.yml.tt2 => 0037_test.yml.tt2} | 9 +- .../sipp_scenario_responder02.xml | 33 ++++++- 7 files changed, 149 insertions(+), 118 deletions(-) rename scenarios_pbx/incoming_shared_line/{0028_test.yml.tt2 => 0029_test.yml.tt2} (100%) delete mode 100644 scenarios_pbx/incoming_shared_line/0031_test.yml.tt2 create mode 100644 scenarios_pbx/incoming_shared_line/0033_test.yml.tt2 rename scenarios_pbx/incoming_shared_line/{0035_test.yml.tt2 => 0037_test.yml.tt2} (77%) diff --git a/scenarios_pbx/incoming_shared_line/0028_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0029_test.yml.tt2 similarity index 100% rename from scenarios_pbx/incoming_shared_line/0028_test.yml.tt2 rename to scenarios_pbx/incoming_shared_line/0029_test.yml.tt2 diff --git a/scenarios_pbx/incoming_shared_line/0031_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0031_test.yml.tt2 deleted file mode 100644 index 7b60c7f5..00000000 --- a/scenarios_pbx/incoming_shared_line/0031_test.yml.tt2 +++ /dev/null @@ -1,97 +0,0 @@ -flow: - - start|DEFAULT_ROUTE: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_NET_INFO: - - return|ROUTE_NET_INFO: - - start|ROUTE_CHECK_TEL_URI: - - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_PRX_REQUEST: - - start|ROUTE_INITVARS: - - return|ROUTE_INITVARS: - - start|dialog:end: - - return|dialog:end: - - return|dialog:end: - - start|ROUTE_FIX_PBX_STOP_RECORDS: - - return|ROUTE_FIX_PBX_STOP_RECORDS: - - start|ROUTE_STOP_RTPPROXY: - - start|ROUTE_RESTORE_CLUSTERSET: - - return|ROUTE_RESTORE_CLUSTERSET: - - return|ROUTE_STOP_RTPPROXY: - - start|ROUTE_SCA_UPDATE: - - return|ROUTE_SCA_UPDATE: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - 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: - - '^BYE sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - - 'From: ;tag=' - - 'To: ;tag=' - - 'Call-Info: ;appearance-index=1' - - 'CSeq: 3 BYE' - - 'Contact: sip:testuser1003@127.126.0.3:\d+' - - 'Max-Forwards: 69' - - 'Content-Length: 0' - - 'P-NGCP-Src-Ip: 127.126.0.3' - - 'P-NGCP-Src-Port: 51602' - - 'P-NGCP-Src-Proto: udp' - - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' -sip_out: - - [ - '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 3 BYE', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.126.0.3', - 'P-NGCP-Auth-UA: ', - 'Content-Length: 0', - ] - - [ - '^PUBLISH sip:testuser1003@spce.test SIP/2.0', - 'From: ', - 'To: ', - 'Event: dialog', - 'Content-Type: application/dialog-info\+xml', - ] - - [ - '^NOTIFY sip:testuser1002@127.1.0.2:\d+ SIP/2.0', - 'To: ;tag=', - 'From: ;tag=', - 'CSeq: 3 NOTIFY', - 'Max-Forwards: 70', - 'Content-Length: 0', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=\*;appearance-state=idle', - 'Event: call-info', - 'Subscription-State: active;expires=\d+', - ] - - [ - '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', - 'To: ;tag=', - 'From: ;tag=', - 'CSeq: 3 NOTIFY', - 'Max-Forwards: 70', - 'Content-Length: 0', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=\*;appearance-state=idle', - 'Event: call-info', - 'Subscription-State: active;expires=\d+', - ] - - [ - '^BYE sip:127.0.0.1:5080;prxroute=1 SIP/2.0', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 3 BYE', - 'Contact: sip:testuser1003@127.126.0.3:\d+', - 'Max-Forwards: 68', - 'Content-Length: 0', - ] diff --git a/scenarios_pbx/incoming_shared_line/0032_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0032_test.yml.tt2 index 5105575c..7b60c7f5 100644 --- a/scenarios_pbx/incoming_shared_line/0032_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0032_test.yml.tt2 @@ -15,7 +15,11 @@ flow: - start|ROUTE_FIX_PBX_STOP_RECORDS: - return|ROUTE_FIX_PBX_STOP_RECORDS: - start|ROUTE_STOP_RTPPROXY: + - start|ROUTE_RESTORE_CLUSTERSET: + - return|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_STOP_RTPPROXY: + - start|ROUTE_SCA_UPDATE: + - return|ROUTE_SCA_UPDATE: - start|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA: - start|ROUTE_OUTBOUND: @@ -27,32 +31,67 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0' + - '^BYE sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - 'From: ;tag=' - 'To: ;tag=' - - 'CSeq: \d+ BYE' - - 'Max-Forwards: 70' + - 'Call-Info: ;appearance-index=1' + - 'CSeq: 3 BYE' + - 'Contact: sip:testuser1003@127.126.0.3:\d+' + - 'Max-Forwards: 69' - 'Content-Length: 0' + - 'P-NGCP-Src-Ip: 127.126.0.3' + - 'P-NGCP-Src-Port: 51602' + - 'P-NGCP-Src-Proto: udp' + - 'P-NGCP-Src-Af: 4' + - 'P-Sock-Info: udp:127.0.0.1:5060' sip_out: - [ '^SIP/2.0 100 Trying', 'From: ;tag=', 'To: ;tag=', - 'CSeq: \d+ BYE', + 'CSeq: 3 BYE', + 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-NGCP-Auth-IP: 127.126.0.3', + 'P-NGCP-Auth-UA: ', 'Content-Length: 0', ] - [ - '^PUBLISH sip:testuser1002@spce.test SIP/2.0', - 'From: ', - 'To: ', + '^PUBLISH sip:testuser1003@spce.test SIP/2.0', + 'From: ', + 'To: ', 'Event: dialog', 'Content-Type: application/dialog-info\+xml', ] - [ - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0', - 'From: ;tag=', + '^NOTIFY sip:testuser1002@127.1.0.2:\d+ SIP/2.0', + 'To: ;tag=', + 'From: ;tag=', + 'CSeq: 3 NOTIFY', + 'Max-Forwards: 70', + 'Content-Length: 0', + 'Contact: sip:127.0.0.1:5062', + 'Call-Info: ;appearance-index=\*;appearance-state=idle', + 'Event: call-info', + 'Subscription-State: active;expires=\d+', + ] + - [ + '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', + 'To: ;tag=', + 'From: ;tag=', + 'CSeq: 3 NOTIFY', + 'Max-Forwards: 70', + 'Content-Length: 0', + 'Contact: sip:127.0.0.1:5062', + 'Call-Info: ;appearance-index=\*;appearance-state=idle', + 'Event: call-info', + 'Subscription-State: active;expires=\d+', + ] + - [ + '^BYE sip:127.0.0.1:5080;prxroute=1 SIP/2.0', + 'From: ;tag=', 'To: ;tag=', - 'CSeq: \d+ BYE', - 'Max-Forwards: 69', + 'CSeq: 3 BYE', + 'Contact: sip:testuser1003@127.126.0.3:\d+', + 'Max-Forwards: 68', 'Content-Length: 0', ] diff --git a/scenarios_pbx/incoming_shared_line/0033_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0033_test.yml.tt2 new file mode 100644 index 00000000..5105575c --- /dev/null +++ b/scenarios_pbx/incoming_shared_line/0033_test.yml.tt2 @@ -0,0 +1,58 @@ +flow: + - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_NET_INFO: + - return|ROUTE_NET_INFO: + - start|ROUTE_CHECK_TEL_URI: + - return|ROUTE_CHECK_TEL_URI: + - start|ROUTE_PRX_REQUEST: + - start|ROUTE_INITVARS: + - return|ROUTE_INITVARS: + - start|dialog:end: + - return|dialog:end: + - return|dialog:end: + - start|ROUTE_FIX_PBX_STOP_RECORDS: + - return|ROUTE_FIX_PBX_STOP_RECORDS: + - start|ROUTE_STOP_RTPPROXY: + - return|ROUTE_STOP_RTPPROXY: + - start|ROUTE_PREPARE_UA: + - return|ROUTE_PREPARE_UA: + - 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: + - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0' + - 'From: ;tag=' + - 'To: ;tag=' + - 'CSeq: \d+ BYE' + - 'Max-Forwards: 70' + - 'Content-Length: 0' +sip_out: + - [ + '^SIP/2.0 100 Trying', + 'From: ;tag=', + 'To: ;tag=', + 'CSeq: \d+ BYE', + 'Content-Length: 0', + ] + - [ + '^PUBLISH sip:testuser1002@spce.test SIP/2.0', + 'From: ', + 'To: ', + 'Event: dialog', + 'Content-Type: application/dialog-info\+xml', + ] + - [ + '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0', + 'From: ;tag=', + 'To: ;tag=', + 'CSeq: \d+ BYE', + 'Max-Forwards: 69', + 'Content-Length: 0', + ] diff --git a/scenarios_pbx/incoming_shared_line/0036_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0036_test.yml.tt2 index 8776fb40..f2fc90d7 100644 --- a/scenarios_pbx/incoming_shared_line/0036_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0036_test.yml.tt2 @@ -5,8 +5,6 @@ flow: - return|ROUTE_ENTRY: - start|ROUTE_APPLY_HEADER_RULES: - return|ROUTE_APPLY_HEADER_RULES: - - start|REPLY_SCA_UPDATE: - - return|REPLY_SCA_UPDATE: - start|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA: - start|REPLY_ROUTE_NAT_CONTINUE: @@ -16,16 +14,15 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^SIP/2.0 200 OK' - - 'From: ;tag=' + - 'From: ;tag=' - 'To: ;tag=' - - 'CSeq: 3 BYE' + - 'CSeq: \d+ BYE' - 'Content-Length: 0' sip_out: - [ '^SIP/2.0 200 OK', 'From: ;tag=', 'To: ;tag=', - 'CSeq: 3 BYE', + 'CSeq: \d+ BYE', 'Content-Length: 0', - 'P-Out-Socket: udp:127.0.0.1:5060', ] diff --git a/scenarios_pbx/incoming_shared_line/0035_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0037_test.yml.tt2 similarity index 77% rename from scenarios_pbx/incoming_shared_line/0035_test.yml.tt2 rename to scenarios_pbx/incoming_shared_line/0037_test.yml.tt2 index f2fc90d7..8776fb40 100644 --- a/scenarios_pbx/incoming_shared_line/0035_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0037_test.yml.tt2 @@ -5,6 +5,8 @@ flow: - return|ROUTE_ENTRY: - start|ROUTE_APPLY_HEADER_RULES: - return|ROUTE_APPLY_HEADER_RULES: + - start|REPLY_SCA_UPDATE: + - return|REPLY_SCA_UPDATE: - start|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA: - start|REPLY_ROUTE_NAT_CONTINUE: @@ -14,15 +16,16 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^SIP/2.0 200 OK' - - 'From: ;tag=' + - 'From: ;tag=' - 'To: ;tag=' - - 'CSeq: \d+ BYE' + - 'CSeq: 3 BYE' - 'Content-Length: 0' sip_out: - [ '^SIP/2.0 200 OK', 'From: ;tag=', 'To: ;tag=', - 'CSeq: \d+ BYE', + 'CSeq: 3 BYE', 'Content-Length: 0', + 'P-Out-Socket: udp:127.0.0.1:5060', ] diff --git a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02.xml b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02.xml index 87b57a01..e7c1a758 100644 --- a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02.xml +++ b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02.xml @@ -2,9 +2,14 @@ - + + + + + @@ -25,6 +30,13 @@ ]]> + + + + + + + @@ -45,5 +57,24 @@ ]]> + + + Content-Length: [len] + + ]]> + + + + +