pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40816?usp=email )
Change subject: {S1AP,NGAP}_Emulation: Fix using the value of an optional field containing omit ......................................................................
{S1AP,NGAP}_Emulation: Fix using the value of an optional field containing omit
This was triggered in NGAP_Emulation during run of C5G_Tests complete testusite, when running TC_ng_register_ping4_256.
Titan apparently doesn't like using a field set as omit in a field of a record during match().
Same fix is applied for S1AP_Emulation since they basically use the same logic.
Change-Id: I4812c2e9eeeadc26ad057cd8019f7570e4a16155 --- M library/NGAP_Emulation.ttcn M library/S1AP_Emulation.ttcn 2 files changed, 6 insertions(+), 0 deletions(-)
Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified
diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index cd71395..7b7d93d 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -264,6 +264,9 @@ runs on NGAP_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(NGapAssociationTable); i := i+1) { + if (not isvalue(NGapAssociationTable[i].ran_ue_ngap_id)) { + continue; + } if (istemplatekind(ran_id, "omit") or match(NGapAssociationTable[i].ran_ue_ngap_id, ran_id)) { if (istemplatekind(amf_id, "omit")) { diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index d1ac243..55a3380 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -209,6 +209,9 @@ runs on S1AP_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (not isvalue(S1apAssociationTable[i].enb_ue_s1ap_id)) { + continue; + } if (istemplatekind(enb_id, "omit") or match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { if (istemplatekind(mme_id, "omit")) {