pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34782?usp=email )
Change subject: WIP ......................................................................
WIP
Change-Id: I3b9b45eb4eed88ea5c1ba2b870c03b04f7f4c3b2 --- M epdg/EPDG_Tests.ttcn M library/DIAMETER_Templates.ttcn 2 files changed, 128 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/34782/1
diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 69a3d9b..2006632 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -316,6 +316,26 @@ } }
+/* Diameter SWx SAR + SAA. */ +private altstep as_DIA_SWx_SA_success() runs on EPDG_ConnHdlr { + var PDU_DIAMETER rx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + [] SWx.receive(tr_DIA_SWx_SAR(g_pars.imsi)) -> value rx_dia { + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + /* Send SAA to translator; expect it to show up on GSUP side */ + SWx.send(ts_DIA_SWx_SAA(g_pars.imsi, + sess_id := sess_id, + hbh_id := rx_dia.hop_by_hop_id, + ete_id := rx_dia.end_to_end_id)); + setverdict(pass); + } + [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); + } +} + /* GSUP AuthInfo Req + Resp, triggers SWx MAR + MAA. */ private function f_GSUP_AI_success() runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; @@ -337,8 +357,25 @@ setverdict(pass); }
+/* GSUP LU Req + Resp, triggers SWx SAR + SAA (Server Assignment). */ +private function f_GSUP_LU_success() runs on EPDG_ConnHdlr { + var GSUP_PDU rx_gsup; + var template octetstring destination_name := *; + GSUP.send(ts_GSUP_UL_REQ(g_pars.imsi)); + as_DIA_SWx_SA_success(); + /* Expect a positive response back to the translator; expect AIA */ + alt { + [] GSUP.receive(tr_GSUP_UL_RES(g_pars.imsi, destination_name)); + [] GSUP.receive(GSUP_PDU:?) -> value rx_gsup { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GSUP msg rx: ", rx_gsup)); + } + } + setverdict(pass); +} + private function f_TC_authinfo_normal(charstring id) runs on EPDG_ConnHdlr { f_GSUP_AI_success(); + f_GSUP_LU_success(); }
testcase TC_authinfo_normal() runs on MTC_CT { diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index cb010d7..100159c 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -1031,7 +1031,7 @@ } }
-/* TS 29.272 7.3.36 Service-Selection (refers to RFC 5778) */ +/* Service-Selection, TS 29.272 7.3.36, TS 29.273 5.2.3.5, (RFC 5778) */ template (present) GenericAVP tr_AVP_ServiceSelection(template (present) charstring apn := ?) := { avp := { avp_header := tr_DIA_Hdr(c_AVP_Code_MIPv6_NONE_Service_Selection), @@ -2258,6 +2258,24 @@ } }
+/* Server-Assignment-Type, 3GPP TS 29.273 8.2.3.12, 3GPP TS 29.229 6.3.15 */ +template (present) GenericAVP tr_AVP_3GPP_ServerAssignmentType(template (present) CxDx_3GPP_Server_Assignment_Type t := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Server_Assignment_Type), + avp_data := { + avp_CxDx_3GPP_Server_Assignment_Type := t + } + } +} +template (value) GenericAVP ts_AVP_3GPP_ServerAssignmentType(template (value) CxDx_3GPP_Server_Assignment_Type t) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Server_Assignment_Type), + avp_data := { + avp_CxDx_3GPP_Server_Assignment_Type := t + } + } +} + /***************************** * SWx 3GPP TS 29.273 *****************************/ @@ -2364,4 +2382,67 @@ ts_AVP_3GPP_SIPNumAuthDataItems(1) });
+/* Server-Assignment-Request, + * 3GPP TS 29.273 8.1.2.2.2 UE/PDN Registration/DeRegistration Notification + * 3GPP TS 29.273 8.2.2.3 Non-3GPP IP Access Registration Procedure */ +template (present) PDU_DIAMETER +tr_DIA_SWx_SAR(template (present) hexstring imsi := ?, + template (present) octetstring sess_id := ?, + template (present) charstring orig_host := ?, + template (present) charstring orig_realm := ?, + template (present) charstring dest_realm := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?, + template (present) CxDx_3GPP_Server_Assignment_Type server_ass_type := ?, + template (present) charstring service_selection := ?) := + tr_DIAMETER(flags := '1???????'B, + cmd_code := Server_Assignment, + app_id := int2oct(c_DIAMETER_3GPP_SWx_AID, 4), + hbh_id := hbh_id, ete_id := ete_id, + avps := superset( + tr_AVP_SessionId(sess_id), + tr_AVP_VendorSpecAppId(?, ?), + tr_AVP_AuthSessionState(NO_STATE_MAINTAINED), + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm), + tr_AVP_DestinationRealm(dest_realm), + tr_AVP_UserNameImsi(imsi), + tr_AVP_3GPP_ServerAssignmentType(server_ass_type), + tr_AVP_ServiceSelection(service_selection) + )); + +/* Server-Assignment-Answer, + * 3GPP TS 29.273 8.1.2.2.2 UE/PDN Registration/DeRegistration Notification + * 3GPP TS 29.273 8.2.2.3 Non-3GPP IP Access Registration Procedure */ +template (value) PDU_DIAMETER +ts_DIA_SWx_SAA(template (value) hexstring imsi, + template (value) uint32_t vendor_app_id := c_DIAMETER_3GPP_SWx_AID, + template (value) octetstring sess_id := c_def_sess_id, + template (value) charstring orig_host := "hss.localdomain", + template (value) charstring orig_realm := "localdomain", + template (value) UINT32 hbh_id := '00000000'O, + template (value) UINT32 ete_id := '00000000'O) := + ts_DIAMETER(flags := '01000000'B, + cmd_code := Multimedia_Auth, + app_id := int2oct(c_DIAMETER_3GPP_SWx_AID, 4), + hbh_id := hbh_id, + ete_id := ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_VendorSpecAppId(vendor_id_3GPP, valueof(vendor_app_id)), + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_AuthSessionState(NO_STATE_MAINTAINED), + ts_AVP_OriginHost(orig_host), + ts_AVP_OriginRealm(orig_realm), + ts_AVP_UserNameImsi(valueof(imsi)) + /* TODO: + * [ Non-3GPP-User-Data ] + * [ 3GPP-AAA-Server-Name ] + * [ OC-Supported-Features ] + * [ OC-OLR ] ] + * *[ Load ] + * *[ Supported-Features ] + */ + }); + }
-
pespin