diff --git a/scenarios/timer_session_callee_only_supported/0003_test.yml.tt2 b/scenarios/timer_session_callee_only_supported/0003_test.yml.tt2 index 7b0f53b9..c1b9230c 100644 --- a/scenarios/timer_session_callee_only_supported/0003_test.yml.tt2 +++ b/scenarios/timer_session_callee_only_supported/0003_test.yml.tt2 @@ -143,12 +143,12 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'INVITE sip:testuser1001@spce.test SIP/2.0' + - 'INVITE sip:testuser1001@timer-session-callee-only-supported.scenarios.test SIP/2.0' - 'Supported: timer' - - 'From: ;tag=[\w-]+' - - 'To: ' + - 'From: ;tag=[\w-]+' + - 'To: ' - 'CSeq: \d+ INVITE' - - 'Contact: ' + - 'Contact: ' - 'Min-SE: 2' - 'Content-Type: application/sdp' - 'Content-Length: 0' @@ -161,8 +161,8 @@ sip_in: sip_out: - [ 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', 'P-Out-Socket: udp:127.0.0.1:5060', 'P-NGCP-Auth-IP: 127.0.2.1', @@ -171,24 +171,24 @@ sip_out: 'Content-Length: 0', ] - [ - 'INVITE sip:testuser1001@127.1.0.1:\d+ SIP/2.0', + 'INVITE sip:testuser1001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0', 'Supported: timer', - 'From: ;tag=[\w-]+', - 'To: ', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', - 'Contact: ', + 'Contact: ', 'Min-SE: 2', 'Content-Type: application/sdp', 'Content-Length: 0', 'P-LB-Uptime: \d+', - 'P-Asserted-Identity: ', + 'P-Asserted-Identity: ', 'P-Caller-UUID: 0', - 'P-Callee-UUID: [% spce_test.testuser1001.uuid %]', - 'P-Called-Party-ID: ', + 'P-Callee-UUID: [% timer_session_callee_only_supported_scenarios_test.testuser1001.uuid %]', + 'P-Called-Party-ID: ', 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=yes;sst_expires=10;sst_min_timer=2;sst_max_timer=20;sst_refresh_method=INVITE;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;(fast_ack=no;)?b_park_domain=[% customer_test.id %]', 'P-App-Name: sbc', - 'P-NGCP-Caller-Info: ;ip=127.0.2.1;port=\d+', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311001', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% timer_session_callee_only_supported_scenarios_test.testuser1001.phone_number %]', 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', 'P-Proxy-Uri: sip:127.0.0.1:5062', ] diff --git a/scenarios/timer_session_callee_only_supported/0005_test.yml.tt2 b/scenarios/timer_session_callee_only_supported/0005_test.yml.tt2 index 04a501c3..f80e2102 100644 --- a/scenarios/timer_session_callee_only_supported/0005_test.yml.tt2 +++ b/scenarios/timer_session_callee_only_supported/0005_test.yml.tt2 @@ -14,16 +14,16 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'INVITE sip:testuser1001@127.1.0.1:\d+ SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ' + - 'INVITE sip:testuser1001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ' - 'CSeq: \d+ INVITE' - 'Supported: timer' - 'P-LB-Uptime: \d+' - - 'P-Asserted-Identity: ' + - 'P-Asserted-Identity: ' - 'P-Caller-UUID: 0' - - 'P-NGCP-Caller-Info: ;ip=127.0.2.1;port=\d+' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311001' + - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]' + - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% timer_session_callee_only_supported_scenarios_test.testuser1001.phone_number %]' - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' - 'Min-SE: 2' - 'Contact: ' @@ -31,23 +31,23 @@ sip_in: sip_out: - [ 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ - 'INVITE sip:testuser1001@127.1.0.1:\d+ SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ', + 'INVITE sip:testuser1001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', 'Supported: timer', 'P-LB-Uptime: \d+', - 'P-Asserted-Identity: ', + 'P-Asserted-Identity: ', 'P-Caller-UUID: 0', - 'P-NGCP-Caller-Info: ;ip=127.0.2.1;port=\d+', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311001', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% timer_session_callee_only_supported_scenarios_test.testuser1001.phone_number %]', 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', 'Min-SE: 2', 'Contact: ', diff --git a/scenarios/timer_session_callee_only_supported/0009_test.yml.tt2 b/scenarios/timer_session_callee_only_supported/0009_test.yml.tt2 index 996f2812..e801acff 100644 --- a/scenarios/timer_session_callee_only_supported/0009_test.yml.tt2 +++ b/scenarios/timer_session_callee_only_supported/0009_test.yml.tt2 @@ -13,13 +13,13 @@ sip_in: - 'SIP/2.0 200 OK' - 'Require: timer' - 'Supported: timer' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - - 'Contact: ' + - 'Contact: ' - 'Content-Type: application/sdp' - 'Content-Length: 0' - - 'P-NGCP-Src-Ip: 127.1.0.1' + - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]' - 'P-NGCP-Src-Port: \d+' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' @@ -28,13 +28,13 @@ sip_out: 'SIP/2.0 200 OK', 'Require: timer', 'Supported: timer', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', - 'Contact: ', + 'Contact: ', 'Content-Type: application/sdp', 'Content-Length: 0', - 'P-NGCP-Src-Ip: 127.1.0.1', + 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]', 'P-NGCP-Src-Port: \d+', 'P-NGCP-Src-Proto: udp', 'P-NGCP-Src-Af: 4', diff --git a/scenarios/timer_session_callee_only_supported/0010_test.yml.tt2 b/scenarios/timer_session_callee_only_supported/0010_test.yml.tt2 index 37e91c7d..68a39216 100644 --- a/scenarios/timer_session_callee_only_supported/0010_test.yml.tt2 +++ b/scenarios/timer_session_callee_only_supported/0010_test.yml.tt2 @@ -16,8 +16,8 @@ flow: - return|dialog:start: sip_in: - 'SIP/2.0 200 OK' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Require: timer' - 'Supported: timer' @@ -26,8 +26,8 @@ sip_in: sip_out: - [ 'SIP/2.0 200 OK', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', 'Contact: ', 'Content-Length: 0', diff --git a/scenarios/timer_session_callee_only_supported/peer.yml b/scenarios/timer_session_callee_only_supported/peer.yml index 3c12853c..2c2ffdc1 100644 --- a/scenarios/timer_session_callee_only_supported/peer.yml +++ b/scenarios/timer_session_callee_only_supported/peer.yml @@ -1,33 +1,33 @@ --- -peer_00: +peer_timer_session_callee_only_supported: contact: - company: peer_00 - email: peer_00@host0.not + company: peer_timer_session_callee_only_supported + email: peer_timer_session_callee_only_supported@host0.not contract: billing_profile_id: 1 status: active type: sippeering groups: - - name: peer_00_group + - name: peer_timer_session_callee_only_supported_group priority: 1 description: rules: - - group_id: peer_00_group + - group_id: peer_timer_session_callee_only_supported_group callee_prefix: "" callee_pattern: '' - caller_pattern: '^sip:.+@spce.test' + caller_pattern: '^sip:.+@timer-session-callee-only-supported.scenarios.test' description: "" inboundrules: - - group_id: peer_00_group + - group_id: peer_timer_session_callee_only_supported_group field: "ruri_uri" pattern: '.*' priority: 50 enabled: 1 hosts: - - group_id: peer_00_group - name: peer_00_host0 + - group_id: peer_timer_session_callee_only_supported_group + name: peer_timer_session_callee_only_supported_host0 ip: 127.0.2.1 port: 51602 host: transport: 1 - weight: 1 \ No newline at end of file + weight: 1 diff --git a/scenarios/timer_session_callee_only_supported/prefs.json b/scenarios/timer_session_callee_only_supported/prefs.json deleted file mode 100644 index e49005d6..00000000 --- a/scenarios/timer_session_callee_only_supported/prefs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "testuser1001@spce.test": { - "sst_refresh_method": "INVITE", - "sst_enable": "yes", - "sst_expires": 10, - "sst_min_timer": 2, - "sst_max_timer": 20 - } -} diff --git a/scenarios/timer_session_callee_only_supported/prefs.json.tt2 b/scenarios/timer_session_callee_only_supported/prefs.json.tt2 new file mode 100644 index 00000000..d512e4ac --- /dev/null +++ b/scenarios/timer_session_callee_only_supported/prefs.json.tt2 @@ -0,0 +1,9 @@ +{ + "testuser1001@timer-session-callee-only-supported.scenarios.test": { + "sst_refresh_method": "INVITE", + "sst_enable": "yes", + "sst_expires": 10, + "sst_min_timer": 2, + "sst_max_timer": 20 + } +} \ No newline at end of file diff --git a/scenarios/timer_session_callee_only_supported/scenario.yml b/scenarios/timer_session_callee_only_supported/scenario.yml index 27258dd2..9354fe89 100644 --- a/scenarios/timer_session_callee_only_supported/scenario.yml +++ b/scenarios/timer_session_callee_only_supported/scenario.yml @@ -1,6 +1,7 @@ +--- test_uuid: timer_session_callee_only_supported domains: - 'spce.test': + timer-session-callee-only-supported.scenarios.test: reseller_id: 1 customers: 'customer.test': @@ -13,7 +14,7 @@ customers: billing_profile_id: 1 reseller_id: 1 subscribers: - spce.test: + timer-session-callee-only-supported.scenarios.test: testuser1001: customer: 'customer.test' password: testuser @@ -23,9 +24,10 @@ subscribers: scenarios: - ip: 127.0.2.1 username: 004321001 - domain: 127.0.2.1 + domain: timer-session-callee-only-supported.host0.scenarios.test + peer_host: peer_timer_session_callee_only_supported_host0 responders: - ip: 127.1.0.1 username: testuser1001 - domain: spce.test - register: yes + domain: timer-session-callee-only-supported.scenarios.test + register: 'yes'