laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35519?usp=email ) Change subject: library/GSUP_Types: add Source Name IE to receive templates for SMS ...................................................................... library/GSUP_Types: add Source Name IE to receive templates for SMS Old osmo-msc versions do not include the Source Name IE in SMS related GSUP messages, unless it's set explicitly in the config file ('hlr' / 'ipa-name'). Recent osmo-msc versions (see the related osmo-msc patch) do include this IE even if it's not set explicitly ('unnamed-MSC'). Because of this, some testcases in ttcn3-msc-test are currently failing for osmo-msc master, but still passing for the -latest. Let's set the 'ipa-name' explicitly in osmo-msc.cfg, and expect the Source Name IE to be present in SMS related receive templates. Change-Id: Ic24d3082fe3dce08e43e8f3ecb6d6132503c55c6 Related: docker-playground.git I7757aae1d01b679f530b5c0a6c95b224cb9f204f Related: osmo-msc.git I7bacd001b81326c32bc262c7d0c0491ded822fa8 Related: OS#6135 --- M library/GSUP_Types.ttcn M msc/osmo-msc.cfg 2 files changed, 42 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 323776f..b3154ac 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -1634,7 +1634,8 @@ tr_GSUP_IE_SM_RP_DA(sm_rp_da), tr_GSUP_IE_SM_RP_OA(sm_rp_oa), tr_GSUP_IE_SM_RP_UI(sm_rp_ui), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1657,7 +1658,8 @@ { tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1684,7 +1686,8 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), tr_GSUP_IE_SM_RP_CAUSE(sm_rp_cause), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1733,7 +1736,8 @@ tr_GSUP_IE_SM_RP_OA(sm_rp_oa), tr_GSUP_IE_SM_RP_UI(sm_rp_ui), tr_GSUP_IE_SM_RP_MMS(sm_rp_mms), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1756,7 +1760,8 @@ { tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1783,7 +1788,8 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), tr_GSUP_IE_SM_RP_CAUSE(sm_rp_cause), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1810,7 +1816,8 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), tr_GSUP_IE_SM_ALERT_RSN(sm_alert_rsn), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1833,7 +1840,8 @@ { tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); @@ -1860,7 +1868,8 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SM_RP_MR(sm_rp_mr), tr_GSUP_IE_SM_RP_CAUSE(sm_rp_cause), - tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS) + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) } ); diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index a266ed4..d05e400 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -76,3 +76,4 @@ hlr remote-ip 127.0.0.1 #remote-port 4222 + ipa-name test-MSC -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35519?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic24d3082fe3dce08e43e8f3ecb6d6132503c55c6 Gerrit-Change-Number: 35519 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged