diff --git a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 b/scenarios/incoming_foreign_dom/0003_test.yml.tt2 index cd761337..5f5a08b5 100644 --- a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0003_test.yml.tt2 @@ -30,8 +30,6 @@ flow: - return|ROUTE_CHECK_UA: - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLER_RESELLER_PREF: - - return|ROUTE_LOAD_CALLER_RESELLER_PREF: - return|ROUTE_LOAD_CALLER_PREF: - start|ROUTE_DLG_MANAGE: - return|ROUTE_DLG_MANAGE: @@ -57,8 +55,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -68,11 +64,9 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]" ] @@ -122,24 +116,18 @@ flow: - return|ROUTE_SET_CALLER_DIALOG_BASE: - return|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ - "resellerout:0", "accountout:0", "userout:0", - "reseller:0", "account:0", "user:0", - "totalresellerout:0", "totalaccountout:0", "totaluserout:0", - "totalreseller:0", "totalaccount:0", "totaluser:0", "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]" ] @@ -156,8 +144,6 @@ flow: - start|BRANCH_ROUTE_SBC: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -213,25 +199,19 @@ flow: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: - $avp(lua_dlg_profile): [ - "resellerout:0", + $avp(lua_dlg_profile): [ "accountout:0", "userout:0", - "reseller:0", "account:0", "user:0", - "totalresellerout:0", "totalaccountout:0", "totaluserout:0", - "totalreseller:0", "totalaccount:0", "totaluser:0", "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]" ] diff --git a/scenarios/incoming_foreign_dom/0008_test.yml.tt2 b/scenarios/incoming_foreign_dom/0008_test.yml.tt2 index 6fe39c7f..50a53209 100644 --- a/scenarios/incoming_foreign_dom/0008_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0008_test.yml.tt2 @@ -5,27 +5,21 @@ flow: - return|ROUTE_ENTRY: - start|ROUTE_APPLY_HEADER_RULES: - return|ROUTE_APPLY_HEADER_RULES: - $avp(lua_dlg_profile): [ - "resellerout:0", + $avp(lua_dlg_profile): [ "accountout:0", "userout:0", - "reseller:0", "account:0", "user:0", - "totalresellerout:0", "totalaccountout:0", "totaluserout:0", - "totalreseller:0", "totalaccount:0", "totaluser:0", "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]", + "totaluser:[% spce_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", - "user:[% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]" + "user:[% spce_test.testuser1003.uuid %]" ] - start|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA: diff --git a/scenarios/incoming_foreign_dom/0010_test.yml.tt2 b/scenarios/incoming_foreign_dom/0010_test.yml.tt2 index aedf0add..253922c4 100644 --- a/scenarios/incoming_foreign_dom/0010_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0010_test.yml.tt2 @@ -15,25 +15,19 @@ flow: - return|ROUTE_RUNTIME: - start|dialog:start: - return|dialog:start: - $avp(lua_dlg_profile): [ - "resellerout:0", + $avp(lua_dlg_profile): [ "accountout:0", "userout:0", - "reseller:0", "account:0", "user:0", - "totalresellerout:0", "totalaccountout:0", "totaluserout:0", - "totalreseller:0", "totalaccount:0", "totaluser:0", "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]" ] diff --git a/scenarios/incoming_hih/0003_test.yml.tt2 b/scenarios/incoming_hih/0003_test.yml.tt2 index ac066f66..563f66bf 100644 --- a/scenarios/incoming_hih/0003_test.yml.tt2 +++ b/scenarios/incoming_hih/0003_test.yml.tt2 @@ -47,8 +47,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -58,10 +56,8 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_hih_scenarios_test.testuser1003.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_hih_scenarios_test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" @@ -118,10 +114,8 @@ flow: - return|ROUTE_CNT_DLG_CHECK: - return|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_hih_scenarios_test.testuser1003.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_hih_scenarios_test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" diff --git a/scenarios/incoming_hih/0005_test.yml.tt2 b/scenarios/incoming_hih/0005_test.yml.tt2 index 3da18530..594af97f 100644 --- a/scenarios/incoming_hih/0005_test.yml.tt2 +++ b/scenarios/incoming_hih/0005_test.yml.tt2 @@ -27,8 +27,6 @@ flow: - return|ROUTE_CHECK_UA: - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLER_RESELLER_PREF: - - return|ROUTE_LOAD_CALLER_RESELLER_PREF: - return|ROUTE_LOAD_CALLER_PREF: - start|ROUTE_APPLY_HEADER_RULES: - return|ROUTE_APPLY_HEADER_RULES: @@ -56,8 +54,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - start|ROUTE_DLG_MANAGE: @@ -69,10 +65,8 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_hih_scenarios_test.testuser1002.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_hih_scenarios_test.testuser1002.uuid %]" ] @@ -119,10 +113,8 @@ flow: - start|ROUTE_OUTBOUND: $avp(lua_dlg_profile): [ "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_hih_scenarios_test.testuser1002.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_hih_scenarios_test.testuser1002.uuid %]" ] @@ -135,23 +127,17 @@ flow: - return|ROUTE_SET_CALLER_DIALOG_BASE: - return|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ - "resellerout:1", "accountout:[% customer_test.id %]", "userout:[% incoming_hih_scenarios_test.testuser1003.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_hih_scenarios_test.testuser1003.uuid %]", - "totalresellerout:1", "totalaccountout:[% customer_test.id %]", "totaluserout:[% incoming_hih_scenarios_test.testuser1003.uuid %]", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_hih_scenarios_test.testuser1003.uuid %]", "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_hih_scenarios_test.testuser1002.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_hih_scenarios_test.testuser1002.uuid %]" ] @@ -166,8 +152,6 @@ flow: - start|BRANCH_ROUTE_SBC: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -224,23 +208,17 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: $avp(lua_dlg_profile): [ - "resellerout:1", "accountout:[% customer_test.id %]", "userout:[% incoming_hih_scenarios_test.testuser1003.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_hih_scenarios_test.testuser1003.uuid %]", - "totalresellerout:1", "totalaccountout:[% customer_test.id %]", "totaluserout:[% incoming_hih_scenarios_test.testuser1003.uuid %]", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_hih_scenarios_test.testuser1003.uuid %]", "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_hih_scenarios_test.testuser1002.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_hih_scenarios_test.testuser1002.uuid %]" ] diff --git a/scenarios/incoming_hih/0014_test.yml.tt2 b/scenarios/incoming_hih/0014_test.yml.tt2 index 0a88bb09..17fd26d2 100644 --- a/scenarios/incoming_hih/0014_test.yml.tt2 +++ b/scenarios/incoming_hih/0014_test.yml.tt2 @@ -13,10 +13,8 @@ flow: - start|dialog:start: - return|dialog:start: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_hih_scenarios_test.testuser1003.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_hih_scenarios_test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" diff --git a/scenarios/incoming_peer/0007_test.yml.tt2 b/scenarios/incoming_peer/0007_test.yml.tt2 index eed4279c..65b81dfb 100644 --- a/scenarios/incoming_peer/0007_test.yml.tt2 +++ b/scenarios/incoming_peer/0007_test.yml.tt2 @@ -45,8 +45,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -56,12 +54,10 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] @@ -106,12 +102,10 @@ flow: - start|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ "incoming", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_stir_scenarios.test_testuser1003.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] @@ -131,8 +125,6 @@ flow: - start|BRANCH_ROUTE_SBC: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -191,12 +183,10 @@ flow: - exit|ROUTE_EXIT: $avp(lua_dlg_profile): [ "incoming", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] diff --git a/scenarios/incoming_peer/0014_test.yml.tt2 b/scenarios/incoming_peer/0014_test.yml.tt2 index e8f56bcb..fc475c9d 100644 --- a/scenarios/incoming_peer/0014_test.yml.tt2 +++ b/scenarios/incoming_peer/0014_test.yml.tt2 @@ -19,12 +19,10 @@ flow: - return|dialog:start: $avp(lua_dlg_profile): [ "incoming", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer.scenarios_test_testuser1003.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer.scenarios_test_testuser1003.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] diff --git a/scenarios/incoming_peer/0021_test.yml.tt2 b/scenarios/incoming_peer/0021_test.yml.tt2 index 3edb6dd8..3807b3e1 100644 --- a/scenarios/incoming_peer/0021_test.yml.tt2 +++ b/scenarios/incoming_peer/0021_test.yml.tt2 @@ -51,8 +51,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -62,10 +60,8 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_peer.scenarios.test.testuser1004.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_peer.scenarios.test.testuser1004.uuid %]", "peer:[% peer_00_host0.id %]", @@ -112,12 +108,10 @@ flow: - start|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ "incoming", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_scenarios_test.testuser1004.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer.scenarios.test.testuser1004.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_scenarios_test.testuser1004.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1004.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] @@ -137,8 +131,6 @@ flow: - start|BRANCH_ROUTE_SBC: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -197,12 +189,10 @@ flow: - exit|ROUTE_EXIT: $avp(lua_dlg_profile): [ "incoming", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_scenarios_test.testuser1004.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer.scenarios.test.testuser1004.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_scenarios_test.testuser1004.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1004.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] diff --git a/scenarios/incoming_peer/0035_test.yml.tt2 b/scenarios/incoming_peer/0035_test.yml.tt2 index ecd4c13f..80d39036 100644 --- a/scenarios/incoming_peer/0035_test.yml.tt2 +++ b/scenarios/incoming_peer/0035_test.yml.tt2 @@ -49,8 +49,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -60,12 +58,10 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_scenarios_test.testuser1005.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer.scenarios.test.testuser1005.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_scenarios_test.testuser1005.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1005.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] @@ -110,12 +106,10 @@ flow: - start|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ "incoming", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_scenarios_test.testuser1005.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer.scenarios.test.testuser1005.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_scenarios_test.testuser1005.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1005.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] @@ -135,8 +129,6 @@ flow: - start|BRANCH_ROUTE_SBC: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -195,12 +187,10 @@ flow: - exit|ROUTE_EXIT: $avp(lua_dlg_profile): [ "incoming", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_scenarios_test.testuser1005.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer.scenarios.test.testuser1005.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_scenarios_test.testuser1005.uuid %]", + "user:[% incoming_peer.scenarios.test.testuser1005.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] diff --git a/scenarios/incoming_peer_stir/0003_test.yml.tt2 b/scenarios/incoming_peer_stir/0003_test.yml.tt2 index 5b3f278b..a91c4fc6 100644 --- a/scenarios/incoming_peer_stir/0003_test.yml.tt2 +++ b/scenarios/incoming_peer_stir/0003_test.yml.tt2 @@ -46,8 +46,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -57,12 +55,10 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", + "user:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] @@ -118,12 +114,10 @@ flow: - start|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ "incoming", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_stir_scenarios.test_testuser1003.uuid %]", + "user:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] @@ -143,8 +137,6 @@ flow: - start|BRANCH_ROUTE_SBC: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -203,10 +195,8 @@ flow: - exit|ROUTE_EXIT: $avp(lua_dlg_profile): [ "incoming", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", diff --git a/scenarios/incoming_peer_stir/0010_test.yml.tt2 b/scenarios/incoming_peer_stir/0010_test.yml.tt2 index bfd65e0a..476a5e67 100644 --- a/scenarios/incoming_peer_stir/0010_test.yml.tt2 +++ b/scenarios/incoming_peer_stir/0010_test.yml.tt2 @@ -19,10 +19,8 @@ flow: - return|dialog:start: $avp(lua_dlg_profile): [ "incoming", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", - "reseller:1", "account:[% customer_test.id %]", "user:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", diff --git a/scenarios/incoming_peer_stir/0017_test.yml.tt2 b/scenarios/incoming_peer_stir/0017_test.yml.tt2 index 8e7afff7..1aeac98e 100644 --- a/scenarios/incoming_peer_stir/0017_test.yml.tt2 +++ b/scenarios/incoming_peer_stir/0017_test.yml.tt2 @@ -46,8 +46,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -57,12 +55,10 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", + "user:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] diff --git a/scenarios/incoming_peer_stir/0019_test.yml.tt2 b/scenarios/incoming_peer_stir/0019_test.yml.tt2 index d998f947..8aa910f3 100644 --- a/scenarios/incoming_peer_stir/0019_test.yml.tt2 +++ b/scenarios/incoming_peer_stir/0019_test.yml.tt2 @@ -46,8 +46,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -57,12 +55,10 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", + "user:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] diff --git a/scenarios/incoming_peer_stir/0021_test.yml.tt2 b/scenarios/incoming_peer_stir/0021_test.yml.tt2 index 5e236c73..e3bf0f36 100644 --- a/scenarios/incoming_peer_stir/0021_test.yml.tt2 +++ b/scenarios/incoming_peer_stir/0021_test.yml.tt2 @@ -46,8 +46,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -57,12 +55,10 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", + "user:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] diff --git a/scenarios/incoming_peer_stir/0023_test.yml.tt2 b/scenarios/incoming_peer_stir/0023_test.yml.tt2 index e8effdcf..38bc83e5 100644 --- a/scenarios/incoming_peer_stir/0023_test.yml.tt2 +++ b/scenarios/incoming_peer_stir/0023_test.yml.tt2 @@ -46,8 +46,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -57,12 +55,10 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", - "reseller:1", + "totaluser:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "account:[% customer_test.id %]", - "user:[% incoming_peer_stir_scenarios_test.testuser1003.uuid %]", + "user:[% incoming_peer_stir.scenarios.test.testuser1003.uuid %]", "peer:[% peer_00_host0.id %]", "total" ] diff --git a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match/0005_test.yml.tt2 index 91155586..198ac259 100644 --- a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match/0005_test.yml.tt2 @@ -36,8 +36,6 @@ flow: - return|ROUTE_CHECK_UA: - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLER_RESELLER_PREF: - - return|ROUTE_LOAD_CALLER_RESELLER_PREF: - return|ROUTE_LOAD_CALLER_PREF: $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_match_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_match_scenarios_test.testuser1002.phone_number %]9*'] $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_match_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_match_scenarios_test.testuser1002.phone_number %]9*'] @@ -70,8 +68,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -81,11 +77,9 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% invite_allowedcli_match_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% invite_allowedcli_match_scenarios_test.testuser1003.uuid %]" ] @@ -129,13 +123,11 @@ flow: - start|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% invite_allowedcli_match_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_scenarios_test.testuser1003.uuid %]", + "user:[% invite_allowedcli_match_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -145,24 +137,18 @@ flow: - return|ROUTE_SET_CALLER_DIALOG_BASE: - return|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ - "resellerout:1", - "accountout:[% customer_test.id %]", - "userout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", - "reseller:1", - "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", - "totalresellerout:1", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", - "totalreseller:1", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", + 'accountout:[% customer_test.id %]', + 'userout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', + 'account:[% customer_test.id %]', + 'user:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', + 'totalaccountout:[% customer_test.id %]', + 'totaluserout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', + 'totalaccount:[% customer_test.id %]', + 'totaluser:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% invite_allowedcli_match_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% invite_allowedcli_match_scenarios_test.testuser1003.uuid %]" ] @@ -179,8 +165,6 @@ flow: - start|BRANCH_ROUTE_SBC: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -237,24 +221,18 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: $avp(lua_dlg_profile): [ - "resellerout:1", - "accountout:[% customer_test.id %]", - "userout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", - "reseller:1", - "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", - "totalresellerout:1", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", - "totalreseller:1", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", + 'accountout:[% customer_test.id %]', + 'userout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', + 'account:[% customer_test.id %]', + 'user:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', + 'totalaccountout:[% customer_test.id %]', + 'totaluserout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', + 'totalaccount:[% customer_test.id %]', + 'totaluser:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% invite_allowedcli_match_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% invite_allowedcli_match_scenarios_test.testuser1003.uuid %]" ] diff --git a/scenarios/invite_allowedcli_match/0012_test.yml.tt2 b/scenarios/invite_allowedcli_match/0012_test.yml.tt2 index 3f918bc1..6200c5d9 100644 --- a/scenarios/invite_allowedcli_match/0012_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match/0012_test.yml.tt2 @@ -18,24 +18,18 @@ flow: - start|dialog:start: - return|dialog:start: $avp(lua_dlg_profile): [ - "resellerout:1", - "accountout:[% customer_test.id %]", - "userout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", - "reseller:1", - "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", - "totalresellerout:1", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", - "totalreseller:1", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]", + 'accountout:[% customer_test.id %]', + 'userout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', + 'account:[% customer_test.id %]', + 'user:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', + 'totalaccountout:[% customer_test.id %]', + 'totaluserout:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', + 'totalaccount:[% customer_test.id %]', + 'totaluser:[% invite_allowedcli_match_scenarios_test.testuser1002.uuid %]', "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% invite_allowedcli_match_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% invite_allowedcli_match_scenarios_test.testuser1003.uuid %]" ] diff --git a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 index 451fb478..d617f223 100644 --- a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 @@ -37,8 +37,6 @@ flow: - return|ROUTE_CHECK_UA: - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLER_RESELLER_PREF: - - return|ROUTE_LOAD_CALLER_RESELLER_PREF: - return|ROUTE_LOAD_CALLER_PREF: $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]9*'] $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]9*'] @@ -70,8 +68,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -81,11 +77,9 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" ] @@ -129,13 +123,11 @@ flow: - start|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", + "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -145,24 +137,18 @@ flow: - return|ROUTE_SET_CALLER_DIALOG_BASE: - return|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ - "resellerout:1", - "accountout:[% customer_test.id %]", - "userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "reseller:1", - "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalresellerout:1", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalreseller:1", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", + 'accountout:[% customer_test.id %]', + 'userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', + 'account:[% customer_test.id %]', + 'user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', + 'totalaccountout:[% customer_test.id %]', + 'totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', + 'totalaccount:[% customer_test.id %]', + 'totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" ] @@ -179,8 +165,6 @@ flow: - start|BRANCH_ROUTE_SBC: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -238,24 +222,18 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: $avp(lua_dlg_profile): [ - "resellerout:1", - "accountout:[% customer_test.id %]", - "userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "reseller:1", - "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalresellerout:1", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalreseller:1", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", + 'accountout:[% customer_test.id %]', + 'userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', + 'account:[% customer_test.id %]', + 'user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', + 'totalaccountout:[% customer_test.id %]', + 'totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', + 'totalaccount:[% customer_test.id %]', + 'totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" ] diff --git a/scenarios/invite_allowedcli_match_alias/0012_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0012_test.yml.tt2 index c913f233..b15b4fd0 100644 --- a/scenarios/invite_allowedcli_match_alias/0012_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0012_test.yml.tt2 @@ -18,24 +18,18 @@ flow: - start|dialog:start: - return|dialog:start: $avp(lua_dlg_profile): [ - "resellerout:1", - "accountout:[% customer_test.id %]", - "userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "reseller:1", - "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalresellerout:1", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalreseller:1", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", + 'accountout:[% customer_test.id %]', + 'userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', + 'account:[% customer_test.id %]', + 'user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', + 'totalaccountout:[% customer_test.id %]', + 'totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', + 'totalaccount:[% customer_test.id %]', + 'totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" ] diff --git a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 index e4280e73..bd297266 100644 --- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 @@ -37,8 +37,6 @@ flow: - return|ROUTE_CHECK_UA: - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLER_RESELLER_PREF: - - return|ROUTE_LOAD_CALLER_RESELLER_PREF: - return|ROUTE_LOAD_CALLER_PREF: $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]9*'] $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]9*'] @@ -71,8 +69,6 @@ flow: - start|ROUTE_LOAD_CALLEE_PREF: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -81,14 +77,12 @@ flow: - start|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - return|ROUTE_SET_CALLEE_DIALOG: - $avp(lua_dlg_profile): [ - "totalreseller:1", + $avp(lua_dlg_profile) : [ "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", + "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" + "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_BLOCK_IN: - return|ROUTE_BLOCK_IN: @@ -128,15 +122,13 @@ flow: - return|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS: - start|ROUTE_OUTBOUND: - start|ROUTE_SET_CALLER_DIALOG: - $avp(lua_dlg_profile): [ + $avp(lua_dlg_profile) : [ "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", + "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", + "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -145,27 +137,21 @@ flow: - start|ROUTE_SET_CALLER_DIALOG_BASE: - return|ROUTE_SET_CALLER_DIALOG_BASE: - return|ROUTE_SET_CALLER_DIALOG: - $avp(lua_dlg_profile): [ - "resellerout:1", - "accountout:[% customer_test.id %]", - "userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "reseller:1", - "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalresellerout:1", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalreseller:1", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", + $avp(lua_dlg_profile) : [ + 'accountout:[% customer_test.id %]', + 'userout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'account:[% customer_test.id %]', + 'user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'totalaccountout:[% customer_test.id %]', + 'totaluserout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'totalaccount:[% customer_test.id %]', + 'totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", + "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" + "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_ACC_CALLER: - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: @@ -180,8 +166,6 @@ flow: - start|BRANCH_ROUTE_SBC: - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLEE_RESELLER_PREF: - - return|ROUTE_LOAD_CALLEE_RESELLER_PREF: - start|ROUTE_SET_CALLEE_DIALOG: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: @@ -237,27 +221,21 @@ flow: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: - $avp(lua_dlg_profile): [ - "resellerout:1", - "accountout:[% customer_test.id %]", - "userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "reseller:1", - "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalresellerout:1", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalreseller:1", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", + $avp(lua_dlg_profile) : [ + 'accountout:[% customer_test.id %]', + 'userout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'account:[% customer_test.id %]', + 'user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'totalaccountout:[% customer_test.id %]', + 'totaluserout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'totalaccount:[% customer_test.id %]', + 'totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", + "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" + "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]" ] sip_in: - '^INVITE' diff --git a/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2 index be69643a..d7b0f9dc 100644 --- a/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2 @@ -5,27 +5,21 @@ flow: - return|ROUTE_ENTRY: - start|ROUTE_APPLY_HEADER_RULES: - return|ROUTE_APPLY_HEADER_RULES: - $avp(lua_dlg_profile): [ - "resellerout:1", - "accountout:[% customer_test.id %]", - "userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "reseller:1", - "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalresellerout:1", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalreseller:1", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", + $avp(lua_dlg_profile) : [ + 'accountout:[% customer_test.id %]', + 'userout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'account:[% customer_test.id %]', + 'user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'totalaccountout:[% customer_test.id %]', + 'totaluserout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'totalaccount:[% customer_test.id %]', + 'totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", + "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" + "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA: diff --git a/scenarios/invite_allowedcli_nonmatch/0012_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0012_test.yml.tt2 index 9d41b5de..0c180f49 100644 --- a/scenarios/invite_allowedcli_nonmatch/0012_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch/0012_test.yml.tt2 @@ -17,27 +17,21 @@ flow: - return|ROUTE_RUNTIME: - start|dialog:start: - return|dialog:start: - $avp(lua_dlg_profile): [ - "resellerout:1", - "accountout:[% customer_test.id %]", - "userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "reseller:1", - "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalresellerout:1", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", - "totalreseller:1", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]", + $avp(lua_dlg_profile) : [ + 'accountout:[% customer_test.id %]', + 'userout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'account:[% customer_test.id %]', + 'user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'totalaccountout:[% customer_test.id %]', + 'totaluserout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', + 'totalaccount:[% customer_test.id %]', + 'totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]', "local", - "totalreseller:1", "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", + "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]", "total", - "reseller:1", "account:[% customer_test.id %]", - "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" + "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]" ] sip_in: - '^SIP/2.0 200 OK' diff --git a/scenarios/invite_allowedcli_nonmatch_reject/0003_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch_reject/0003_test.yml.tt2 index 49e75cba..6fd05d97 100644 --- a/scenarios/invite_allowedcli_nonmatch_reject/0003_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch_reject/0003_test.yml.tt2 @@ -36,8 +36,6 @@ flow: - return|ROUTE_CHECK_UA: - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLER_RESELLER_PREF: - - return|ROUTE_LOAD_CALLER_RESELLER_PREF: - return|ROUTE_LOAD_CALLER_PREF: $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_nonmatch_reject_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_nonmatch_reject_scenarios_test.testuser1002.phone_number %]9*'] $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_nonmatch_reject_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_nonmatch_reject_scenarios_test.testuser1002.phone_number %]9*'] diff --git a/scenarios/invite_allowip/0003_test.yml.tt2 b/scenarios/invite_allowip/0003_test.yml.tt2 index 73314ad2..6e4f858b 100644 --- a/scenarios/invite_allowip/0003_test.yml.tt2 +++ b/scenarios/invite_allowip/0003_test.yml.tt2 @@ -36,8 +36,6 @@ flow: - return|ROUTE_CHECK_UA: - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLER_RESELLER_PREF: - - return|ROUTE_LOAD_CALLER_RESELLER_PREF: - return|ROUTE_LOAD_CALLER_PREF: $xavp(caller_usr_prefs[0]=>allowed_ips_grp[*]): '\d+' $xavp(caller_real_prefs[0]=>allowed_ips_grp[*]): '\d+' diff --git a/scenarios/invite_prack/0002_test.yml.tt2 b/scenarios/invite_prack/0002_test.yml.tt2 index d7ecccbc..ca6d8c27 100644 --- a/scenarios/invite_prack/0002_test.yml.tt2 +++ b/scenarios/invite_prack/0002_test.yml.tt2 @@ -31,8 +31,6 @@ flow: - return|ROUTE_CHECK_UA: - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - start|ROUTE_LOAD_CALLER_RESELLER_PREF: - - return|ROUTE_LOAD_CALLER_RESELLER_PREF: - return|ROUTE_LOAD_CALLER_PREF: - start|ROUTE_DLG_MANAGE: - return|ROUTE_DLG_MANAGE: