From ca5c52084270ac5612bfd258b151b522266a169a Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Mon, 25 May 2020 22:03:28 +0700 Subject: [PATCH] BSC: use existing templates for ASP_RSL_Unitdata Change-Id: I3243850d3ceedcd89ab5be20ff4f444cd39c9d6e --- bsc/BSC_Tests_CBSP.ttcn | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index baba4c083..94167ce11 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -71,23 +71,23 @@ type component cbsp_test_CT extends test_CT, CBSP_Adapter_CT { } private altstep as_IgnRSL(template RSL_Message tr) runs on cbsp_test_CT { -[] IPA_RSL[0].receive(tr_RSL_UD(tr)) { repeat; } -[] IPA_RSL[1].receive(tr_RSL_UD(tr)) { repeat; } -[] IPA_RSL[2].receive(tr_RSL_UD(tr)) { repeat; } +[] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)) { repeat; } +[] IPA_RSL[1].receive(tr_ASP_RSL_UD(tr)) { repeat; } +[] IPA_RSL[2].receive(tr_ASP_RSL_UD(tr)) { repeat; } } private altstep as_FailRSL() runs on cbsp_test_CT { var template RSL_Message tr := (tr_RSL_SMSCB_CMD); var ASP_RSL_Unitdata rx; -[] IPA_RSL[0].receive(tr_RSL_UD(tr)) -> value rx { +[] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)) -> value rx { setverdict(fail, "Received unexpected RSL ", rx); mtc.stop; } -[] IPA_RSL[1].receive(tr_RSL_UD(tr)) -> value rx { +[] IPA_RSL[1].receive(tr_ASP_RSL_UD(tr)) -> value rx { setverdict(fail, "Received unexpected RSL ", rx); mtc.stop; } -[] IPA_RSL[2].receive(tr_RSL_UD(tr)) -> value rx { +[] IPA_RSL[2].receive(tr_ASP_RSL_UD(tr)) -> value rx { setverdict(fail, "Received unexpected RSL ", rx); mtc.stop; } @@ -276,11 +276,6 @@ function f_cbsp_kill(uint16_t msg_id, uint16_t ser_no, template (omit) uint8_t c } } -private template (present) ASP_RSL_Unitdata tr_RSL_UD(template (present) RSL_Message rsl) := { - streamId := ?, - rsl := rsl -} - template (present) RSL_IE_CbCommandType tr_RslCbCmdType(template (present) uint2_t lblock := ?, template (present) RSL_CbCommand cmd := ?) := { command := cmd, @@ -357,9 +352,9 @@ testcase TC_cbsp_write_bss() runs on cbsp_test_CT { var template RSL_Message tr := f_page2rsl(pages[0], 1, 1001); interleave { - [] IPA_RSL[0].receive(tr_RSL_UD(tr)) {} - [] IPA_RSL[1].receive(tr_RSL_UD(tr)) {} - [] IPA_RSL[2].receive(tr_RSL_UD(tr)) {} + [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)) {} + [] IPA_RSL[1].receive(tr_ASP_RSL_UD(tr)) {} + [] IPA_RSL[2].receive(tr_ASP_RSL_UD(tr)) {} } } @@ -372,7 +367,7 @@ testcase TC_cbsp_write_bts_cgi() runs on cbsp_test_CT { f_cbsp_write(2, 1002, cell_list, content:=pages, success_list:=cell_list, fail_list:=omit); var template RSL_Message tr := f_page2rsl(pages[0], 1, 1001); - IPA_RSL[0].receive(tr_RSL_UD(tr)); + IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)); f_sleep(5.0); } @@ -406,7 +401,7 @@ testcase TC_cbsp_write_lac_ci() runs on cbsp_test_CT { f_cbsp_init_server(); f_cbsp_write(5, 1005, cell_list, content:=pages, success_list:=?, fail_list:=omit); - IPA_RSL[0].receive(tr_RSL_UD(f_page2rsl(pages[0], 5, 1005))); + IPA_RSL[0].receive(tr_ASP_RSL_UD(f_page2rsl(pages[0], 5, 1005))); f_sleep(5.0); } @@ -418,7 +413,7 @@ testcase TC_cbsp_write_ci() runs on cbsp_test_CT { f_cbsp_init_server(); f_cbsp_write(6, 1006, cell_list, content:=pages, success_list:=?, fail_list:=omit); - IPA_RSL[0].receive(tr_RSL_UD(f_page2rsl(pages[0], 6, 1006))); + IPA_RSL[0].receive(tr_ASP_RSL_UD(f_page2rsl(pages[0], 6, 1006))); f_sleep(5.0); } @@ -430,7 +425,7 @@ testcase TC_cbsp_write_lai() runs on cbsp_test_CT { f_cbsp_init_server(); f_cbsp_write(7, 1007, cell_list, content:=pages, success_list:=?, fail_list:=omit); - IPA_RSL[0].receive(tr_RSL_UD(f_page2rsl(pages[0], 7, 1007))); + IPA_RSL[0].receive(tr_ASP_RSL_UD(f_page2rsl(pages[0], 7, 1007))); f_sleep(5.0); } @@ -444,8 +439,8 @@ testcase TC_cbsp_write_lac() runs on cbsp_test_CT { success_list:=?, fail_list:=omit); var template RSL_Message tr := f_page2rsl(pages[0], 8, 1008); interleave { - [] IPA_RSL[0].receive(tr_RSL_UD(tr)); - [] IPA_RSL[1].receive(tr_RSL_UD(tr)); + [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)); + [] IPA_RSL[1].receive(tr_ASP_RSL_UD(tr)); } f_sleep(5.0); }