From c9bc5a1cd9fb2ed4a2db33ad6693742cfc778942 Mon Sep 17 00:00:00 2001 From: Marco Capetta Date: Fri, 12 Apr 2019 08:53:16 +0200 Subject: [PATCH] TT#56008 Adjust scenarios after redirect route changes Change-Id: I6dd5a6d7f46e2f56cdc907cfb547e95d813de999 --- scenarios/invite_record_call/cdr_test.yml.tt2 | 9 ++ scenarios/invite_redirect/0009_test.yml.tt2 | 98 +++++++------------ scenarios/invite_redirect/0012_test.yml.tt2 | 10 +- scenarios/invite_redirect/cdr_test.yml.tt2 | 9 ++ 4 files changed, 54 insertions(+), 72 deletions(-) diff --git a/scenarios/invite_record_call/cdr_test.yml.tt2 b/scenarios/invite_record_call/cdr_test.yml.tt2 index 7e903ea7..6891042e 100644 --- a/scenarios/invite_record_call/cdr_test.yml.tt2 +++ b/scenarios/invite_record_call/cdr_test.yml.tt2 @@ -1,4 +1,13 @@ cdr: + - source_user: 'testuser1002' + source_domain: 'spce.test' + source_cli: '4311002' + destination_user: 'testuser1003' + destination_domain: 'spce.test' + destination_user_dialed: 'testuser1003' + call_type: 'call' + call_status: 'ok' + call_code: '200' - source_user: 'testuser1002' source_domain: 'spce.test' source_cli: '4311002' diff --git a/scenarios/invite_redirect/0009_test.yml.tt2 b/scenarios/invite_redirect/0009_test.yml.tt2 index 4b76fe3f..eaa9be8e 100644 --- a/scenarios/invite_redirect/0009_test.yml.tt2 +++ b/scenarios/invite_redirect/0009_test.yml.tt2 @@ -7,21 +7,13 @@ flow: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - - start|tm:branch-failure:redirect: + - start|FAILURE_ROUTE_LOCAL: + - start|ROUTE_INITVARS: + - return|ROUTE_INITVARS: - start|ROUTE_STOP_RTPPROXY_BRANCH: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_STOP_RTPPROXY_BRANCH: - - start|ROUTE_INITVARS: - - return|ROUTE_INITVARS: - - start|ROUTE_LOAD_CALLER_PREF: - - start|ROUTE_CLEAR_CALLER_PREF: - - return|ROUTE_CLEAR_CALLER_PREF: - - start|ROUTE_CHECK_UA: - - return|ROUTE_CHECK_UA: - - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - return|ROUTE_LOAD_CALLER_PREF: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: @@ -76,34 +68,6 @@ flow: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: - start|ROUTE_OUTBOUND: - - start|ROUTE_SET_CALLER_DIALOG: - - start|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_SET_CALLER_DIALOG: - $avp(lua_dlg_profile): [ - 'accountout:[% customer_test.id %]', - 'userout:[% spce_test.testuser1003.uuid %]', - 'account:[% customer_test.id %]', - 'user:[% spce_test.testuser1003.uuid %]', - 'totalaccountout:[% customer_test.id %]', - 'totaluserout:[% spce_test.testuser1003.uuid %]', - 'totalaccount:[% customer_test.id %]', - 'totaluser:[% spce_test.testuser1003.uuid %]', - "accountout:[% customer_test.id %]", - "userout:[% spce_test.testuser1002.uuid %]", - "account:[% customer_test.id %]", - "user:[% spce_test.testuser1002.uuid %]", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% spce_test.testuser1002.uuid %]", - "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1002.uuid %]", - "local", - "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", - "total", - "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" - ] - start|ROUTE_ACC_CALLER: - return|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: @@ -154,37 +118,45 @@ flow: - start|ROUTE_APPLY_HEADER_RULES: - return|ROUTE_APPLY_HEADER_RULES: - return|BRANCH_ROUTE_SBC: + - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: + - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: + - start|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_SET_BRANCH_HDRS: + - start|ROUTE_PREPARE_UA: + - return|ROUTE_PREPARE_UA: + - return|ROUTE_SET_BRANCH_HDRS: + - start|ROUTE_SET_RUSER: + - return|ROUTE_SET_RUSER: + - start|ROUTE_DROP: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_DROP: - start|DEFAULT_SEND: - exit|DEFAULT_SEND: - - exit|DEFAULT_SEND: + - start|ROUTE_OUTBOUND: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: $avp(lua_dlg_profile): [ - 'accountout:[% customer_test.id %]', - 'userout:[% spce_test.testuser1003.uuid %]', - 'account:[% customer_test.id %]', - 'user:[% spce_test.testuser1003.uuid %]', - 'totalaccountout:[% customer_test.id %]', - 'totaluserout:[% spce_test.testuser1003.uuid %]', - 'totalaccount:[% customer_test.id %]', - 'totaluser:[% spce_test.testuser1003.uuid %]', - "accountout:[% customer_test.id %]", - "userout:[% spce_test.testuser1002.uuid %]", - "account:[% customer_test.id %]", - "user:[% spce_test.testuser1002.uuid %]", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% spce_test.testuser1002.uuid %]", - "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1002.uuid %]", - "local", - "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", - "total", - "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" - ] + "accountout:[% customer_test.id %]", + "userout:[% spce_test.testuser1002.uuid %]", + "account:[% customer_test.id %]", + "user:[% spce_test.testuser1002.uuid %]", + "totalaccountout:[% customer_test.id %]", + "totaluserout:[% spce_test.testuser1002.uuid %]", + "totalaccount:[% customer_test.id %]", + "totaluser:[% spce_test.testuser1002.uuid %]", + "local", + "totalaccount:[% customer_test.id %]", + "totaluser:[% spce_test.testuser1003.uuid %]", + "total", + "account:[% customer_test.id %]", + "user:[% spce_test.testuser1003.uuid %]" + ] - exit|ROUTE_EXIT: sip_in: - '^SIP/2.0 302 Moved Temporarily' diff --git a/scenarios/invite_redirect/0012_test.yml.tt2 b/scenarios/invite_redirect/0012_test.yml.tt2 index 78b32e05..31102f6d 100644 --- a/scenarios/invite_redirect/0012_test.yml.tt2 +++ b/scenarios/invite_redirect/0012_test.yml.tt2 @@ -12,14 +12,6 @@ flow: - start|dialog:start: - return|dialog:start: $avp(lua_dlg_profile): [ - 'accountout:[% customer_test.id %]', - 'userout:[% spce_test.testuser1003.uuid %]', - 'account:[% customer_test.id %]', - 'user:[% spce_test.testuser1003.uuid %]', - 'totalaccountout:[% customer_test.id %]', - 'totaluserout:[% spce_test.testuser1003.uuid %]', - 'totalaccount:[% customer_test.id %]', - 'totaluser:[% spce_test.testuser1003.uuid %]', "accountout:[% customer_test.id %]", "userout:[% spce_test.testuser1002.uuid %]", "account:[% customer_test.id %]", @@ -34,7 +26,7 @@ flow: "total", "account:[% customer_test.id %]", "user:[% spce_test.testuser1003.uuid %]" - ] + ] - return|dialog:start: sip_in: - '^SIP/2.0 200 OK' diff --git a/scenarios/invite_redirect/cdr_test.yml.tt2 b/scenarios/invite_redirect/cdr_test.yml.tt2 index 7e903ea7..c169a79b 100644 --- a/scenarios/invite_redirect/cdr_test.yml.tt2 +++ b/scenarios/invite_redirect/cdr_test.yml.tt2 @@ -7,4 +7,13 @@ cdr: destination_user_dialed: 'testuser1003' call_type: 'call' call_status: 'ok' + call_code: '200' + - source_user: 'testuser1003' + source_domain: 'spce.test' + source_cli: '4311002' + destination_user: 'testuser1004' + destination_domain: 'spce.test' + destination_user_dialed: 'testuser1004' + call_type: 'cfb' + call_status: 'ok' call_code: '200' \ No newline at end of file