From 0af478ebe11331320e2f7fa6a91de8e41f88c007 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 5 Feb 2021 18:00:58 +0100 Subject: pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default locally The same values are available for several tests as gloval consts. Change-Id: I32b7d841bc1fa896f9866c5d7fba857e1ca65ab3 --- pcu/PCU_Tests.ttcn | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 5f759920..0b887db7 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4124,9 +4124,6 @@ testcase TC_nacc_outbound_si_resolve_timeout() runs on RAW_PCU_Test_CT { * PCUIF on startup. */ testcase TC_rim_ran_info_req_single_rep() runs on RAW_PCU_Test_CT { const BssgpBvci bvci := mp_gb_cfg.bvc[0].bvci; - var octetstring si1_expect := '198fb100000000000000000000000000007900002b'O; - var octetstring si3_expect := '1b753000f110236ec9033c2747407900003c0b2b2b'O; - var octetstring si13_expect := '009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O; timer T := 2.0; /* Initialize NS/BSSGP side */ @@ -4139,11 +4136,11 @@ testcase TC_rim_ran_info_req_single_rep() runs on RAW_PCU_Test_CT { f_bssgp_establish(); /* Send sysinfo to the PCU */ - var template PCUIF_Message si1_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '5506'O & si1_expect, 0, 0, 0, 0, 32767); + var template PCUIF_Message si1_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '5506'O & si1_default, 0, 0, 0, 0, 32767); BTS.send(si1_data_ind); - var template PCUIF_Message si3_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '4906'O & si3_expect, 0, 0, 0, 0, 32767); + var template PCUIF_Message si3_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '4906'O & si3_default, 0, 0, 0, 0, 32767); BTS.send(si3_data_ind); - var template PCUIF_Message si16_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '0106'O & si13_expect, 0, 0, 0, 0, 32767); + var template PCUIF_Message si16_data_ind := ts_PCUIF_DATA_IND(0, 0, 0, 0, PCU_IF_SAPI_BCCH, '0106'O & si13_default, 0, 0, 0, 0, 32767); BTS.send(si16_data_ind); f_sleep(1.0); @@ -4158,9 +4155,6 @@ testcase TC_rim_ran_info_req_single_rep() runs on RAW_PCU_Test_CT { src_addr := valueof(t_RIM_Routing_Address_cid(src_cid)); dst_addr := valueof(t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id)); - - var octetstring si_expect := si1_expect & si3_expect & si13_expect; - req_cont := ts_RAN_Information_Request_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC), ts_RIM_Sequence_Number(1), ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), @@ -4175,7 +4169,7 @@ testcase TC_rim_ran_info_req_single_rep() runs on RAW_PCU_Test_CT { tr_RIM_Sequence_Number(1), tr_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP), tr_RIM_Protocol_Version_Number(1), - tru_ApplContainer_or_ApplErrContainer_NACC(tru_ApplContainer_NACC(mp_gb_cfg.bvc[0].cell_id, false, 3, si_expect)), + tru_ApplContainer_or_ApplErrContainer_NACC(tru_ApplContainer_NACC(mp_gb_cfg.bvc[0].cell_id, false, 3, si_default)), omit); bssgp_rim_pdu_expect := tr_PDU_BSSGP_RAN_INFORMATION(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, src_addr), -- cgit v1.2.3