daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29206 )
Change subject: hnbap: Use protocolExtensions := * in tr and omit in ts templates ......................................................................
hnbap: Use protocolExtensions := * in tr and omit in ts templates
Change-Id: Ic8f9afc9d74507f7d73f52cefc92ed1c2dc4b1bc --- M hnbgw/HNBGW_Tests.ttcn M library/hnbap/HNBAP_Templates.ttcn 2 files changed, 62 insertions(+), 2 deletions(-)
Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved
diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index d3d3a36..b440292 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -638,7 +638,7 @@ { timer T := 2.0;
- HNBAP[hnb_idx].send(tr_HNBAP_HNBRegisterRequest(char2oct("TTCN3 HNodeB"), + HNBAP[hnb_idx].send(ts_HNBAP_HNBRegisterRequest(char2oct("TTCN3 HNodeB"), '00F110'O, int2bit(1 + cell_id, 28), int2oct(2, 2), diff --git a/library/hnbap/HNBAP_Templates.ttcn b/library/hnbap/HNBAP_Templates.ttcn index 0e62291..89edf76 100644 --- a/library/hnbap/HNBAP_Templates.ttcn +++ b/library/hnbap/HNBAP_Templates.ttcn @@ -83,6 +83,66 @@ value_ := { sAC := sac } } }, + protocolExtensions := * + } + } + } +} + +template (value) HNBAP_PDU +ts_HNBAP_HNBRegisterRequest(template (value) octetstring hNB_Identity_Info, + template (value) OCT3 plmnid, + template (value) BIT28 cell_identity, + template (value) OCT2 lac, + template (value) OCT1 rac, + template (value) OCT2 sac) := { + initiatingMessage := { + procedureCode := id_HNBRegister, + criticality := reject, + value_ := { + hNBRegisterRequest := { + protocolIEs := { + { + id := HNBAP_Constants.id_HNB_Identity, + criticality := reject, + value_ := { + hNB_Identity := { + hNB_Identity_Info := hNB_Identity_Info, + iE_Extensions := omit + } + } + }, { + id := 8, + criticality := reject, + value_ := { + hNB_Location_Information := { + macroCoverageInfo := omit, + geographicalCoordinates := omit, + iE_Extensions := omit + } + } + }, { + id := 9, + criticality := reject, + value_ := { pLMNidentity := plmnid } + }, { + id := 11, + criticality := reject, + value_ := { cellIdentity := cell_identity } + }, { + id := 6, + criticality := reject, + value_ := { lAC := lac } + }, { + id := 7, + criticality := reject, + value_ := { rAC := rac } + }, { + id := 10, + criticality := reject, + value_ := { sAC := sac } + } + }, protocolExtensions := omit } } @@ -105,7 +165,7 @@ value_ := { RNC_ID := rnc_id } } }, - protocolExtensions := omit /* TODO: Mux Port Number (optional) 9.2.29 */ + protocolExtensions := * /* TODO: Mux Port Number (optional) 9.2.29 */ } } }