diff --git a/scenarios/invite_record_call/0003_test.yml.tt2 b/scenarios/invite_record_call/0003_test.yml.tt2 index 3f696341..83287ae4 100644 --- a/scenarios/invite_record_call/0003_test.yml.tt2 +++ b/scenarios/invite_record_call/0003_test.yml.tt2 @@ -22,7 +22,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE' - - 'Contact: sip:[% scenarios.0.username %]@' + - 'Contact: ]+)?>' - 'To: ]+)?>' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' diff --git a/scenarios/invite_record_call/0006_test.yml.tt2 b/scenarios/invite_record_call/0006_test.yml.tt2 index 109b3b9c..45a91c96 100644 --- a/scenarios/invite_record_call/0006_test.yml.tt2 +++ b/scenarios/invite_record_call/0006_test.yml.tt2 @@ -31,5 +31,5 @@ sip_out: 'Contact: ', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', ] diff --git a/scenarios/invite_record_call/0007_test.yml.tt2 b/scenarios/invite_record_call/0007_test.yml.tt2 index ea40f6a8..f131c41a 100644 --- a/scenarios/invite_record_call/0007_test.yml.tt2 +++ b/scenarios/invite_record_call/0007_test.yml.tt2 @@ -130,7 +130,7 @@ sip_out: 'From: ]+)?>', 'Max-Forwards: 68', 'Content-Type: application/sdp', 'P-Caller-UUID: [% invite_record_call_scenarios_test.testuser1002.uuid %]', diff --git a/scenarios/invite_record_call/0009_test.yml.tt2 b/scenarios/invite_record_call/0009_test.yml.tt2 index 4bb154b7..68071c34 100644 --- a/scenarios/invite_record_call/0009_test.yml.tt2 +++ b/scenarios/invite_record_call/0009_test.yml.tt2 @@ -20,9 +20,9 @@ sip_in: - 'P-LB-Uptime: \d+' - 'P-Asserted-Identity: ' - 'P-Caller-UUID: [% invite_record_call_scenarios_test.testuser1002.uuid %]' - - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=[% invite_record_call_scenarios_test.testuser1002.phone_number %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_record_call_scenarios_test.testuser1003.phone_number %]' - - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' + - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_record_call_scenarios_test.testuser1002.phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_record_call_scenarios_test.testuser1003.phone_number %]' + - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060' - 'Content-Type: application/sdp' - 'Contact: ' - 'Content-Length:\s+\d+' @@ -44,8 +44,8 @@ sip_out: 'P-Asserted-Identity: ', 'P-Caller-UUID: [% invite_record_call_scenarios_test.testuser1002.uuid %]', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_record_call_scenarios_test.testuser1002.phone_number %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_record_call_scenarios_test.testuser1003.phone_number %]', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_record_call_scenarios_test.testuser1003.phone_number %]', + 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060', 'Content-Type: application/sdp', 'Contact: ', 'Content-Length:\s+\d+', diff --git a/scenarios/invite_record_call/0017_test.yml.tt2 b/scenarios/invite_record_call/0017_test.yml.tt2 index 6ee7e799..cabadbcc 100644 --- a/scenarios/invite_record_call/0017_test.yml.tt2 +++ b/scenarios/invite_record_call/0017_test.yml.tt2 @@ -29,7 +29,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - - 'Contact: sip:[% scenarios.0.username %]@' + - 'Contact: ]+)?>' - 'CSeq: 3 BYE' - 'Max-Forwards: 69' - 'Content-Length: 0' @@ -46,7 +46,7 @@ sip_out: ] - [ '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0', - 'Contact: sip:[% scenarios.0.username %]@', + 'Contact: ]+)?>', 'CSeq: 3 BYE', 'Max-Forwards: 68', 'Content-Length: 0', diff --git a/scenarios/invite_record_call/prefs.json.tt2 b/scenarios/invite_record_call/prefs.json.tt2 index 60a16c4b..1a509307 100644 --- a/scenarios/invite_record_call/prefs.json.tt2 +++ b/scenarios/invite_record_call/prefs.json.tt2 @@ -1,6 +1,6 @@ { "@invite-record-call.scenarios.test": { - "sound_set": "default_soundset" + "sound_set": "invite_record_call" }, "[% scenarios.0.responders.0.username %]@invite-record-call.scenarios.test": { "play_announce_before_recording": true, diff --git a/scenarios/invite_record_call/sipp_scenario00.xml b/scenarios/invite_record_call/sipp_scenario00.xml index 13b3c912..571234b0 100644 --- a/scenarios/invite_record_call/sipp_scenario00.xml +++ b/scenarios/invite_record_call/sipp_scenario00.xml @@ -10,7 +10,7 @@ To: Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 INVITE - Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Type: application/sdp Content-Length: [len] @@ -41,7 +41,7 @@ To: [peer_tag_param] Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 ACK - Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0 @@ -59,7 +59,7 @@ To: Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 INVITE - Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 [field1 file="caller.csv"] Content-Type: application/sdp @@ -99,7 +99,7 @@ Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] [routes] CSeq: 2 ACK - Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0 @@ -124,7 +124,7 @@ To: [peer_tag_param] Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 3 BYE - Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] + Contact: [routes] Max-Forwards: 70 Content-Length: 0 diff --git a/scenarios/invite_record_call/soundsets.yml b/scenarios/invite_record_call/soundsets.yml index fb8cc3b5..0ec96198 100644 --- a/scenarios/invite_record_call/soundsets.yml +++ b/scenarios/invite_record_call/soundsets.yml @@ -1,7 +1,8 @@ +--- soundsets: - 'default_soundset': - reseller_id: 1 - sounds: - announce_before_recording: - filename: sounds/no_sh.wav - loopplay: 'false' + 'invite_record_call': + reseller_id: 1 + sounds: + announce_before_recording: + filename: sounds/no_sh.wav + loopplay: 'false'