diff --git a/scenarios/invite_concurrent_max/0007_test.yml.tt2 b/scenarios/invite_concurrent_max/0007_test.yml.tt2 index 609b9723..c51acb4f 100644 --- a/scenarios/invite_concurrent_max/0007_test.yml.tt2 +++ b/scenarios/invite_concurrent_max/0007_test.yml.tt2 @@ -19,11 +19,6 @@ flow: - start|ROUTE_CLEAR_CALLER_PREF: - end|ROUTE_CLEAR_CALLER_PREF: - end|ROUTE_LOAD_CALLER_PREF: - $xavp(caller_real_prefs[0]=>concurrent_max[*]): [1] - $xavp(caller_real_prefs[0]=>concurrent_max_out[*]): None - $xavp(caller_real_prefs[0]=>concurrent_max_per_account[*]): None - $xavp(caller_real_prefs[0]=>concurrent_max_per_account_out[*]): None - $avp(size): [0] - start|ROUTE_GET_CALLER_CLI: - end|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: @@ -51,6 +46,11 @@ flow: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: + $xavp(callee_real_prefs[0]=>concurrent_max[*]): [1] + $xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None + $xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): None + $xavp(callee_real_prefs[0]=>concurrent_max_per_account_out[*]): None + $avp(size): [1] - start|ROUTE_CHECK_PBX: - return|ROUTE_CHECK_PBX: - start|ROUTE_INVITE_TO_INT: @@ -61,7 +61,6 @@ flow: - end|ROUTE_ACC_CALLEE: - start|ROUTE_SET_CALLER_DIALOG: - end|ROUTE_SET_CALLER_DIALOG: - $avp(size): [1] - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_concurrent_max/0012_test.yml.tt2 b/scenarios/invite_concurrent_max/0012_test.yml.tt2 index 85ebe2f6..8ebc3a16 100644 --- a/scenarios/invite_concurrent_max/0012_test.yml.tt2 +++ b/scenarios/invite_concurrent_max/0012_test.yml.tt2 @@ -15,7 +15,7 @@ flow: sip_in: - '^INVITE' - 'Contact: sip:testuser1004@' - - 'To: concurrent_max[*]): [1] $xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None @@ -65,7 +59,7 @@ flow: - end|ROUTE_ADD_CALLINFO_REPLY: - exit|ROUTE_EARLY_REJECT: sip_in: - - '^INVITE sip:testuser1002@' + - '^INVITE sip:testuser1003@' - 'Contact: sip:testuser1004@' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' @@ -76,18 +70,18 @@ sip_out: '^SIP/2.0 100 Trying', 'CSeq: 2 INVITE', 'From: ;tag=[pid]SIPpTag00[call_number] - To: + To: Call-ID: [call_id] CSeq: 1 INVITE Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port] @@ -38,10 +38,10 @@ ;tag=[pid]SIPpTag00[call_number] - To: [peer_tag_param] + To: [peer_tag_param] Call-ID: [call_id] CSeq: 1 ACK Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port] @@ -56,10 +56,10 @@ ;tag=[pid]SIPpTag00[call_number] - To: + To: Call-ID: [call_id] CSeq: 2 INVITE Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port] @@ -92,7 +92,7 @@ ACK [next_url] SIP/2.0 Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] - To: [peer_tag_param] + To: [peer_tag_param] Call-ID: [call_id] [routes] CSeq: 2 ACK diff --git a/scenarios_disabled/invite_concurrent_max_per_account/0005_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0005_test.yml.tt2 similarity index 100% rename from scenarios_disabled/invite_concurrent_max_per_account/0005_test.yml.tt2 rename to scenarios/invite_concurrent_max_per_account/0005_test.yml.tt2 diff --git a/scenarios_disabled/invite_concurrent_max_per_account/0007_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 similarity index 93% rename from scenarios_disabled/invite_concurrent_max_per_account/0007_test.yml.tt2 rename to scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 index 64c11e86..1f7d38b4 100644 --- a/scenarios_disabled/invite_concurrent_max_per_account/0007_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 @@ -19,11 +19,6 @@ flow: - start|ROUTE_CLEAR_CALLER_PREF: - end|ROUTE_CLEAR_CALLER_PREF: - end|ROUTE_LOAD_CALLER_PREF: - $xavp(caller_real_prefs[0]=>concurrent_max[*]): None - $xavp(caller_real_prefs[0]=>concurrent_max_out[*]): None - $xavp(caller_real_prefs[0]=>concurrent_max_per_account[*]): [1] - $xavp(caller_real_prefs[0]=>concurrent_max_per_account_out[*]): None - $avp(size): [0] - start|ROUTE_GET_CALLER_CLI: - end|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: @@ -48,12 +43,14 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - $avp(size): [1] - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: + $xavp(callee_real_prefs[0]=>concurrent_max[*]): None + $xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None + $xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): [2] + $xavp(callee_real_prefs[0]=>concurrent_max_per_account_out[*]): None + $avp(size): [1] - start|ROUTE_CHECK_PBX: - return|ROUTE_CHECK_PBX: - start|ROUTE_INVITE_TO_INT: @@ -62,6 +59,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios_disabled/invite_concurrent_max_per_account/0012_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0012_test.yml.tt2 similarity index 77% rename from scenarios_disabled/invite_concurrent_max_per_account/0012_test.yml.tt2 rename to scenarios/invite_concurrent_max_per_account/0012_test.yml.tt2 index 85ebe2f6..2baa7174 100644 --- a/scenarios_disabled/invite_concurrent_max_per_account/0012_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_per_account/0012_test.yml.tt2 @@ -14,8 +14,8 @@ flow: - exit|ROUTE_AUTH: sip_in: - '^INVITE' - - 'Contact: sip:testuser1004@' - - 'To: concurrent_max[*]): None $xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None - $xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): [1] + $xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): [2] $xavp(callee_real_prefs[0]=>concurrent_max_per_account_out[*]): None - $avp(size): [4] + $avp(size): [3] - start|ROUTE_ACC_CALLER: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: @@ -61,29 +59,29 @@ flow: - end|ROUTE_ADD_CALLINFO_REPLY: - exit|ROUTE_EARLY_REJECT: sip_in: - - '^INVITE sip:testuser1002@' - - 'Contact: sip:testuser1004@' + - '^INVITE sip:testuser1004@' + - 'Contact: sip:testuser1002@' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' - - 'Proxy-Authorization: Digest username="testuser1004"' + - 'Proxy-Authorization: Digest username="testuser1002"' sip_out: - [ '^SIP/2.0 100 Trying', 'CSeq: 2 INVITE', - 'From: - + - + - - + + - + diff --git a/scenarios_disabled/invite_concurrent_max_per_account/sipp_scenario_responder00.xml b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00.xml similarity index 97% rename from scenarios_disabled/invite_concurrent_max_per_account/sipp_scenario_responder00.xml rename to scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00.xml index da77f415..4d1ca6b6 100644 --- a/scenarios_disabled/invite_concurrent_max_per_account/sipp_scenario_responder00.xml +++ b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + diff --git a/scenarios_disabled/invite_concurrent_max_per_account/sipp_scenario_responder01.xml b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml similarity index 56% rename from scenarios_disabled/invite_concurrent_max_per_account/sipp_scenario_responder01.xml rename to scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml index e1adf139..e3321083 100644 --- a/scenarios_disabled/invite_concurrent_max_per_account/sipp_scenario_responder01.xml +++ b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml @@ -7,13 +7,13 @@ ;tag=[pid]SIPpTag00[call_number] - To: + From: ;tag=[pid]SIPpTag00[call_number] + To: Call-ID: [call_id] CSeq: 1 INVITE - Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port] + Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 Content-Type: application/sdp Content-Length: [len] @@ -38,13 +38,13 @@ ;tag=[pid]SIPpTag00[call_number] - To: [peer_tag_param] + From: ;tag=[pid]SIPpTag00[call_number] + To: Call-ID: [call_id] CSeq: 1 ACK - Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port] + Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 Content-Length: 0 @@ -56,15 +56,15 @@ ;tag=[pid]SIPpTag00[call_number] - To: + From: ;tag=[pid]SIPpTag00[call_number] + To: Call-ID: [call_id] CSeq: 2 INVITE - Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port] + Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 - [field2 file="callee.csv" line=1] + [field1 file="caller.csv"] Content-Type: application/sdp Content-Length: [len] @@ -91,12 +91,12 @@ ACK [next_url] SIP/2.0 Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] - From: ;tag=[pid]SIPpTag00[call_number] - To: [peer_tag_param] + From: ;tag=[pid]SIPpTag00[call_number] + To: Call-ID: [call_id] [routes] CSeq: 2 ACK - Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port] + Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 Content-Length: 0 diff --git a/scenarios/invite_voicebox/0003_test.yml.tt2 b/scenarios/invite_voicebox/0003_test.yml.tt2 index 8f3b9f3e..f50858c3 100644 --- a/scenarios/invite_voicebox/0003_test.yml.tt2 +++ b/scenarios/invite_voicebox/0003_test.yml.tt2 @@ -59,9 +59,9 @@ flow: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CF: + - start|ROUTE_EXECUTE_CF_LOOP: - start|ROUTE_SET_CALLER_DIALOG: - end|ROUTE_SET_CALLER_DIALOG: - - start|ROUTE_EXECUTE_CF_LOOP: - start|BRANCH_ROUTE_FWD_LOOP: - start|ROUTE_ADD_CALLINFO: - end|ROUTE_ADD_CALLINFO: diff --git a/scenarios_disabled/invite_concurrent_max_per_account/prefs.yml b/scenarios_disabled/invite_concurrent_max_per_account/prefs.yml deleted file mode 100644 index f55affa4..00000000 --- a/scenarios_disabled/invite_concurrent_max_per_account/prefs.yml +++ /dev/null @@ -1,2 +0,0 @@ -testuser1002@spce.test: - concurrent_max_per_account: 1