pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39769?usp=email ) Change subject: SCCP_Templates: Expect either proto class0 or class1 upon rx SCCP ...................................................................... SCCP_Templates: Expect either proto class0 or class1 upon rx SCCP Until recently, libosmo-sigtran only sent class0, but it is now able to send class1 too (0061e8d0bcba3b0ed5ea255588619627d0975380). Adapt the test expectancies. Change-Id: Ia1e05b24f1b56404d951eece0e9314d784d375db --- M library/SCCP_Templates.ttcn 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index f36dc5a..8f84d83 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -85,6 +85,8 @@ } /* connection oriented SCCP */ +const SCCP_param_ProtocolClass c_class0 := { class:='0000'B, messageHandling:='0000'B };//class 0 +const SCCP_param_ProtocolClass c_class1 := { class:='0001'B, messageHandling:='0000'B };//class 1 const SCCP_param_ProtocolClass c_class2 := { class:='0010'B, messageHandling:='0000'B };//class 2 function ts_SCCP_CR(OCT3 source_lref, SCCP_PAR_Address calling, SCCP_PAR_Address called) @@ -210,10 +212,10 @@ template PDU_SCCP tr_SCCP_UDT(template (present) SCCP_PAR_Address calling, template (present) SCCP_PAR_Address called, template octetstring data := ?, - template BIT4 msg_hdl := '0000'B) := { + template (present) SCCP_param_ProtocolClass protClass := (c_class0, c_class1)) := { unitdata := { messageType := udt, - protClass := {'0000'B, msg_hdl}, + protClass := protClass, pointer1 := ?, pointer2 := ?, pointer3 := ?, @@ -251,11 +253,11 @@ template PDU_SCCP tr_SCCP_XUDT(template (present) SCCP_PAR_Address calling, template (present) SCCP_PAR_Address called, template octetstring data := ?, - template BIT4 msg_hdl := '0000'B, + template (present) SCCP_param_ProtocolClass protClass := (c_class0, c_class1), template integer hop_ctr := ?) := { extudata := { messageType := xudt, - protClass := {'0000'B, msg_hdl}, + protClass := protClass, hopCounter := hop_ctr, pointer1 := ?, pointer2 := ?, @@ -297,11 +299,11 @@ template PDU_SCCP tr_SCCP_LUDT(template (present) SCCP_PAR_Address calling, template (present) SCCP_PAR_Address called, template octetstring data := ?, - template BIT4 msg_hdl := '0000'B, + template (present) SCCP_param_ProtocolClass protClass := (c_class0, c_class1), template integer hop_ctr := ?) := { longudata := { messageType := ludt, - protClass := {'0000'B, msg_hdl}, + protClass := protClass, hopCounter := hop_ctr, pointer1 := ?, pointer2 := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39769?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia1e05b24f1b56404d951eece0e9314d784d375db Gerrit-Change-Number: 39769 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>