diff --git a/scenarios_pbx/incoming_shared_line/0012_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0012_test.yml.tt2 deleted file mode 100644 index 6c151fe3..00000000 --- a/scenarios_pbx/incoming_shared_line/0012_test.yml.tt2 +++ /dev/null @@ -1,39 +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 180 Ringing' - - 'From: ;tag=' - - 'To: ;tag=' - - 'CSeq: \d+ INVITE' - - 'Call-Info: ;appearance-index=1' - - 'Contact: ' - - 'Content-Length: 0' -sip_out: - - [ - '^PUBLISH sip:testuser1002@spce.test SIP/2.0', - 'From: ', - 'To: ', - 'Event: dialog', - 'Content-Type: application/dialog-info\+xml', - ] - - [ - '^SIP/2.0 180 Ringing', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: \d+ INVITE', - 'Call-Info: ;appearance-index=1', - 'Contact: ', - 'Content-Length: 0', - ] diff --git a/scenarios_pbx/incoming_shared_line/0013_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0013_test.yml.tt2 index 801902e0..f02bfdf3 100644 --- a/scenarios_pbx/incoming_shared_line/0013_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0013_test.yml.tt2 @@ -1,39 +1,50 @@ 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 180 Ringing' - - 'From: ;tag=' - - 'To: ;tag=' + - 'INVITE sip:testuser1002@127.1.0.4:\d+ SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ' - 'CSeq: \d+ INVITE' - - 'Call-Info: ;appearance-index=1' - - 'Contact: ' - - 'Content-Length: 0' + - 'P-LB-Uptime: \d+' + - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]' + - 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003' + - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311002' + - 'P-Asserted-Identity: ' + - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' + - 'Content-Type: application/sdp' + - 'Content-Length:\s+\d+' + - 'Contact: ' sip_out: - [ - '^PUBLISH sip:testuser1002@spce.test SIP/2.0', - 'From: ', + 'SIP/2.0 100 Trying', + 'From: ;tag=[\w-]+', 'To: ', - 'Event: dialog', - 'Content-Type: application/dialog-info\+xml', + 'CSeq: \d+ INVITE', + 'Server: Sipwise NGCP Proxy', + 'Content-Length: 0', ] - [ - '^SIP/2.0 180 Ringing', - 'From: ;tag=', - 'To: ;tag=', + 'INVITE sip:testuser1002@127.1.0.4:\d+ SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', - 'Call-Info: ;appearance-index=1', - 'Contact: ', - 'Content-Length: 0', + 'P-LB-Uptime: \d+', + 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]', + 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311002', + 'P-Asserted-Identity: ', + 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + 'Content-Type: application/sdp', + 'Content-Length:\s+\d+', + 'Contact: ', ] diff --git a/scenarios_pbx/incoming_shared_line/0016_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0016_test.yml.tt2 new file mode 100644 index 00000000..d8145cb3 --- /dev/null +++ b/scenarios_pbx/incoming_shared_line/0016_test.yml.tt2 @@ -0,0 +1,33 @@ +flow: + - start|DEFAULT_ONREPLY: + - return|DEFAULT_ONREPLY: +sip_in: + - 'SIP/2.0 180 Ringing' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: \d+ INVITE' + - 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE' + - 'Call-Info: ;appearance-index=1' + - 'Allow-Events: talk,hold,conference,refer,check-sync' + - 'Contact: ' + - 'Content-Length: 0' + - 'P-NGCP-Src-Ip: 127.1.0.3' + - 'P-NGCP-Src-Port: \d+' + - 'P-NGCP-Src-Proto: udp' + - 'P-NGCP-Src-Af: 4' +sip_out: + - [ + 'SIP/2.0 180 Ringing', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', + 'CSeq: \d+ INVITE', + 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE', + 'Call-Info: ;appearance-index=1', + 'Allow-Events: talk,hold,conference,refer,check-sync', + 'Contact: ', + 'Content-Length: 0', + 'P-NGCP-Src-Ip: 127.1.0.3', + 'P-NGCP-Src-Port: \d+', + 'P-NGCP-Src-Proto: udp', + 'P-NGCP-Src-Af: 4', + ] diff --git a/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 index c2f8b45d..de6671bc 100644 --- a/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0017_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,29 +14,31 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^SIP/2.0 180 Ringing' - - 'From: ;tag=' - - 'To: ;tag=' - - 'CSeq: 2 INVITE' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: \d+ INVITE' - 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE' - - 'Call-Info: ;appearance-index=1' - - 'Contact: ' + - 'Call-Info: ;appearance-index=1' + - 'Contact: ' - 'Content-Length: 0' sip_out: - [ - '^PUBLISH sip:testuser1003@spce.test SIP/2.0', - 'From: ', - 'To: ', + '^PUBLISH sip:testuser1002@spce.test SIP/2.0', + 'To: ', + 'From: ;tag=[\w-]+', + 'CSeq: \d+ PUBLISH', + 'Content-Length:\s+\d+', + 'User-Agent: Sipwise NGCP Proxy', 'Event: dialog', - 'Content-Type: application/dialog-info\+xml', + 'Content-Type: application/dialog\-info\+xml', ] - [ '^SIP/2.0 180 Ringing', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 2 INVITE', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', + 'CSeq: \d+ INVITE', 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE', - 'Contact: ', + 'Call-Info: ;appearance-index=1', + 'Contact: ', 'Content-Length: 0', - 'P-COLP-Identity: \"1002\" ', - 'P-Out-Socket: udp:127.0.0.1:5060', ] diff --git a/scenarios_pbx/incoming_shared_line/0018_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0018_test.yml.tt2 new file mode 100644 index 00000000..66f6bf29 --- /dev/null +++ b/scenarios_pbx/incoming_shared_line/0018_test.yml.tt2 @@ -0,0 +1,48 @@ +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|REPLY_SCA_UPDATE: + - return|REPLY_SCA_UPDATE: + - 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 180 Ringing' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: \d+ INVITE' + - 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE' + - 'Call-Info: ;appearance-index=1' + - 'Contact: ' + - 'Content-Length: 0' +sip_out: + - [ + '^PUBLISH sip:testuser1003@spce.test SIP/2.0', + 'To: ', + 'From: ;tag=[\w-]+', + 'CSeq: \d+ PUBLISH', + 'Content-Length:\s+\d+', + 'User-Agent: Sipwise NGCP Proxy', + 'Event: dialog', + 'SIP-If-Match: .+', + 'Content-Type: application/dialog\-info\+xml', + ] + - [ + '^SIP/2.0 180 Ringing', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', + 'CSeq: \d+ INVITE', + 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE', + 'Contact: ', + 'Content-Length: 0', + 'P-COLP-Identity: "1002" ', + 'P-Out-Socket: udp:127.0.0.1:5060', + ] diff --git a/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 new file mode 100644 index 00000000..08c9f833 --- /dev/null +++ b/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 @@ -0,0 +1,50 @@ +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|REPLY_SCA_UPDATE: + - return|REPLY_SCA_UPDATE: + - start|ROUTE_PREPARE_UA: + - return|ROUTE_PREPARE_UA: + - start|ROUTE_FIX_PBX_STOP_RECORDS: + - return|ROUTE_FIX_PBX_STOP_RECORDS: + - start|REPLY_ROUTE_RTPENGINE: + - return|REPLY_ROUTE_RTPENGINE: + - start|REPLY_ROUTE_NAT_CONTINUE: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - start|dialog:start: + - return|dialog:start: + - return|dialog:start: +sip_in: + - '^SIP/2.0 200 OK' + - 'From: ;tag=' + - 'To: ;tag=' + - 'CSeq: 2 INVITE' + - 'Call-Info: ;appearance-index=1' + - 'Contact: ' + - 'Content-Type: application/sdp' + - 'Content-Length: \d+' +sip_out: + - [ + '^PUBLISH sip:testuser1003@spce.test SIP/2.0', + 'From: ', + 'To: ', + 'Event: dialog', + 'Content-Type: application/dialog-info\+xml', + ] + - [ + '^SIP/2.0 200 OK', + 'From: ;tag=', + 'To: ;tag=', + 'CSeq: 2 INVITE', + 'Contact: ', + 'Content-Type: application/sdp', + 'Content-Length: \d+', + 'P-COLP-Identity: \"1002\" ', + 'P-Out-Socket: udp:127.0.0.1:5060', + ] diff --git a/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0026_test.yml.tt2 similarity index 54% rename from scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 rename to scenarios_pbx/incoming_shared_line/0026_test.yml.tt2 index f02bfdf3..91cc090a 100644 --- a/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0026_test.yml.tt2 @@ -2,49 +2,52 @@ 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_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|ROUTE_LOCAL: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'INVITE sip:testuser1002@127.1.0.4:\d+ SIP/2.0' - - 'From: ;tag=[\w-]+' + - 'CANCEL sip:testuser1002@127.1.0.3:\d+ SIP/2.0' - 'To: ' - - 'CSeq: \d+ INVITE' + - 'From: ;tag=[\w-]+' + - 'CSeq: \d+ CANCEL' + - 'Contact: ' - 'P-LB-Uptime: \d+' - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]' - 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003' - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311002' - 'P-Asserted-Identity: ' - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' - - 'Content-Type: application/sdp' - - 'Content-Length:\s+\d+' - - 'Contact: ' + - 'Content-Length: 0' sip_out: - [ 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', 'To: ', - 'CSeq: \d+ INVITE', + 'From: ;tag=[\w-]+', + 'CSeq: \d+ CANCEL', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ - 'INVITE sip:testuser1002@127.1.0.4:\d+ SIP/2.0', + 'CANCEL sip:testuser1002@127.1.0.3:\d+ SIP/2.0', 'From: ;tag=[\w-]+', 'To: ', - 'CSeq: \d+ INVITE', - 'P-LB-Uptime: \d+', - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]', - 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311002', - 'P-Asserted-Identity: ', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', - 'Content-Type: application/sdp', - 'Content-Length:\s+\d+', - 'Contact: ', + 'CSeq: \d+ CANCEL', + 'Content-Length: 0', + ] + - [ + 'SIP/2.0 200 canceling', + 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'CSeq: \d+ CANCEL', + 'Server: Sipwise NGCP Proxy', + 'Content-Length: 0', ] diff --git a/scenarios_pbx/incoming_shared_line/0027_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0027_test.yml.tt2 index 08c9f833..5e4a982f 100644 --- a/scenarios_pbx/incoming_shared_line/0027_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0027_test.yml.tt2 @@ -1,50 +1,11 @@ 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|REPLY_SCA_UPDATE: - - return|REPLY_SCA_UPDATE: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|ROUTE_FIX_PBX_STOP_RECORDS: - - return|ROUTE_FIX_PBX_STOP_RECORDS: - - start|REPLY_ROUTE_RTPENGINE: - - return|REPLY_ROUTE_RTPENGINE: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - start|dialog:start: - - return|dialog:start: - - return|dialog:start: + - return|DEFAULT_ONREPLY: sip_in: - - '^SIP/2.0 200 OK' - - 'From: ;tag=' - - 'To: ;tag=' - - 'CSeq: 2 INVITE' - - 'Call-Info: ;appearance-index=1' - - 'Contact: ' - - 'Content-Type: application/sdp' - - 'Content-Length: \d+' -sip_out: - - [ - '^PUBLISH sip:testuser1003@spce.test SIP/2.0', - 'From: ', - 'To: ', - 'Event: dialog', - 'Content-Type: application/dialog-info\+xml', - ] - - [ - '^SIP/2.0 200 OK', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 2 INVITE', - 'Contact: ', - 'Content-Type: application/sdp', - 'Content-Length: \d+', - 'P-COLP-Identity: \"1002\" ', - 'P-Out-Socket: udp:127.0.0.1:5060', - ] + - 'SIP/2.0 200 canceling' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: \d+ CANCEL' + - 'Server: Sipwise NGCP LB 9.X' + - 'Content-Length: 0' +sip_out: [] diff --git a/scenarios_pbx/incoming_shared_line/sipp_scenario02.xml b/scenarios_pbx/incoming_shared_line/sipp_scenario02.xml index 781b088e..a76131d2 100644 --- a/scenarios_pbx/incoming_shared_line/sipp_scenario02.xml +++ b/scenarios_pbx/incoming_shared_line/sipp_scenario02.xml @@ -117,6 +117,9 @@ + + + diff --git a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02.xml b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02.xml index 07b63a61..87b57a01 100644 --- a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02.xml +++ b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder02.xml @@ -5,6 +5,8 @@ + + + +