August 2026 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Move generic PFCP ConnHdlr helpers to library/PFCP_Emulation.ttcn
by pespin 19 Aug '26

19 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43299?usp=email ) Change subject: hnbgw: Move generic PFCP ConnHdlr helpers to library/PFCP_Emulation.ttcn ...................................................................... hnbgw: Move generic PFCP ConnHdlr helpers to library/PFCP_Emulation.ttcn Change-Id: Ic40bea51934ad465a68e0d5690de066cbe1dc57d --- M hnbgw/HNBGW_Tests.ttcn M library/PFCP_Emulation.ttcn 2 files changed, 96 insertions(+), 94 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/43299/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index f43a738..da4a64d 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -260,100 +260,6 @@ return pfcp_associated; } -private function f_pfcp_wait_assoc_setup_req(boolean fail_timeout := true, boolean fail_rx_others := true, float wait_timeout := 16.0) runs on PFCP_ConnHdlr { - var PDU_PFCP m; - timer T := wait_timeout; - var integer rts := f_PFCPEM_get_recovery_timestamp(); - /* ask PFCPEM to route all PDUs to us */ - f_PFCPEM_subscribe_bcast(); - - T.start; - alt { - [] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { - PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), - ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); - setverdict(pass); - } - [fail_rx_others] PFCP.receive(PDU_PFCP:?) -> value m { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Got an unexpected PFCP message ", m, " vs exp ", tr_PFCP_Assoc_Setup_Req())); - } - [fail_timeout] T.timeout { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req())); - } - [not fail_timeout] T.timeout { - log("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req()); - } - } - T.stop; - /* ask PFCPEM to *not* route all PDUs to us anymore */ - f_PFCPEM_unsubscribe_bcast(); -} - -altstep as_pfcp_handle_heartbeat_req(integer tx_recovery_timestamp) -runs on PFCP_ConnHdlr { - var PDU_PFCP m; - - [] PFCP.receive(tr_PFCP_Heartbeat_Req) -> value m { - var PDU_PFCP tx_pfcp; - tx_pfcp := valueof(ts_PFCP_Heartbeat_Resp(tx_recovery_timestamp)); - tx_pfcp.sequence_number := m.sequence_number; - PFCP.send(tx_pfcp); - } -} - -/* Notify peer that we restarted, it will then try to associate again. */ -private function f_pfcp_force_assoc_setup_req(boolean fail_timeout := true, - boolean fail_rx_others := true, - float wait_timeout := 16.0) -runs on PFCP_ConnHdlr { - var boolean rx_hb_resp := false; - var boolean rx_assoc_setup_req := false; - var integer rts := f_PFCPEM_get_recovery_timestamp(); - var PDU_PFCP m; - timer T := wait_timeout; - - /* ask PFCPEM to route all PDUs to us */ - f_PFCPEM_subscribe_bcast(); - - T.start; - PFCP.send(ts_PFCP_Heartbeat_Req(rts)); - alt { - [not rx_hb_resp] PFCP.receive(tr_PFCP_Heartbeat_Resp) { - rx_hb_resp := true; - if (not rx_assoc_setup_req) { - repeat; - } - } - [not rx_assoc_setup_req] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { - rx_assoc_setup_req := true; - PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), - ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); - if (not rx_hb_resp) { - repeat; - } - } - [] as_pfcp_handle_heartbeat_req(rts) { repeat; } - [fail_rx_others] PFCP.receive(PDU_PFCP:?) -> value m { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Got an unexpected PFCP message ", m, " vs exp ", tr_PFCP_Assoc_Setup_Req())); - } - [fail_timeout] T.timeout { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req())); - } - [not fail_timeout] T.timeout { - log("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req()); - } - } - T.stop; - setverdict(pass); - - /* ask PFCPEM to *not* route all PDUs to us anymore */ - f_PFCPEM_unsubscribe_bcast(); -} - function f_init_pfcp(charstring id) runs on test_CT { id := id & "-PFCP"; diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index a5ec818..ec6777c 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -401,4 +401,100 @@ } } +/* Wait for peer to send a PFCP HEARTBEAT REQ to us, answer it */ +altstep as_pfcp_handle_heartbeat_req(integer tx_recovery_timestamp) +runs on PFCP_ConnHdlr { + var PDU_PFCP m; + + [] PFCP.receive(tr_PFCP_Heartbeat_Req) -> value m { + var PDU_PFCP tx_pfcp; + tx_pfcp := valueof(ts_PFCP_Heartbeat_Resp(tx_recovery_timestamp)); + tx_pfcp.sequence_number := m.sequence_number; + PFCP.send(tx_pfcp); + } +} + +/* Wait for peer to send a PFCP ASSOC SETUP REQ to us, answer it */ +function f_pfcp_wait_assoc_setup_req(boolean fail_timeout := true, boolean fail_rx_others := true, float wait_timeout := 16.0) runs on PFCP_ConnHdlr { + var PDU_PFCP m; + timer T := wait_timeout; + var integer rts := f_PFCPEM_get_recovery_timestamp(); + /* ask PFCPEM to route all PDUs to us */ + f_PFCPEM_subscribe_bcast(); + + T.start; + alt { + [] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { + PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), + ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); + setverdict(pass); + } + [fail_rx_others] PFCP.receive(PDU_PFCP:?) -> value m { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got an unexpected PFCP message ", m, " vs exp ", tr_PFCP_Assoc_Setup_Req())); + } + [fail_timeout] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req())); + } + [not fail_timeout] T.timeout { + log("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req()); + } + } + T.stop; + /* ask PFCPEM to *not* route all PDUs to us anymore */ + f_PFCPEM_unsubscribe_bcast(); +} + +/* Notify peer that we restarted, it will then try to associate again. */ +function f_pfcp_force_assoc_setup_req(boolean fail_timeout := true, + boolean fail_rx_others := true, + float wait_timeout := 16.0) +runs on PFCP_ConnHdlr { + var boolean rx_hb_resp := false; + var boolean rx_assoc_setup_req := false; + var integer rts := f_PFCPEM_get_recovery_timestamp(); + var PDU_PFCP m; + timer T := wait_timeout; + + /* ask PFCPEM to route all PDUs to us */ + f_PFCPEM_subscribe_bcast(); + + T.start; + PFCP.send(ts_PFCP_Heartbeat_Req(rts)); + alt { + [not rx_hb_resp] PFCP.receive(tr_PFCP_Heartbeat_Resp) { + rx_hb_resp := true; + if (not rx_assoc_setup_req) { + repeat; + } + } + [not rx_assoc_setup_req] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { + rx_assoc_setup_req := true; + PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), + ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); + if (not rx_hb_resp) { + repeat; + } + } + [] as_pfcp_handle_heartbeat_req(rts) { repeat; } + [fail_rx_others] PFCP.receive(PDU_PFCP:?) -> value m { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got an unexpected PFCP message ", m, " vs exp ", tr_PFCP_Assoc_Setup_Req())); + } + [fail_timeout] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req())); + } + [not fail_timeout] T.timeout { + log("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req()); + } + } + T.stop; + setverdict(pass); + + /* ask PFCPEM to *not* route all PDUs to us anymore */ + f_PFCPEM_unsubscribe_bcast(); +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43299?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic40bea51934ad465a68e0d5690de066cbe1dc57d Gerrit-Change-Number: 43299 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw: Send correct recovery timestamp in PFCP Assoc Setup Resp
by pespin 19 Aug '26

19 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43298?usp=email ) Change subject: hnbgw: Send correct recovery timestamp in PFCP Assoc Setup Resp ...................................................................... hnbgw: Send correct recovery timestamp in PFCP Assoc Setup Resp Change-Id: If57d58edbb4f4da529c6c189a84c25b153ac3326 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/43298/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index fc33521..f43a738 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -263,6 +263,7 @@ private function f_pfcp_wait_assoc_setup_req(boolean fail_timeout := true, boolean fail_rx_others := true, float wait_timeout := 16.0) runs on PFCP_ConnHdlr { var PDU_PFCP m; timer T := wait_timeout; + var integer rts := f_PFCPEM_get_recovery_timestamp(); /* ask PFCPEM to route all PDUs to us */ f_PFCPEM_subscribe_bcast(); @@ -270,7 +271,7 @@ alt { [] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), - ts_PFCP_Cause(REQUEST_ACCEPTED), 1234)); + ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); setverdict(pass); } [fail_rx_others] PFCP.receive(PDU_PFCP:?) -> value m { @@ -328,7 +329,7 @@ [not rx_assoc_setup_req] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { rx_assoc_setup_req := true; PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), - ts_PFCP_Cause(REQUEST_ACCEPTED), 1234)); + ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); if (not rx_hb_resp) { repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43298?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If57d58edbb4f4da529c6c189a84c25b153ac3326 Gerrit-Change-Number: 43298 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in onomondo-ipa[master]: V1.2: Add function ES10b.GetConnectivityParameters
by dexter 19 Aug '26

19 Aug '26

Attention is currently required from: jolly, laforge. dexter has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43054?usp=email ) Change subject: V1.2: Add function ES10b.GetConnectivityParameters ...................................................................... Patch Set 7: Code-Review+1 (4 comments) Patchset: PS7: I think the return code should be 0 in case no httpParams are deposited. The caller then gets a null pointer in *http_params and the return code 0 would tell the caller that the command was successful but there were simply no httpParams deposited. PS7: > Refer to Change-Id: I1ac4cf8980af501bb119208213242468ee4f3c06 Also good to know: The asn1c compiler writes a comment in each generated source file: "Generated by asn1c-0.9.29 (http://lionet.info/asn1c)" File src/ipa/libipa/ipad.c: https://gerrit.osmocom.org/c/onomondo-ipa/+/43054/comment/a8e7e60a_4c02dcc9… : PS7, Line 366: res->res->choice.connectivityParameters.httpParams->buf); maybe the sheer absence of httpParams is not an error. Its an optional fields. Maybe some cards just return an emtpy struct if the httpParams are not set. https://gerrit.osmocom.org/c/onomondo-ipa/+/43054/comment/c1bef69a_da962df8… : PS7, Line 369: } maybe it makes sense to evaluate the GetConnectivityParametersResponse_PR_connectivityParametersError. If res->res->choice.connectivityParametersError is ConnectivityParametersError_parametersNotAvailable, we may return 0, since there are no parameters available, which is technically not an error. In all other cases we would return -EINVAL. Then the caller can know if he couldn't get the parameters just because there are none or if the reason was a real error. -- To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43054?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-ipa Gerrit-Branch: master Gerrit-Change-Id: I075590e095dbbe05fa6cdb0a96d5b38c7a17ff78 Gerrit-Change-Number: 43054 Gerrit-PatchSet: 7 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 19 Aug 2026 11:52:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[L] Change in osmo-ttcn3-hacks[master]: pgw: Move lots of diameter msg building to library/
by pespin 19 Aug '26

19 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43286?usp=email ) Change subject: pgw: Move lots of diameter msg building to library/ ...................................................................... pgw: Move lots of diameter msg building to library/ This way it can be easily reused on other testsuites willing to emulate an OCS, and PCRF, etc. Change-Id: Ifff21ed39c685406abf734b03aa2d9d17c37c4f6 --- M library/DIAMETER_ts29_212_Templates.ttcn M library/DIAMETER_ts29_273_Templates.ttcn M library/DIAMETER_ts32_299_Templates.ttcn M pgw/PGW_Tests.ttcn 4 files changed, 274 insertions(+), 209 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/DIAMETER_ts29_212_Templates.ttcn b/library/DIAMETER_ts29_212_Templates.ttcn index ec0e637..d36bfbb 100644 --- a/library/DIAMETER_ts29_212_Templates.ttcn +++ b/library/DIAMETER_ts29_212_Templates.ttcn @@ -102,4 +102,28 @@ tr_AVP_CcReqNum(?) )); +/* generate a send template successful answer based on received request */ +function f_ts_DIA_Gx_CCA(PDU_DIAMETER rx_gx) +return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER tx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + var AVP_Unsigned32 req_num; + var DCC_NONE_CC_Request_Type req_type; + + avp := f_DIAMETER_get_avp(rx_gx, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + avp := f_DIAMETER_get_avp(rx_gx, c_AVP_Code_DCC_NONE_CC_Request_Number); + req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); + + avp := f_DIAMETER_get_avp(rx_gx, c_AVP_Code_DCC_NONE_CC_Request_Type); + req_type := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Type); + + tx_dia := ts_DIA_Gx_CCA(rx_gx.hop_by_hop_id, rx_gx.end_to_end_id, sess_id, + req_type, req_num); + return tx_dia; +} + } /* module */ diff --git a/library/DIAMETER_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index 6ed00ff..a9f1769 100644 --- a/library/DIAMETER_ts29_273_Templates.ttcn +++ b/library/DIAMETER_ts29_273_Templates.ttcn @@ -674,4 +674,27 @@ ts_AVP_OriginRealm(orig_realm) }); + +/* generate a send template successful answer based on received AAR */ +function f_ts_DIA_S6b_AAA(PDU_DIAMETER rx_s6b, + template (value) charstring orig_host := "aaa.localdomain", + template (value) charstring orig_realm := "localdomain", + template (value) charstring dest_realm := "localdomain") +return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER tx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + + avp := f_DIAMETER_get_avp(rx_s6b, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + tx_dia := ts_DIA_S6b_AAA(sess_id, orig_host, + orig_realm, + dest_realm, + rx_s6b.hop_by_hop_id, + rx_s6b.end_to_end_id); + return tx_dia; +} + } diff --git a/library/DIAMETER_ts32_299_Templates.ttcn b/library/DIAMETER_ts32_299_Templates.ttcn index ffbd15f..249e633 100644 --- a/library/DIAMETER_ts32_299_Templates.ttcn +++ b/library/DIAMETER_ts32_299_Templates.ttcn @@ -14,6 +14,7 @@ import from General_Types all; import from DIAMETER_Types all; import from DIAMETER_Templates all; +import from DIAMETER_ts29_272_Templates all; /* tr_AVP_GI_3GPP_RatType */ import from Osmocom_Types all; import from Misc_Helpers all; @@ -181,4 +182,200 @@ } } +function f_tr_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type, + template (present) octetstring imsi := ?, + template (present) octetstring msisdn := ?, + template (present) octetstring rat_type := ?, + template (present) OCT1 nsapi := ?, + template (present) OCT4 charging_char := ?, + template (present) charstring origin_host := ?, + template (present) charstring diam_realm := ?, + template (present) octetstring sgsn_addr := ?, + template (present) octetstring ggsn_addr := ?) +return template (present) PDU_DIAMETER +{ + var template (present) PDU_DIAMETER tpl; + select (req_type) { + case (INITIAL_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(origin_host), + tr_AVP_OriginRealm(diam_realm), + tr_AVP_DestinationRealm(diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_PCC_3GPP_QoS_Information + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + tr_AVP_3GPP_PDPType((IPv4,IPv6,IPv4v6)), + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, sgsn_addr)), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, ggsn_addr)), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + case (UPDATE_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(origin_host), + tr_AVP_OriginRealm(diam_realm), + tr_AVP_DestinationRealm(diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_Used_Service_Unit, + /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ + tr_AVP_PCC_3GPP_QoS_Information + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, sgsn_addr)), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, ggsn_addr)), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + case (TERMINATION_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(origin_host), + tr_AVP_OriginRealm(diam_realm), + tr_AVP_DestinationRealm(diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_TerminationCause(?), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_Reporting_Reason(FINAL), + tr_AVP_PCC_3GPP_QoS_Information + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, sgsn_addr)), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, ggsn_addr)), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + } + return tpl; +} + +/* generate a send template successful/reject answer based on received request */ +function f_ts_DIA_Gy_CCA(PDU_DIAMETER rx_gy, + DIAMETER_Resultcode cca_res_code, + template (omit) uint32_t validity_time := omit) +return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER tx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + var AVP_Unsigned32 req_num; + var DCC_NONE_CC_Request_Type req_type; + var DIAMETER_Resultcode cca_res_code_success := DIAMETER_SUCCESS; + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Type); + req_type := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Type); + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Number); + req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); + + if (cca_res_code != cca_res_code_success) { + tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + cca_res_code, req_type, req_num); + } else if (isvalue(validity_time)) { + tx_dia := ts_DIA_Gy_CCA_ValidityTime(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + req_type, req_num, valueof(validity_time)); + } else { + tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + cca_res_code, req_type, req_num); + } + return tx_dia; +} + } /* module */ diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 9dd759b..612073b 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -383,15 +383,12 @@ private altstep as_DIA_S6b_AAR() runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_AAR()) -> value rx_dia { - var template (omit) AVP avp; - var octetstring sess_id; - - 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); - - DIAMETER[DIA_S6b].send(ts_DIA_S6b_AAA(sess_id, "aaa." & mp_diam_realm, - mp_diam_realm, mp_diam_realm, - rx_dia.hop_by_hop_id, rx_dia.end_to_end_id)); + var template (value) PDU_DIAMETER tx_dia; + tx_dia := f_ts_DIA_S6b_AAA(rx_dia, + "aaa." & mp_diam_realm, + mp_diam_realm, + mp_diam_realm); + DIAMETER[DIA_S6b].send(tx_dia); setverdict(pass); } [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { @@ -404,18 +401,8 @@ private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; [] DIAMETER[DIA_Gx].receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { - var template (omit) AVP avp; - var octetstring sess_id; - var AVP_Unsigned32 req_num; - - 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); - - avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); - req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - - DIAMETER[DIA_Gx].send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, - req_type, req_num)); + var template (value) PDU_DIAMETER tx_dia := f_ts_DIA_Gx_CCA(rx_dia); + DIAMETER[DIA_Gx].send(tx_dia); } [] DIAMETER[DIA_Gx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, @@ -427,203 +414,37 @@ function f_tr_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT return template (present) PDU_DIAMETER { - var template (present) PDU_DIAMETER tpl; - var charstring smf_origin_host := "smf." & mp_diam_realm; - var template (present) octetstring imsi := ?; + var octetstring imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); + var octetstring rat_type := int2oct(enum2int(g_pars.rat_type), 1); + var OCT1 nsapi := int2oct(g_pars.bearer.ebi, 1); + var OCT4 charging_char := char2oct(oct2str('0000'O)); // f_s5s8_create_session() uses hardcoded chg_car := '0000'O var template (present) octetstring msisdn := ?; - var template (present) octetstring rat_type := ?; - var template (present) OCT4 charging_char := ?; - var template (present) OCT1 nsapi := ?; - imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); - //msisdn := char2oct(f_dec_TBCD(substr(ctx_val.msisdn, 1, lengthof(ctx_val.msisdn) -1))); - rat_type := int2oct(enum2int(g_pars.rat_type), 1); - charging_char := char2oct(oct2str('0000'O)); // f_s5s8_create_session() uses hardcoded chg_car := '0000'O - nsapi := int2oct(g_pars.bearer.ebi, 1); - select (req_type) { - case (INITIAL_REQUEST) { - tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, - avps := superset( - tr_AVP_SessionId, - tr_AVP_OriginHost(smf_origin_host), - tr_AVP_OriginRealm(mp_diam_realm), - tr_AVP_DestinationRealm(mp_diam_realm), - tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), - tr_AVP_ServiceContextId, - tr_AVP_CcReqType(req_type), - tr_AVP_CcReqNum(?), - tr_AVP_EventTimestamp(?), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), - tr_AVP_RequestedAction(DIRECT_DEBITING), - tr_AVP_3GPP_AoCRequestType, - tr_AVP_MultipleServicesIndicator, - tr_AVP_Multiple_Services_Credit_Control(content := superset( - tr_AVP_Requested_Service_Unit, - tr_AVP_PCC_3GPP_QoS_Information - )), - tr_AVP_3GPP_ServiceInformation(content := superset( - tr_AVP_3GPP_PSInformation(content := superset( - tr_AVP_3GPP_ChargingId, - tr_AVP_3GPP_PDPType((IPv4,IPv6,IPv4v6)), - tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), - tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), - tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), - tr_AVP_3GPP_CalledStationId, - tr_AVP_3GPP_SelectionMode, - tr_AVP_3GPP_ChargingCharacteristics(charging_char), - tr_AVP_3GPP_SGSNMCCMNC, - tr_AVP_3GPP_NSAPI(nsapi), - /*We don't yet send MS_Tz in CreateSessionReq: - tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI, - tr_AVP_GI_3GPP_RatType(rat_type)/*, - We don't yet send IMEI in CreateSessionReq: - tr_AVP_UserEquipmentInfo({ - tr_AVP_UserEquipmentInfoType(IMEISV), - tr_AVP_UserEquipmentInfoValue(imeisv) - })*/ - )) - )) - )); - } - case (UPDATE_REQUEST) { - tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, - avps := superset( - tr_AVP_SessionId, - tr_AVP_OriginHost(smf_origin_host), - tr_AVP_OriginRealm(mp_diam_realm), - tr_AVP_DestinationRealm(mp_diam_realm), - tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), - tr_AVP_ServiceContextId, - tr_AVP_CcReqType(req_type), - tr_AVP_CcReqNum(?), - tr_AVP_DestinationHost(?), - tr_AVP_EventTimestamp(?), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), - tr_AVP_RequestedAction(DIRECT_DEBITING), - tr_AVP_3GPP_AoCRequestType, - tr_AVP_Multiple_Services_Credit_Control(content := superset( - tr_AVP_Requested_Service_Unit, - tr_AVP_Used_Service_Unit, - /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ - tr_AVP_PCC_3GPP_QoS_Information - )), - tr_AVP_3GPP_ServiceInformation(content := superset( - tr_AVP_3GPP_PSInformation(content := superset( - tr_AVP_3GPP_ChargingId, - /* tr_AVP_3GPP_PDPType, Only in INIT */ - tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), - tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), - tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), - tr_AVP_3GPP_CalledStationId, - tr_AVP_3GPP_SelectionMode, - tr_AVP_3GPP_ChargingCharacteristics(charging_char), - tr_AVP_3GPP_SGSNMCCMNC, - tr_AVP_3GPP_NSAPI(nsapi), - /*We don't yet send MS_Tz in CreateSessionReq: - tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI, - tr_AVP_GI_3GPP_RatType(rat_type)/*, - We don't yet send IMEI in CreateSessionReq: - tr_AVP_UserEquipmentInfo({ - tr_AVP_UserEquipmentInfoType(IMEISV), - tr_AVP_UserEquipmentInfoValue(imeisv) - })*/ - )) - )) - )); - } - case (TERMINATION_REQUEST) { - tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, - avps := superset( - tr_AVP_SessionId, - tr_AVP_OriginHost(smf_origin_host), - tr_AVP_OriginRealm(mp_diam_realm), - tr_AVP_DestinationRealm(mp_diam_realm), - tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), - tr_AVP_ServiceContextId, - tr_AVP_CcReqType(req_type), - tr_AVP_CcReqNum(?), - tr_AVP_DestinationHost(?), - tr_AVP_EventTimestamp(?), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), - tr_AVP_TerminationCause(?), - tr_AVP_RequestedAction(DIRECT_DEBITING), - tr_AVP_3GPP_AoCRequestType, - tr_AVP_Multiple_Services_Credit_Control(content := superset( - /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ - tr_AVP_Used_Service_Unit, - tr_AVP_3GPP_Reporting_Reason(FINAL), - tr_AVP_PCC_3GPP_QoS_Information - )), - tr_AVP_3GPP_ServiceInformation(content := superset( - tr_AVP_3GPP_PSInformation(content := superset( - tr_AVP_3GPP_ChargingId, - /* tr_AVP_3GPP_PDPType, Only in INIT */ - tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), - tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), - tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), - tr_AVP_3GPP_CalledStationId, - tr_AVP_3GPP_SelectionMode, - tr_AVP_3GPP_ChargingCharacteristics(charging_char), - tr_AVP_3GPP_SGSNMCCMNC, - tr_AVP_3GPP_NSAPI(nsapi), - /*We don't yet send MS_Tz in CreateSessionReq: - tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI, - tr_AVP_GI_3GPP_RatType(rat_type)/*, - We don't yet send IMEI in CreateSessionReq: - tr_AVP_UserEquipmentInfo({ - tr_AVP_UserEquipmentInfoType(IMEISV), - tr_AVP_UserEquipmentInfoValue(imeisv) - })*/ - )) - )) - )); - } - } - return tpl; -} + var charstring smf_origin_host := "smf." & mp_diam_realm; + var octetstring sgsn_addr := f_inet_addr(mp_pcrf_local_ip); + var octetstring ggsn_addr := f_inet_addr(mp_pgw_hostname); -function f_ts_DIA_Gy_CCA(PDU_DIAMETER rx_gy) -runs on PGW_Session_CT return template (value) PDU_DIAMETER -{ - var template (value) PDU_DIAMETER tx_dia; - var template (omit) AVP avp; - var octetstring sess_id; - var AVP_Unsigned32 req_num; - var DCC_NONE_CC_Request_Type req_type; - var DIAMETER_Resultcode cca_res_code_success := DIAMETER_SUCCESS; + return DIAMETER_ts32_299_Templates.f_tr_DIA_Gy_CCR(req_type, + imsi, + msisdn, + rat_type, + nsapi, + charging_char, + smf_origin_host, + mp_diam_realm, + sgsn_addr, + ggsn_addr); - avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_BASE_NONE_Session_Id); - sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); - - avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Type); - req_type := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Type); - - avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Number); - req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - - if (g_pars.gy.cca_res_code != cca_res_code_success) { - tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, - g_pars.gy.cca_res_code, req_type, req_num); - } else if (g_pars.gy.validity_time > 0) { - tx_dia := ts_DIA_Gy_CCA_ValidityTime(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, - req_type, req_num, g_pars.gy.validity_time); - } else { - tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, - g_pars.gy.cca_res_code, req_type, req_num); - } - return tx_dia; } private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { [] DIAMETER[DIA_Gy].receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value g_rx_gy { var template (value) PDU_DIAMETER tx_dia; - tx_dia := f_ts_DIA_Gy_CCA(g_rx_gy); + var template (omit) integer validity_time := omit; + if (g_pars.gy.validity_time > 0) { + validity_time := g_pars.gy.validity_time; + } + tx_dia := DIAMETER_ts32_299_Templates.f_ts_DIA_Gy_CCA(g_rx_gy, g_pars.gy.cca_res_code, validity_time); DIAMETER[DIA_Gy].send(tx_dia); } [] DIAMETER[DIA_Gy].receive(PDU_DIAMETER:?) -> value g_rx_gy { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43286?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: Ifff21ed39c685406abf734b03aa2d9d17c37c4f6 Gerrit-Change-Number: 43286 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>

1 0

[S] Change in osmo-ttcn3-hacks[master]: dia2gsup: Add expected-results.xml
by pespin 19 Aug '26

19 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43294?usp=email ) Change subject: dia2gsup: Add expected-results.xml ...................................................................... dia2gsup: Add expected-results.xml Change-Id: I564ea0e3051b287d1880c3331591e1aa6078dcac --- A dia2gsup/expected-results.xml 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/dia2gsup/expected-results.xml b/dia2gsup/expected-results.xml new file mode 100644 index 0000000..b0a5c01 --- /dev/null +++ b/dia2gsup/expected-results.xml @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<testsuite name='Titan' tests='9' failures='2' errors='0' skipped='0' inconc='0' time='MASKED'> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_normal'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_imsi_unknown'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_illegal_ms'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_plmn_not_allowed'> + <failure type='fail-verdict'>"DIA2GSUP_Tests.ttcn:MASKED : Unexpected Diameter msg rx: { version := 1, message_length := 124, RPETxxxx := '01000000'B, command_code := Authentication_Information (318), application_id := '01000023'O, hop_by_hop_id := '930CAEFE'O, end_to_end_id := '3B45A8F3'O, avps := { { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Session_Id (263) }, VMPxxxxx := '01000000'B, avp_length := 14, vendor_id := omit }, avp_data := { avp_BASE_NONE_Session_Id := '666F6F626172'O (\"foobar\") } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Auth_Session_State (277) }, VMPxxxxx := '01000000'B, avp_length := 12, vendor_id := omit }, avp_data := { avp_BASE_NONE_Auth_Session_State := NO_STATE_MAINTAINED (1) } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Origin_Host (264) }, VMPxxxxx := '01000000'B, avp_length := 23, vendor_id := omit }, avp_data := { avp_BASE_NONE_Origin_Host := \"hss.localdomain\" } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Origin_Realm (296) }, VMPxxxxx := '01000000'B, avp_length := 19, vendor_id := omit }, avp_data := { avp_BASE_NONE_Origin_Realm := \"localdomain\" } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Experimental_Result (297) }, VMPxxxxx := '01000000'B, avp_length := 32, vendor_id := omit }, avp_data := { avp_BASE_NONE_Experimental_Result := { { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Vendor_Id (266) }, VMPxxxxx := '01000000'B, avp_length := 12, vendor_id := omit }, avp_data := { avp_BASE_NONE_Vendor_Id := '000028AF'O } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Experimental_Result_Code (298) }, VMPxxxxx := '01000000'B, avp_length := 12, vendor_id := omit }, avp_data := { avp_BASE_NONE_Experimental_Result_Code := '0000138C'O } } } } } } } } }" + DIA2GSUP_Tests.ttcn:MASKED DIA2GSUP_Tests control part + DIA2GSUP_Tests.ttcn:MASKED TC_authinfo_gsup_err_plmn_not_allowed testcase + </failure> + </testcase> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_romaning_not_allowed'> + <failure type='fail-verdict'>"DIA2GSUP_Tests.ttcn:MASKED : Unexpected Diameter msg rx: { version := 1, message_length := 104, RPETxxxx := '01000000'B, command_code := Authentication_Information (318), application_id := '01000023'O, hop_by_hop_id := '73F61785'O, end_to_end_id := 'E9149B56'O, avps := { { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Session_Id (263) }, VMPxxxxx := '01000000'B, avp_length := 14, vendor_id := omit }, avp_data := { avp_BASE_NONE_Session_Id := '666F6F626172'O (\"foobar\") } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Auth_Session_State (277) }, VMPxxxxx := '01000000'B, avp_length := 12, vendor_id := omit }, avp_data := { avp_BASE_NONE_Auth_Session_State := NO_STATE_MAINTAINED (1) } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Origin_Host (264) }, VMPxxxxx := '01000000'B, avp_length := 23, vendor_id := omit }, avp_data := { avp_BASE_NONE_Origin_Host := \"hss.localdomain\" } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Origin_Realm (296) }, VMPxxxxx := '01000000'B, avp_length := 19, vendor_id := omit }, avp_data := { avp_BASE_NONE_Origin_Realm := \"localdomain\" } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Result_Code (268) }, VMPxxxxx := '01000000'B, avp_length := 12, vendor_id := omit }, avp_data := { avp_BASE_NONE_Result_Code := '0000138B'O } } } } }" + DIA2GSUP_Tests.ttcn:MASKED DIA2GSUP_Tests control part + DIA2GSUP_Tests.ttcn:MASKED TC_authinfo_gsup_err_romaning_not_allowed testcase + </failure> + </testcase> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_net_fail'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_congestion'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_auth_unacceptable'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_proto_unspec'/> +</testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43294?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: I564ea0e3051b287d1880c3331591e1aa6078dcac Gerrit-Change-Number: 43294 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: pgw: Remove duplicated funcs from Osmocom_Types.ttcn
by pespin 19 Aug '26

19 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43295?usp=email ) Change subject: pgw: Remove duplicated funcs from Osmocom_Types.ttcn ...................................................................... pgw: Remove duplicated funcs from Osmocom_Types.ttcn Change-Id: I75aa3dbeef15eb37abcdbf642cf0785bd17de794 --- M pgw/PGW_Tests.ttcn 1 file changed, 0 insertions(+), 16 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 612073b..0c214fe 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -363,22 +363,6 @@ fn.apply(); } -private function f_concat_pad(integer tot_len, hexstring prefix, integer suffix) return hexstring { - var integer suffix_len := tot_len - lengthof(prefix); - var charstring suffix_ch := int2str(suffix); - var integer pad_len := suffix_len - lengthof(suffix_ch); - - return prefix & int2hex(0, pad_len) & str2hex(suffix_ch); -} - -function f_gen_imei(integer suffix) return hexstring { - return f_concat_pad(14, '49999'H, suffix); -} - -function f_gen_imsi(integer suffix) return hexstring { - return f_concat_pad(15, '26242'H, suffix); -} - /* S6b emulation (AAA-Server) */ private altstep as_DIA_S6b_AAR() runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43295?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: I75aa3dbeef15eb37abcdbf642cf0785bd17de794 Gerrit-Change-Number: 43295 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in osmo-ttcn3-hacks[master]: pgw: SPlit PGW_Session_CT into its own file
by pespin 19 Aug '26

19 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43296?usp=email ) Change subject: pgw: SPlit PGW_Session_CT into its own file ...................................................................... pgw: SPlit PGW_Session_CT into its own file Similar to what's already done in most testsuites. Change-Id: I1b0d7be9e9655d407576bbaa905d9360840c5c21 --- A pgw/PGW_Session_CT.ttcn M pgw/PGW_Tests.ttcn 2 files changed, 570 insertions(+), 537 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/pgw/PGW_Session_CT.ttcn b/pgw/PGW_Session_CT.ttcn new file mode 100644 index 0000000..d45cad2 --- /dev/null +++ b/pgw/PGW_Session_CT.ttcn @@ -0,0 +1,568 @@ +module PGW_Session_CT { + +import from TCCEncoding_Functions all; + +import from General_Types all; +import from Osmocom_Types all; +import from Native_Functions all; +import from Misc_Helpers all; + +import from GTPv1U_Emulation all; + +import from GTPv2_Types all; +import from GTPv2_Templates all; +import from GTPv2_Emulation all; + +import from UECUPS_Types all; + +import from DNS_Helpers all; + + +import from DIAMETER_Types all; +import from DIAMETER_Templates all; +import from DIAMETER_ts29_212_Templates all; +import from DIAMETER_ts29_272_Templates all; +import from DIAMETER_ts29_273_Templates all; +import from DIAMETER_ts32_299_Templates all; +import from DIAMETER_Emulation all; + +import from PGW_Tests all; + +const integer DIA_Gx := 0; +const integer DIA_Gy := 1; +const integer DIA_S6b := 2; + +/* per-session component; we typically have 1..N per testcase */ +type component PGW_Session_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr, DIAMETER_ConnHdlr { + var SessionPars g_pars; + + /* GTP-U IPv4 address remote sie */ + var OCT4 g_gtpu4_remote; + var OCT16 g_gtpu6_remote; + + /* Address allocation */ + var OCT4 g_ip4_addr; + var OCT8 g_ip6_interface_id; + var OCT16 g_ip6_addr; + + /* Store last received Gy message */ + var PDU_DIAMETER g_rx_gy; + + /* number of programs started, used as identifier. */ + var integer g_start_prog_count := 0; +} + +type record BearerConfig { + /* EPS Bearer ID */ + uint4_t ebi optional, + /* TEI (Data) local side */ + OCT4 teid_local optional, + /* TEI (Data) remote side */ + OCT4 teid_remote optional +}; + +type record SessionParsGy { + /* In seconds. 0 => disabled, !0 => grant over CC-Time period */ + integer validity_time, + + /* Result-Code to use when sending Gy CCA, usually DIAMETER_SUCCESS */ + DIAMETER_Resultcode cca_res_code +}; + +/* configuration data for a given Session */ +type record SessionPars { + hexstring imsi, + hexstring msisdn optional, + // serving network + GTP2C_RAT_Type rat_type, + // flags? + charstring apn, + /* Apn subscribed or non-subscribed */ + boolean selection_mode, + GTP2C_PDN_Type pdn_type, + /* PAA */ + /* Max APN Restriction */ + /* APN-AMBR */ + octetstring pco optional, + octetstring epco optional, + + /* TEI (Control) local side */ + OCT4 teic_local, + /* TEI (Control) remote side */ + OCT4 teic_remote optional, + /* Bearer Contexts to be created */ + BearerConfig bearer optional, + + charstring tun_dev_name, + charstring tun_netns_name optional, + + SessionParsGy gy +} + +template (value) SessionPars +t_SessionPars(hexstring imsi, + charstring tundev, + template (omit) hexstring msisdn := '1234'H, + GTP2C_RAT_Type rat_type := GTP2C_RAT_EUTRAN, + charstring apn := "internet", + boolean selection_mode := false, + GTP2C_PDN_Type pdn_type := GTP2C_PDN_IPv4) := { + imsi := imsi, + msisdn := msisdn, + rat_type := rat_type, + apn := apn, + selection_mode := selection_mode, + pdn_type := pdn_type, + pco := omit, + epco := omit, + teic_local := '00000000'O, + teic_remote := omit, + bearer := { + ebi := 5, + teid_local := omit, + teid_remote := omit + }, + tun_dev_name := tundev, + tun_netns_name := tundev, + gy := { + validity_time := 0, + cca_res_code := DIAMETER_SUCCESS + } +} + + +type function void_fn() runs on PGW_Session_CT; + +function f_handler_init(void_fn fn, SessionPars pars) +runs on PGW_Session_CT { + g_pars := valueof(pars); + + if (DIAMETER_PROC[DIA_Gx].checkstate("Connected")) { + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gx); + } + + if (DIAMETER_PROC[DIA_Gy].checkstate("Connected")) { + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gy); + } + + if (DIAMETER_PROC[DIA_S6b].checkstate("Connected")) { + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_S6b); + } + + /* allocate + register TEI{C,D} on local side */ + g_pars.teic_local := f_gtp2_allocate_teic(); + g_pars.bearer.teid_local := f_gtp1u_allocate_teid(); + fn.apply(); +} + +/* S6b emulation (AAA-Server) */ +private altstep as_DIA_S6b_AAR() runs on PGW_Session_CT { + var PDU_DIAMETER rx_dia; + [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_AAR()) -> value rx_dia { + var template (value) PDU_DIAMETER tx_dia; + tx_dia := f_ts_DIA_S6b_AAA(rx_dia, + "aaa." & mp_diam_realm, + mp_diam_realm, + mp_diam_realm); + DIAMETER[DIA_S6b].send(tx_dia); + setverdict(pass); + } + [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected DIAMETER ", rx_dia)); + } +} + +/* Gx emulation (PCRF)*/ +altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { + var PDU_DIAMETER rx_dia; + [] DIAMETER[DIA_Gx].receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { + var template (value) PDU_DIAMETER tx_dia := f_ts_DIA_Gx_CCA(rx_dia); + DIAMETER[DIA_Gx].send(tx_dia); + } + [] DIAMETER[DIA_Gx].receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected DIAMETER ", rx_dia)); + } +} + +/* Gy emulation (OCS) */ +private function f_tr_DIA_Gy_CCR_sess(DCC_NONE_CC_Request_Type req_type) +runs on PGW_Session_CT return template (present) PDU_DIAMETER +{ + var octetstring imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); + var octetstring rat_type := int2oct(enum2int(g_pars.rat_type), 1); + var OCT1 nsapi := int2oct(g_pars.bearer.ebi, 1); + var OCT4 charging_char := char2oct(oct2str('0000'O)); // f_s5s8_create_session() uses hardcoded chg_car := '0000'O + var template (present) octetstring msisdn := ?; + var charstring smf_origin_host := "smf." & mp_diam_realm; + var octetstring sgsn_addr := f_inet_addr(mp_pcrf_local_ip); + var octetstring ggsn_addr := f_inet_addr(mp_pgw_hostname); + + return DIAMETER_ts32_299_Templates.f_tr_DIA_Gy_CCR(req_type, + imsi, + msisdn, + rat_type, + nsapi, + charging_char, + smf_origin_host, + mp_diam_realm, + sgsn_addr, + ggsn_addr); + +} + +altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) +runs on PGW_Session_CT { + [] DIAMETER[DIA_Gy].receive(f_tr_DIA_Gy_CCR_sess(req_type := req_type)) -> value g_rx_gy { + var template (value) PDU_DIAMETER tx_dia; + var template (omit) integer validity_time := omit; + if (g_pars.gy.validity_time > 0) { + validity_time := g_pars.gy.validity_time; + } + tx_dia := DIAMETER_ts32_299_Templates.f_ts_DIA_Gy_CCA(g_rx_gy, g_pars.gy.cca_res_code, validity_time); + DIAMETER[DIA_Gy].send(tx_dia); + } + [] DIAMETER[DIA_Gy].receive(PDU_DIAMETER:?) -> value g_rx_gy { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected DIAMETER Gy", g_rx_gy)); + } +} + +/* GTPv2C */ +private function is_s2b_iface() runs on PGW_Session_CT return boolean { + return (g_pars.rat_type == GTP2C_RAT_WLAN or g_pars.rat_type == GTP2C_RAT_Virtual); +} + +/* find TEID of given interface type (and optionally instance) */ +private function f_find_teid(FullyQualifiedTEID_List list, + template (present) integer if_type, + template (present) BIT4 instance := ?) +return template (omit) FullyQualifiedTEID +{ + var integer i; + for (i := 0; i < lengthof(list); i := i+1) { + if (match(list[i].interfaceType, if_type) and + match(list[i].instance, instance)) { + return list[i]; + } + } + return omit; +} + +private function f_create_sess_tun() runs on PGW_Session_CT +{ + var template (value) UECUPS_AddrType user_addr_type; + var template (value) OCT4_20n user_addr; + + select (g_pars.pdn_type) { + case (GTP2C_PDN_IPv4) { + user_addr_type := IPV4; + user_addr := g_ip4_addr; + } + case (GTP2C_PDN_IPv6) { + user_addr_type := IPV6; + user_addr := g_ip6_addr; + } + case (GTP2C_PDN_IPv4v6) { + user_addr_type := IPV4V6; + user_addr := g_ip4_addr & g_ip6_addr; + } + } + + var template (value) UECUPS_CreateTun uecups_create := ts_UECUPS_CreateTun( + tx_teid := oct2int(g_pars.bearer.teid_remote), + rx_teid := oct2int(g_pars.bearer.teid_local), + user_addr_type := user_addr_type, + user_addr := user_addr, + local_gtp_ep := ts_UECUPS_SockAddr(f_inet_addr(mp_local_hostname_u)), + remote_gtp_ep := ts_UECUPS_SockAddr(g_gtpu4_remote), + tun_dev_name := g_pars.tun_dev_name, + tun_netns_name := g_pars.tun_netns_name + ); + + /* create tunnel in daemon */ + f_gtp1u_create_tunnel(uecups_create); +} + +private function f_perform_ipv6_slaac() runs on PGW_Session_CT +{ + var UECUPS_IPv6SLAACInd ipv6slaac_ind; + var template (value) UECUPS_IPv6SLAAC ipv6slaac; + ipv6slaac := ts_UECUPS_IPv6SLAAC( + local_gtp_ep := ts_UECUPS_SockAddr(f_inet_addr(mp_local_hostname_u)), + rx_teid := oct2int(g_pars.bearer.teid_local) + ); + f_gtp1u_ipv6_slaac(ipv6slaac); + GTP1U[0].receive(UECUPS_IPv6SLAACInd:?) -> value ipv6slaac_ind; + log("5GC assigned IPv6 global prefix: ", ipv6slaac_ind.ipv6_prefix, " -> ", f_inet6_ntoa(ipv6slaac_ind.ipv6_prefix & '0000000000000000'O)); + + /* Use the first global IPv6 address in the IPv6 prefix picked by osmo-uecups: */ + g_ip6_addr := ipv6slaac_ind.ipv6_user_addr; + log("Using IPv6 global address: ", g_ip6_addr); +} + +/* process one to-be-created bearer context */ +private function process_bctx_create(BearerContextGrouped bctx) runs on PGW_Session_CT +{ + g_pars.bearer.ebi := bctx.bearerContextIEs.ePS_Bearer_ID.ePS_Bearer_ID_Value; + /* FIXME: Cause */ + + var integer exp_fteid_if_type; + var BIT4 exp_fteid_instance; + if (is_s2b_iface()) { + exp_fteid_if_type := 33; + exp_fteid_instance := '0100'B; + } else { + exp_fteid_if_type := 5; + exp_fteid_instance := '0010'B; + } + + /* find F-TEID of the P-GW U side */ + var FullyQualifiedTEID rx_fteid; + rx_fteid := valueof(f_find_teid(bctx.bearerContextIEs.fullyQualifiedTEID, + exp_fteid_if_type, exp_fteid_instance)); + g_pars.bearer.teid_remote := rx_fteid.tEID_GRE_Key; + if (rx_fteid.v4_Flag == '1'B) { + g_gtpu4_remote := rx_fteid.iPv4_Address; + } + if (rx_fteid.v6_Flag == '1'B) { + g_gtpu6_remote := rx_fteid.iPv6_Address; + } + + f_create_sess_tun(); + if (g_pars.pdn_type == GTP2C_PDN_IPv6 or + g_pars.pdn_type == GTP2C_PDN_IPv4v6) { + f_perform_ipv6_slaac(); + } +} + +/* create a session on the PGW */ +private function f_create_session(template (value) FullyQualifiedTEID fteid_c_ie, + template (value) FullyQualifiedTEID fteid_u_ie, + template (omit) UserLocationInfo uli_ie := omit, + template (omit) APCO apco := omit, + template APCO exp_apco := *) runs on PGW_Session_CT { + var PDU_GTPCv2 rx; + + /* Defaults used for s5/s8: */ + var boolean do_s6b := false; + var template APN_Restriction apn_restriction := ?; + /* Change behavior when on S2b: */ + if (is_s2b_iface()) { + do_s6b := true; + apn_restriction := omit; + } + + var template (value) PDU_GTPCv2 g2c := + ts_GTP2C_CreateSessionReq(imsi := g_pars.imsi, + msisdn := g_pars.msisdn, + rat_type := enum2int(g_pars.rat_type), + sender_fteid := fteid_c_ie, + apn := f_enc_dns_hostname(g_pars.apn), + pdn_type := int2bit(enum2int(g_pars.pdn_type), 3), + teid_list := { fteid_u_ie }, + chg_car := '0000'O, + bearer_id := g_pars.bearer.ebi, + uli := uli_ie, + apco := apco); + g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H); + + GTP2.send(g2c); + if (do_s6b and DIAMETER[DIA_S6b].checkstate("Connected")) { + as_DIA_S6b_AAR(); + } + if (DIAMETER[DIA_Gx].checkstate("Connected")) { + as_DIA_Gx_CCR(INITIAL_REQUEST); + } + /* FIXME: When on S2b interface, SMF is not using the Gy interface, unknown reason. */ + if (DIAMETER[DIA_Gy].checkstate("Connected")) { + as_DIA_Gy_CCR(INITIAL_REQUEST); + } + alt { + [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid := g_pars.teic_local, + cause := Request_accepted, + apn_restriction := apn_restriction, + exp_apco := exp_apco)) -> value rx { + /* extract TEIDs */ + var CreateSessionResponse resp := rx.gtpcv2_pdu.createSessionResponse; + g_pars.teic_remote := resp.fullyQualifiedTEID[0].tEID_GRE_Key; + + /* extract allocated address[es] */ + var PDN_Address_and_Prefix paa := resp.pDN_AddressAllocation.pDN_Address_and_Prefix; + if (ischosen(paa.iPv4_Address)) { + g_ip4_addr := paa.iPv4_Address; + log("PGW assigned UE IPv4 address: ", f_inet_ntoa(g_ip4_addr)); + } else if (ischosen(paa.iPv6_Address)) { + if (paa.iPv6_Address.prefixLength != 64) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got IPv6 Prefix Length ", + paa.iPv6_Address.prefixLength, " vs exp 64")); + } + g_ip6_interface_id := substr(paa.iPv6_Address.iPv6_Address, 8, 8); + log("PGW assigned IPv6 Interface Id: ", g_ip6_interface_id); + g_ip6_addr := 'FE80000000000000'O & g_ip6_interface_id; + log("PGW assigned IPv6 link-local Address: ", f_inet6_ntoa(g_ip6_addr)); + } else if (ischosen(paa.iPv4_IPv6)) { + if (paa.iPv4_IPv6.prefixLength != 64) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got IPv6 Prefix Length ", + paa.iPv4_IPv6.prefixLength, " vs exp 64")); + } + g_ip4_addr := paa.iPv4_IPv6.iPv4_Address; + log("PGW assigned UE IPv4 address: ", f_inet_ntoa(g_ip4_addr)); + g_ip6_interface_id := substr(paa.iPv4_IPv6.iPv6_Address, 8, 8); + log("PGW assigned IPv6 Interface Id: ", g_ip6_interface_id); + g_ip6_addr := 'FE80000000000000'O & g_ip6_interface_id; + log("PGW assigned IPv6 link-local Address: ", f_inet6_ntoa(g_ip6_addr)); + } + var integer i; + for (i := 0; i < lengthof(resp.bearerContextGrouped); i := i+1) { + var BearerContextGrouped bctx := resp.bearerContextGrouped[i]; + select (bctx.instance) { + case ('0000'B) { // created + process_bctx_create(bctx); + } + case ('0001'B) { // removed + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "We don't expect removed bearer contexts yet"); + } + } + } + } + [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid:=g_pars.teic_local, cause:=?)) -> value rx { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unexpected CreateSessionResp(cause=", + rx.gtpcv2_pdu.createSessionResponse.cause.causeValue, ")")); + } + [] GTP2.receive { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Unexpected GTPv2 while waiting for CreateSessionResp"); + } + } + +} + +/* create a session on the PGW on a S5/S8 interface (from SGW )*/ +function f_s5s8_create_session() runs on PGW_Session_CT { + var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; + var template (value) UserLocationInfo uli_ie; + + fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPC, g_pars.teic_local, 0, + f_inet_addr(mp_local_hostname_c), omit); + fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPU, g_pars.bearer.teid_local, 2, + f_inet_addr(mp_local_hostname_u), omit); + + + /* open5gs up to 1.2.3 won't accept it without ULI, despite not mandatory */ + var template (value) TAI tai := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0001'O }; + var template (value) ECGI ecgi := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0'H, 23 }; + uli_ie := ts_GTP2C_UserLocInfo(tai := tai, ecgi := ecgi); + + f_create_session(fteid_c_ie, fteid_u_ie, uli_ie); + +} + +/* create a session on the PGW on a S2b interface (from ePDG)*/ +function f_s2b_create_session(template (omit) APCO apco := omit, + template APCO exp_apco := *) runs on PGW_Session_CT { + var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; + var template (value) UserLocationInfo uli_ie; + + fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S2b_ePDG_GTPC, g_pars.teic_local, 0, + f_inet_addr(mp_local_hostname_c), omit); + fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_ePDG_GTPU, g_pars.bearer.teid_local, 5, + f_inet_addr(mp_local_hostname_u), omit); + + var template (value) TAI tai := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0001'O }; + var template (value) ECGI ecgi := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0'H, 23 }; + uli_ie := ts_GTP2C_UserLocInfo(tai := tai, ecgi := ecgi); + + f_create_session(fteid_c_ie, fteid_u_ie, uli_ie := uli_ie, apco := apco, exp_apco := exp_apco); + +} + +/* delete the session from the PGW */ +function f_delete_session(template (omit) GTP2C_Cause tx_cause := omit, + template (present) GTP2C_Cause exp_cause, + boolean expect_diameter := true) runs on PGW_Session_CT { + var template (value) FullyQualifiedTEID fteid_c_ie + fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPC, g_pars.teic_local, 0, + f_inet_addr(mp_local_hostname_c), omit); + var template PDU_GTPCv2 g2c := + ts_GTP2C_DeleteSessionReq(d_teid := g_pars.teic_remote, cause := tx_cause, + sender_fteid := fteid_c_ie, + teid_list := {}, bearer_id := g_pars.bearer.ebi); + + GTP2.send(g2c); + if (DIAMETER[DIA_Gx].checkstate("Connected") and expect_diameter) { + as_DIA_Gx_CCR(TERMINATION_REQUEST); + } + if (DIAMETER[DIA_Gy].checkstate("Connected") and expect_diameter) { + as_DIA_Gy_CCR(TERMINATION_REQUEST); + } + alt { + [] GTP2.receive(tr_GTP2C_DeleteSessionResp(d_teid := g_pars.teic_local, cause := exp_cause)) { + setverdict(pass); + } + [] GTP2.receive(tr_GTP2C_DeleteSessionResp(?, ?)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Unexpected DeleteSessionResp"); + } + [] GTP2.receive { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Unexpected GTPv2 while waiting for DeleteSessionResp"); + } + } + + /* destroy tunnel in daemon */ + if (isbound(g_pars.bearer.teid_local)) { + var template (value) UECUPS_DestroyTun uecups_destroy; + uecups_destroy := ts_UECUPS_DestroyTun( + local_gtp_ep := valueof(ts_UECUPS_SockAddr(f_inet_addr(mp_local_hostname_u))), + rx_teid := oct2int(g_pars.bearer.teid_local) + ); + /* FIXME: what about IPv4/IPv6 differentiation? */ + f_gtp1u_destroy_tunnel(uecups_destroy); + } +} + + +private function f_run_prog_init(charstring command) runs on PGW_Session_CT return UECUPS_StartProgram +{ + var template (value) UECUPS_StartProgram sprog := ts_UECUPS_StartProgram( + command := command, + environment := {}, + run_as_user := mp_run_prog_as_user, + tun_netns_name := g_pars.tun_netns_name + ); + return valueof(sprog); +} + +private function f_run_prog_unique_log_path() runs on PGW_Session_CT return charstring +{ + var charstring id := testcasename() & "-" & hex2str(g_pars.imsi) & "-" & int2str(g_start_prog_count); + var charstring prefix := mp_run_prog_log_path & "/" & id; + g_start_prog_count := g_start_prog_count + 1; + return prefix; +} + +/* execute ping command and wait for result */ +function f_ping(charstring host, integer interval := 1, integer count := 10) runs on PGW_Session_CT +{ + /* command will be filled in by f_gtp1u_ping4() below: */ + var UECUPS_StartProgram sprog := f_run_prog_init(""); + var charstring bind_addr; + + if (f_addr_is_ipv6(host)) { + bind_addr := f_inet6_ntoa(g_ip6_addr); + } else { + bind_addr := f_inet_ntoa(g_ip4_addr); + } + + f_gtp1u_ping(sprog, host, interval, count, bind_addr, + redirect_output := true, + redirect_output_path_prefix := f_run_prog_unique_log_path()); +} + +} diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 0c214fe..bd95090 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -26,6 +26,8 @@ import from DIAMETER_ts32_299_Templates all; import from DIAMETER_Emulation all; +import from PGW_Session_CT all; + modulepar { charstring mp_pgw_hostname := "127.0.0.4"; charstring mp_local_hostname_c := "127.0.0.1"; @@ -48,10 +50,6 @@ charstring mp_diam_realm := "localdomain"; } -const integer DIA_Gx := 0; -const integer DIA_Gy := 1; -const integer DIA_S6b := 2; - /* main component, we typically have one per testcase */ type component PGW_Test_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr { var GTPv2_Emulation_CT vc_GTP2; @@ -83,107 +81,6 @@ } } -/* per-session component; we typically have 1..N per testcase */ -type component PGW_Session_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr, DIAMETER_ConnHdlr { - var SessionPars g_pars; - - /* GTP-U IPv4 address remote sie */ - var OCT4 g_gtpu4_remote; - var OCT16 g_gtpu6_remote; - - /* Address allocation */ - var OCT4 g_ip4_addr; - var OCT8 g_ip6_interface_id; - var OCT16 g_ip6_addr; - - /* Store last received Gy message */ - var PDU_DIAMETER g_rx_gy; - - /* number of programs started, used as identifier. */ - var integer g_start_prog_count := 0; -} - -type record BearerConfig { - /* EPS Bearer ID */ - uint4_t ebi optional, - /* TEI (Data) local side */ - OCT4 teid_local optional, - /* TEI (Data) remote side */ - OCT4 teid_remote optional -}; - -type record SessionParsGy { - /* In seconds. 0 => disabled, !0 => grant over CC-Time period */ - integer validity_time, - - /* Result-Code to use when sending Gy CCA, usually DIAMETER_SUCCESS */ - DIAMETER_Resultcode cca_res_code -}; - -/* configuration data for a given Session */ -type record SessionPars { - hexstring imsi, - hexstring msisdn optional, - // serving network - GTP2C_RAT_Type rat_type, - // flags? - charstring apn, - /* Apn subscribed or non-subscribed */ - boolean selection_mode, - GTP2C_PDN_Type pdn_type, - /* PAA */ - /* Max APN Restriction */ - /* APN-AMBR */ - octetstring pco optional, - octetstring epco optional, - - /* TEI (Control) local side */ - OCT4 teic_local, - /* TEI (Control) remote side */ - OCT4 teic_remote optional, - /* Bearer Contexts to be created */ - BearerConfig bearer optional, - - charstring tun_dev_name, - charstring tun_netns_name optional, - - SessionParsGy gy -} - -template (value) SessionPars -t_SessionPars(hexstring imsi, - charstring tundev, - template (omit) hexstring msisdn := '1234'H, - GTP2C_RAT_Type rat_type := GTP2C_RAT_EUTRAN, - charstring apn := "internet", - boolean selection_mode := false, - GTP2C_PDN_Type pdn_type := GTP2C_PDN_IPv4) := { - imsi := imsi, - msisdn := msisdn, - rat_type := rat_type, - apn := apn, - selection_mode := selection_mode, - pdn_type := pdn_type, - pco := omit, - epco := omit, - teic_local := '00000000'O, - teic_remote := omit, - bearer := { - ebi := 5, - teid_local := omit, - teid_remote := omit - }, - tun_dev_name := tundev, - tun_netns_name := tundev, - gy := { - validity_time := 0, - cca_res_code := DIAMETER_SUCCESS - } -} - - -type function void_fn() runs on PGW_Session_CT; - friend function DiameterForwardUnitdataCallback(PDU_DIAMETER msg) runs on DIAMETER_Emulation_CT return template PDU_DIAMETER { DIAMETER_UNIT.send(msg); @@ -341,438 +238,6 @@ return vc_conn; } -private function f_handler_init(void_fn fn, SessionPars pars) -runs on PGW_Session_CT { - g_pars := valueof(pars); - - if (DIAMETER_PROC[DIA_Gx].checkstate("Connected")) { - f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gx); - } - - if (DIAMETER_PROC[DIA_Gy].checkstate("Connected")) { - f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gy); - } - - if (DIAMETER_PROC[DIA_S6b].checkstate("Connected")) { - f_diameter_expect_imsi(g_pars.imsi, idx := DIA_S6b); - } - - /* allocate + register TEI{C,D} on local side */ - g_pars.teic_local := f_gtp2_allocate_teic(); - g_pars.bearer.teid_local := f_gtp1u_allocate_teid(); - fn.apply(); -} - -/* S6b emulation (AAA-Server) */ -private altstep as_DIA_S6b_AAR() runs on PGW_Session_CT { - var PDU_DIAMETER rx_dia; - [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_AAR()) -> value rx_dia { - var template (value) PDU_DIAMETER tx_dia; - tx_dia := f_ts_DIA_S6b_AAA(rx_dia, - "aaa." & mp_diam_realm, - mp_diam_realm, - mp_diam_realm); - DIAMETER[DIA_S6b].send(tx_dia); - setverdict(pass); - } - [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Received unexpected DIAMETER ", rx_dia)); - } -} - -/* Gx emulation (PCRF)*/ -private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { - var PDU_DIAMETER rx_dia; - [] DIAMETER[DIA_Gx].receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { - var template (value) PDU_DIAMETER tx_dia := f_ts_DIA_Gx_CCA(rx_dia); - DIAMETER[DIA_Gx].send(tx_dia); - } - [] DIAMETER[DIA_Gx].receive(PDU_DIAMETER:?) -> value rx_dia { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Received unexpected DIAMETER ", rx_dia)); - } -} - -/* Gy emulation (OCS) */ -function f_tr_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) -runs on PGW_Session_CT return template (present) PDU_DIAMETER -{ - var octetstring imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); - var octetstring rat_type := int2oct(enum2int(g_pars.rat_type), 1); - var OCT1 nsapi := int2oct(g_pars.bearer.ebi, 1); - var OCT4 charging_char := char2oct(oct2str('0000'O)); // f_s5s8_create_session() uses hardcoded chg_car := '0000'O - var template (present) octetstring msisdn := ?; - var charstring smf_origin_host := "smf." & mp_diam_realm; - var octetstring sgsn_addr := f_inet_addr(mp_pcrf_local_ip); - var octetstring ggsn_addr := f_inet_addr(mp_pgw_hostname); - - return DIAMETER_ts32_299_Templates.f_tr_DIA_Gy_CCR(req_type, - imsi, - msisdn, - rat_type, - nsapi, - charging_char, - smf_origin_host, - mp_diam_realm, - sgsn_addr, - ggsn_addr); - -} - -private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) -runs on PGW_Session_CT { - [] DIAMETER[DIA_Gy].receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value g_rx_gy { - var template (value) PDU_DIAMETER tx_dia; - var template (omit) integer validity_time := omit; - if (g_pars.gy.validity_time > 0) { - validity_time := g_pars.gy.validity_time; - } - tx_dia := DIAMETER_ts32_299_Templates.f_ts_DIA_Gy_CCA(g_rx_gy, g_pars.gy.cca_res_code, validity_time); - DIAMETER[DIA_Gy].send(tx_dia); - } - [] DIAMETER[DIA_Gy].receive(PDU_DIAMETER:?) -> value g_rx_gy { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Received unexpected DIAMETER Gy", g_rx_gy)); - } -} - -/* GTPv2C */ -private function is_s2b_iface() runs on PGW_Session_CT return boolean { - return (g_pars.rat_type == GTP2C_RAT_WLAN or g_pars.rat_type == GTP2C_RAT_Virtual); -} - -/* find TEID of given interface type (and optionally instance) */ -private function f_find_teid(FullyQualifiedTEID_List list, - template (present) integer if_type, - template (present) BIT4 instance := ?) -return template (omit) FullyQualifiedTEID -{ - var integer i; - for (i := 0; i < lengthof(list); i := i+1) { - if (match(list[i].interfaceType, if_type) and - match(list[i].instance, instance)) { - return list[i]; - } - } - return omit; -} - -private function f_create_sess_tun() runs on PGW_Session_CT -{ - var template (value) UECUPS_AddrType user_addr_type; - var template (value) OCT4_20n user_addr; - - select (g_pars.pdn_type) { - case (GTP2C_PDN_IPv4) { - user_addr_type := IPV4; - user_addr := g_ip4_addr; - } - case (GTP2C_PDN_IPv6) { - user_addr_type := IPV6; - user_addr := g_ip6_addr; - } - case (GTP2C_PDN_IPv4v6) { - user_addr_type := IPV4V6; - user_addr := g_ip4_addr & g_ip6_addr; - } - } - - var template (value) UECUPS_CreateTun uecups_create := ts_UECUPS_CreateTun( - tx_teid := oct2int(g_pars.bearer.teid_remote), - rx_teid := oct2int(g_pars.bearer.teid_local), - user_addr_type := user_addr_type, - user_addr := user_addr, - local_gtp_ep := ts_UECUPS_SockAddr(f_inet_addr(mp_local_hostname_u)), - remote_gtp_ep := ts_UECUPS_SockAddr(g_gtpu4_remote), - tun_dev_name := g_pars.tun_dev_name, - tun_netns_name := g_pars.tun_netns_name - ); - - /* create tunnel in daemon */ - f_gtp1u_create_tunnel(uecups_create); -} - -private function f_perform_ipv6_slaac() runs on PGW_Session_CT -{ - var UECUPS_IPv6SLAACInd ipv6slaac_ind; - var template (value) UECUPS_IPv6SLAAC ipv6slaac; - ipv6slaac := ts_UECUPS_IPv6SLAAC( - local_gtp_ep := ts_UECUPS_SockAddr(f_inet_addr(mp_local_hostname_u)), - rx_teid := oct2int(g_pars.bearer.teid_local) - ); - f_gtp1u_ipv6_slaac(ipv6slaac); - GTP1U[0].receive(UECUPS_IPv6SLAACInd:?) -> value ipv6slaac_ind; - log("5GC assigned IPv6 global prefix: ", ipv6slaac_ind.ipv6_prefix, " -> ", f_inet6_ntoa(ipv6slaac_ind.ipv6_prefix & '0000000000000000'O)); - - /* Use the first global IPv6 address in the IPv6 prefix picked by osmo-uecups: */ - g_ip6_addr := ipv6slaac_ind.ipv6_user_addr; - log("Using IPv6 global address: ", g_ip6_addr); -} - -/* process one to-be-created bearer context */ -private function process_bctx_create(BearerContextGrouped bctx) runs on PGW_Session_CT -{ - g_pars.bearer.ebi := bctx.bearerContextIEs.ePS_Bearer_ID.ePS_Bearer_ID_Value; - /* FIXME: Cause */ - - var integer exp_fteid_if_type; - var BIT4 exp_fteid_instance; - if (is_s2b_iface()) { - exp_fteid_if_type := 33; - exp_fteid_instance := '0100'B; - } else { - exp_fteid_if_type := 5; - exp_fteid_instance := '0010'B; - } - - /* find F-TEID of the P-GW U side */ - var FullyQualifiedTEID rx_fteid; - rx_fteid := valueof(f_find_teid(bctx.bearerContextIEs.fullyQualifiedTEID, - exp_fteid_if_type, exp_fteid_instance)); - g_pars.bearer.teid_remote := rx_fteid.tEID_GRE_Key; - if (rx_fteid.v4_Flag == '1'B) { - g_gtpu4_remote := rx_fteid.iPv4_Address; - } - if (rx_fteid.v6_Flag == '1'B) { - g_gtpu6_remote := rx_fteid.iPv6_Address; - } - - f_create_sess_tun(); - if (g_pars.pdn_type == GTP2C_PDN_IPv6 or - g_pars.pdn_type == GTP2C_PDN_IPv4v6) { - f_perform_ipv6_slaac(); - } -} - -/* create a session on the PGW */ -private function f_create_session(template (value) FullyQualifiedTEID fteid_c_ie, - template (value) FullyQualifiedTEID fteid_u_ie, - template (omit) UserLocationInfo uli_ie := omit, - template (omit) APCO apco := omit, - template APCO exp_apco := *) runs on PGW_Session_CT { - var PDU_GTPCv2 rx; - - /* Defaults used for s5/s8: */ - var boolean do_s6b := false; - var template APN_Restriction apn_restriction := ?; - /* Change behavior when on S2b: */ - if (is_s2b_iface()) { - do_s6b := true; - apn_restriction := omit; - } - - var template (value) PDU_GTPCv2 g2c := - ts_GTP2C_CreateSessionReq(imsi := g_pars.imsi, - msisdn := g_pars.msisdn, - rat_type := enum2int(g_pars.rat_type), - sender_fteid := fteid_c_ie, - apn := f_enc_dns_hostname(g_pars.apn), - pdn_type := int2bit(enum2int(g_pars.pdn_type), 3), - teid_list := { fteid_u_ie }, - chg_car := '0000'O, - bearer_id := g_pars.bearer.ebi, - uli := uli_ie, - apco := apco); - g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H); - - GTP2.send(g2c); - if (do_s6b and DIAMETER[DIA_S6b].checkstate("Connected")) { - as_DIA_S6b_AAR(); - } - if (DIAMETER[DIA_Gx].checkstate("Connected")) { - as_DIA_Gx_CCR(INITIAL_REQUEST); - } - /* FIXME: When on S2b interface, SMF is not using the Gy interface, unknown reason. */ - if (DIAMETER[DIA_Gy].checkstate("Connected")) { - as_DIA_Gy_CCR(INITIAL_REQUEST); - } - alt { - [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid := g_pars.teic_local, - cause := Request_accepted, - apn_restriction := apn_restriction, - exp_apco := exp_apco)) -> value rx { - /* extract TEIDs */ - var CreateSessionResponse resp := rx.gtpcv2_pdu.createSessionResponse; - g_pars.teic_remote := resp.fullyQualifiedTEID[0].tEID_GRE_Key; - - /* extract allocated address[es] */ - var PDN_Address_and_Prefix paa := resp.pDN_AddressAllocation.pDN_Address_and_Prefix; - if (ischosen(paa.iPv4_Address)) { - g_ip4_addr := paa.iPv4_Address; - log("PGW assigned UE IPv4 address: ", f_inet_ntoa(g_ip4_addr)); - } else if (ischosen(paa.iPv6_Address)) { - if (paa.iPv6_Address.prefixLength != 64) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Got IPv6 Prefix Length ", - paa.iPv6_Address.prefixLength, " vs exp 64")); - } - g_ip6_interface_id := substr(paa.iPv6_Address.iPv6_Address, 8, 8); - log("PGW assigned IPv6 Interface Id: ", g_ip6_interface_id); - g_ip6_addr := 'FE80000000000000'O & g_ip6_interface_id; - log("PGW assigned IPv6 link-local Address: ", f_inet6_ntoa(g_ip6_addr)); - } else if (ischosen(paa.iPv4_IPv6)) { - if (paa.iPv4_IPv6.prefixLength != 64) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Got IPv6 Prefix Length ", - paa.iPv4_IPv6.prefixLength, " vs exp 64")); - } - g_ip4_addr := paa.iPv4_IPv6.iPv4_Address; - log("PGW assigned UE IPv4 address: ", f_inet_ntoa(g_ip4_addr)); - g_ip6_interface_id := substr(paa.iPv4_IPv6.iPv6_Address, 8, 8); - log("PGW assigned IPv6 Interface Id: ", g_ip6_interface_id); - g_ip6_addr := 'FE80000000000000'O & g_ip6_interface_id; - log("PGW assigned IPv6 link-local Address: ", f_inet6_ntoa(g_ip6_addr)); - } - var integer i; - for (i := 0; i < lengthof(resp.bearerContextGrouped); i := i+1) { - var BearerContextGrouped bctx := resp.bearerContextGrouped[i]; - select (bctx.instance) { - case ('0000'B) { // created - process_bctx_create(bctx); - } - case ('0001'B) { // removed - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "We don't expect removed bearer contexts yet"); - } - } - } - } - [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid:=g_pars.teic_local, cause:=?)) -> value rx { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Unexpected CreateSessionResp(cause=", - rx.gtpcv2_pdu.createSessionResponse.cause.causeValue, ")")); - } - [] GTP2.receive { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "Unexpected GTPv2 while waiting for CreateSessionResp"); - } - } - -} - -/* create a session on the PGW on a S5/S8 interface (from SGW )*/ -private function f_s5s8_create_session() runs on PGW_Session_CT { - var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; - var template (value) UserLocationInfo uli_ie; - - fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPC, g_pars.teic_local, 0, - f_inet_addr(mp_local_hostname_c), omit); - fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPU, g_pars.bearer.teid_local, 2, - f_inet_addr(mp_local_hostname_u), omit); - - - /* open5gs up to 1.2.3 won't accept it without ULI, despite not mandatory */ - var template (value) TAI tai := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0001'O }; - var template (value) ECGI ecgi := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0'H, 23 }; - uli_ie := ts_GTP2C_UserLocInfo(tai := tai, ecgi := ecgi); - - f_create_session(fteid_c_ie, fteid_u_ie, uli_ie); - -} - -/* create a session on the PGW on a S2b interface (from ePDG)*/ -private function f_s2b_create_session(template (omit) APCO apco := omit, - template APCO exp_apco := *) runs on PGW_Session_CT { - var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; - var template (value) UserLocationInfo uli_ie; - - fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S2b_ePDG_GTPC, g_pars.teic_local, 0, - f_inet_addr(mp_local_hostname_c), omit); - fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_ePDG_GTPU, g_pars.bearer.teid_local, 5, - f_inet_addr(mp_local_hostname_u), omit); - - var template (value) TAI tai := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0001'O }; - var template (value) ECGI ecgi := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0'H, 23 }; - uli_ie := ts_GTP2C_UserLocInfo(tai := tai, ecgi := ecgi); - - f_create_session(fteid_c_ie, fteid_u_ie, uli_ie := uli_ie, apco := apco, exp_apco := exp_apco); - -} - -/* delete the session from the PGW */ -private function f_delete_session(template (omit) GTP2C_Cause tx_cause := omit, - template (present) GTP2C_Cause exp_cause, - boolean expect_diameter := true) runs on PGW_Session_CT { - var template (value) FullyQualifiedTEID fteid_c_ie - fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPC, g_pars.teic_local, 0, - f_inet_addr(mp_local_hostname_c), omit); - var template PDU_GTPCv2 g2c := - ts_GTP2C_DeleteSessionReq(d_teid := g_pars.teic_remote, cause := tx_cause, - sender_fteid := fteid_c_ie, - teid_list := {}, bearer_id := g_pars.bearer.ebi); - - GTP2.send(g2c); - if (DIAMETER[DIA_Gx].checkstate("Connected") and expect_diameter) { - as_DIA_Gx_CCR(TERMINATION_REQUEST); - } - if (DIAMETER[DIA_Gy].checkstate("Connected") and expect_diameter) { - as_DIA_Gy_CCR(TERMINATION_REQUEST); - } - alt { - [] GTP2.receive(tr_GTP2C_DeleteSessionResp(d_teid := g_pars.teic_local, cause := exp_cause)) { - setverdict(pass); - } - [] GTP2.receive(tr_GTP2C_DeleteSessionResp(?, ?)) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "Unexpected DeleteSessionResp"); - } - [] GTP2.receive { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "Unexpected GTPv2 while waiting for DeleteSessionResp"); - } - } - - /* destroy tunnel in daemon */ - if (isbound(g_pars.bearer.teid_local)) { - var template (value) UECUPS_DestroyTun uecups_destroy; - uecups_destroy := ts_UECUPS_DestroyTun( - local_gtp_ep := valueof(ts_UECUPS_SockAddr(f_inet_addr(mp_local_hostname_u))), - rx_teid := oct2int(g_pars.bearer.teid_local) - ); - /* FIXME: what about IPv4/IPv6 differentiation? */ - f_gtp1u_destroy_tunnel(uecups_destroy); - } -} - - -private function f_run_prog_init(charstring command) runs on PGW_Session_CT return UECUPS_StartProgram -{ - var template (value) UECUPS_StartProgram sprog := ts_UECUPS_StartProgram( - command := command, - environment := {}, - run_as_user := mp_run_prog_as_user, - tun_netns_name := g_pars.tun_netns_name - ); - return valueof(sprog); -} - -private function f_run_prog_unique_log_path() runs on PGW_Session_CT return charstring -{ - var charstring id := testcasename() & "-" & hex2str(g_pars.imsi) & "-" & int2str(g_start_prog_count); - var charstring prefix := mp_run_prog_log_path & "/" & id; - g_start_prog_count := g_start_prog_count + 1; - return prefix; -} - -/* execute ping command and wait for result */ -private function f_ping(charstring host, integer interval := 1, integer count := 10) runs on PGW_Session_CT -{ - /* command will be filled in by f_gtp1u_ping4() below: */ - var UECUPS_StartProgram sprog := f_run_prog_init(""); - var charstring bind_addr; - - if (f_addr_is_ipv6(host)) { - bind_addr := f_inet6_ntoa(g_ip6_addr); - } else { - bind_addr := f_inet_ntoa(g_ip4_addr); - } - - f_gtp1u_ping(sprog, host, interval, count, bind_addr, - redirect_output := true, - redirect_output_path_prefix := f_run_prog_unique_log_path()); -} - /* send echo request; expect response */ testcase TC_tx_echo() runs on PGW_Test_CT { timer T := 5.0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43296?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: I1b0d7be9e9655d407576bbaa905d9360840c5c21 Gerrit-Change-Number: 43296 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: DIAMETER_ts29_212_Templates: Fix spec reference
by pespin 19 Aug '26

19 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43285?usp=email ) Change subject: DIAMETER_ts29_212_Templates: Fix spec reference ...................................................................... DIAMETER_ts29_212_Templates: Fix spec reference Change-Id: I0ceabdb10a875a9cadc12d2eee08b41535531b8e --- M library/DIAMETER_ts29_212_Templates.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/DIAMETER_ts29_212_Templates.ttcn b/library/DIAMETER_ts29_212_Templates.ttcn index 73d5177..ec0e637 100644 --- a/library/DIAMETER_ts29_212_Templates.ttcn +++ b/library/DIAMETER_ts29_212_Templates.ttcn @@ -18,7 +18,7 @@ import from Misc_Helpers all; /******************************* - * S6a 3GPP TS 29.212 section 7 + * Gx 3GPP TS 29.212 section 5 *******************************/ /* 3GPP TS 29.212 Section 5.1 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43285?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: I0ceabdb10a875a9cadc12d2eee08b41535531b8e Gerrit-Change-Number: 43285 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>

1 0

[L] Change in osmo-ttcn3-hacks[master]: DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites
by pespin 19 Aug '26

19 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43284?usp=email ) Change subject: DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites ...................................................................... DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites A man-in-the-middle component DIAMETER_ConnHdlr_CT was used so far for tests willing to use multiple DIAMETER_ConnHdlr connected to a single component served by multiple DIAMETER_Emulation. Remove the need for this component by modifying the DIAMETER_ConnHdlr component to have an array of ports. This way the same ConnHdlr can be registered on multiple DIAMETER_Emulation components directly. Change-Id: Id88b88d2f3472e1f4daa8344ca1fc6d408edfb62 --- M dia2gsup/DIA2GSUP_Tests.ttcn M epdg/EPDG_Tests.ttcn M hss/HSS_Tests.ttcn M library/DIAMETER_Emulation.ttcn M mme/ConnHdlr.ttcn M mme/MME_Tests.ttcn M pcrf/PCRF_Tests.ttcn M pgw/PGW_Tests.ttcn 8 files changed, 153 insertions(+), 304 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/dia2gsup/DIA2GSUP_Tests.ttcn b/dia2gsup/DIA2GSUP_Tests.ttcn index 6d1828f..9522b65 100644 --- a/dia2gsup/DIA2GSUP_Tests.ttcn +++ b/dia2gsup/DIA2GSUP_Tests.ttcn @@ -118,8 +118,8 @@ connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); - connect(vc_conn:DIAMETER, vc_DIAMETER:DIAMETER_CLIENT); - connect(vc_conn:DIAMETER_PROC, vc_DIAMETER:DIAMETER_PROC); + connect(vc_conn:DIAMETER[0], vc_DIAMETER:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC[0], vc_DIAMETER:DIAMETER_PROC); DIAMETER_UNIT.receive(DiameterCapabilityExchgInd:?); @@ -181,7 +181,7 @@ f_diameter_expect_eteid(ete_id); /* Send AIR to translator; expect it to show up on GSUP side */ - DIAMETER.send(ts_DIA_AIR(g_pars.imsi, vplmn, sess_id, hbh_id := hbh_id, ete_id := ete_id)); + DIAMETER[0].send(ts_DIA_AIR(g_pars.imsi, vplmn, sess_id, hbh_id := hbh_id, ete_id := ete_id)); GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); /* Send a positive response back to the translator; expect AIA */ @@ -196,10 +196,10 @@ alt { /* Unlike AIR, AIA contains no IMSI, hence it is received in DIAMETER_UNIT: */ - [] DIAMETER.receive(tr_DIA_AIA) { + [] DIAMETER[0].receive(tr_DIA_AIA) { setverdict(pass); } - [] DIAMETER.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[0].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); } } @@ -231,7 +231,7 @@ f_diameter_expect_eteid(ete_id); /* Send AIR to translator; expect it to show up on GSUP side */ - DIAMETER.send(ts_DIA_AIR(g_pars.imsi, vplmn, sess_id, hbh_id := hbh_id, ete_id := ete_id)); + DIAMETER[0].send(ts_DIA_AIR(g_pars.imsi, vplmn, sess_id, hbh_id := hbh_id, ete_id := ete_id)); GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); /* Send an error response back to the translator; expect AIA */ @@ -239,10 +239,10 @@ alt { /* Unlike AIR, AIA contains no IMSI, hence it is received in DIAMETER_UNIT: */ - [] DIAMETER.receive(tr_DIA_AIA_ERR(err_avp)) { + [] DIAMETER[0].receive(tr_DIA_AIA_ERR(err_avp)) { setverdict(pass); } - [] DIAMETER.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[0].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); } } diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index e4aed42..0127988 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -68,6 +68,9 @@ integer mp_diam_watchdog_initial_wait_sec := 6*3; } +const integer DIA_SWx := 0; +const integer DIA_S6b := 1; + type port Coord_PT message { inout charstring; @@ -107,43 +110,8 @@ } } -type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr { - port DIAMETER_Conn_PT DIAMETER_CLIENT; - port DIAMETEREM_PROC_PT DIAMETER_PROC_CLIENT; -} - -function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT { - var DIAMETER_ConnHdlr vc_conn_unused; - var PDU_DIAMETER msg; - var UINT32 ete_id; - - f_diameter_expect_imsi(imsi); - - while (true) { - alt { - [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER.send(msg); - } - [] DIAMETER.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER_CLIENT.send(msg); - } - [] DIAMETER_PROC_CLIENT.getcall(DIAMETEREM_register_eteid:{?,?}) -> param(ete_id, vc_conn_unused) { - DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) { - [] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } - DIAMETER_PROC_CLIENT.reply(DIAMETEREM_register_eteid:{ete_id, vc_conn_unused}); - } - } - } -} - type component EPDG_ConnHdlr extends DIAMETER_ConnHdlr, GSUP_ConnHdlr, GTP2_ConnHdlr, GTP1U_ConnHdlr { var EPDG_ConnHdlrPars g_pars; - - port DIAMETER_Conn_PT SWx; - port DIAMETEREM_PROC_PT SWx_PROC; - port DIAMETER_Conn_PT S6b; - port DIAMETEREM_PROC_PT S6b_PROC; port Coord_PT COORD; }; type record of EPDG_ConnHdlr EPDG_ConnHdlrList; @@ -174,17 +142,6 @@ AuthVector vec optional }; -private function f_epdg_connhldr_SWx_expect_eteid(UINT32 ete_id) runs on EPDG_ConnHdlr { - SWx_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) { - [] SWx_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } -} -private function f_epdg_connhldr_S6b_expect_eteid(UINT32 ete_id) runs on EPDG_ConnHdlr { - S6b_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) { - [] S6b_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } -} - private function f_gen_addr_in_pool(integer idx := 0) return charstring { /* Skip first 2 addresses reserved for TUN */ @@ -346,6 +303,10 @@ private function f_init_handler(void_fn fn, charstring id, EPDG_ConnHdlrPars pars) runs on EPDG_ConnHdlr { g_pars := pars; + + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_SWx); + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_S6b); + /* tell GSUP dispatcher to send this IMSI to us */ f_create_gsup_expect(hex2str(g_pars.imsi)); @@ -359,7 +320,6 @@ runs on MTC_CT return EPDG_ConnHdlr { var EPDG_ConnHdlr vc_conn; var charstring id := testcasename(); - var DIAMETER_ConnHdlr_CT vc_conn_swx, vc_conn_s6b; vc_conn := EPDG_ConnHdlr.create(id); @@ -375,20 +335,12 @@ connect(vc_conn:GTP1U_PROC[0], vc_GTP1U:CLIENT_PROC); /* SWx */ - vc_conn_swx := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_swx:DIAMETER, vc_SWx:DIAMETER_CLIENT); - connect(vc_conn_swx:DIAMETER_PROC, vc_SWx:DIAMETER_PROC); - connect(vc_conn:SWx, vc_conn_swx:DIAMETER_CLIENT); - connect(vc_conn:SWx_PROC, vc_conn_swx:DIAMETER_PROC_CLIENT); - vc_conn_swx.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER[DIA_SWx], vc_SWx:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC[DIA_SWx], vc_SWx:DIAMETER_PROC); /* S6b */ - vc_conn_s6b := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_s6b:DIAMETER, vc_S6b:DIAMETER_CLIENT); - connect(vc_conn_s6b:DIAMETER_PROC, vc_S6b:DIAMETER_PROC); - connect(vc_conn:S6b, vc_conn_s6b:DIAMETER_CLIENT); - connect(vc_conn:S6b_PROC, vc_conn_s6b:DIAMETER_PROC_CLIENT); - vc_conn_s6b.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER[DIA_S6b], vc_S6b:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC[DIA_S6b], vc_S6b:DIAMETER_PROC); /* COORD */ connect(vc_conn:COORD, self:COORD); @@ -415,7 +367,7 @@ g_pars.vec.autn, g_pars.vec.auts); /* Send MAA to translator; expect it to show up on GSUP side */ - SWx.send(ts_DIA_SWx_MAA(g_pars.imsi, sip_auth_data_item, + DIAMETER[DIA_SWx].send(ts_DIA_SWx_MAA(g_pars.imsi, sip_auth_data_item, sess_id := sess_id, hbh_id := rx_mar.hop_by_hop_id, ete_id := rx_mar.end_to_end_id)); @@ -434,7 +386,7 @@ g_pars.vec.ck, g_pars.vec.autn, g_pars.vec.auts); - SWx.send(ts_DIA_SWx_MAA_result(g_pars.imsi, result, + DIAMETER[DIA_SWx].send(ts_DIA_SWx_MAA_result(g_pars.imsi, result, sess_id := sess_id, hbh_id := rx_mar.hop_by_hop_id, ete_id := rx_mar.end_to_end_id)); @@ -443,7 +395,7 @@ /* Diameter SWx MAR + MAA. */ private altstep as_DIA_SWx_MA_success(boolean exp_req_resync := false) runs on EPDG_ConnHdlr { var PDU_DIAMETER rx_dia; - [] SWx.receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia { + [] DIAMETER[DIA_SWx].receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia { if (exp_req_resync) { var octetstring rand_autn_concatenated := g_pars.vec.rand & g_pars.vec.auts; var AVP avp_grp; @@ -462,7 +414,7 @@ f_DIA_SWx_tx_MAA_success(rx_dia); setverdict(pass); } - [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); } } @@ -472,11 +424,11 @@ 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 { + [] DIAMETER[DIA_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, + DIAMETER[DIA_SWx].send(ts_DIA_SWx_SAA(g_pars.imsi, IPv4, g_pars.apn, sess_id := sess_id, @@ -484,7 +436,7 @@ ete_id := rx_dia.end_to_end_id)); setverdict(pass); } - [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); } } @@ -500,9 +452,9 @@ /* Unlike PPR, PPA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so PPA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_epdg_connhldr_SWx_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_SWx); - SWx.send(ts_DIA_SWx_PPR(g_pars.imsi, + DIAMETER[DIA_SWx].send(ts_DIA_SWx_PPR(g_pars.imsi, IPv4, g_pars.apn, hbh_id := hbh_id, @@ -527,8 +479,8 @@ } alt { - [] SWx.receive(tr_DIA_SWx_PPA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} - [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_SWx].receive(tr_DIA_SWx_PPA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} + [] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter SWx msg rx: ", rx_dia)); } } @@ -547,9 +499,9 @@ /* Unlike STR, STA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_epdg_connhldr_SWx_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_SWx); - SWx.send(ts_DIA_SWx_RTR(g_pars.imsi, reason_code, reason_info, + DIAMETER[DIA_SWx].send(ts_DIA_SWx_RTR(g_pars.imsi, reason_code, reason_info, hbh_id := hbh_id, ete_id := ete_id)); @@ -564,8 +516,8 @@ } alt { - [] SWx.receive(tr_DIA_SWx_RTA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} - [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_SWx].receive(tr_DIA_SWx_RTA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} + [] DIAMETER[DIA_SWx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter SWx msg rx: ", rx_dia)); } } @@ -584,9 +536,9 @@ /* Unlike AAR, AAA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_epdg_connhldr_S6b_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_S6b) - S6b.send(ts_DIA_S6b_AAR(f_nai(), + DIAMETER[DIA_S6b].send(ts_DIA_S6b_AAR(f_nai(), int2oct(DIA_TS29_373_MIP6_Feature_Vector_GTPv2_SUPPORTED, 8), g_pars.apn, pgw_addr, @@ -598,8 +550,8 @@ } alt { - [] S6b.receive(tr_DIA_S6b_AAA) -> value rx_dia {} - [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_AAA) -> value rx_dia {} + [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); } } @@ -614,13 +566,13 @@ /* Unlike STR, STA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_epdg_connhldr_S6b_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_S6b) - S6b.send(ts_DIA_S6b_STR(g_pars.imsi, DIAMETER_LOGOUT, + DIAMETER[DIA_S6b].send(ts_DIA_S6b_STR(g_pars.imsi, DIAMETER_LOGOUT, hbh_id := hbh_id, ete_id := ete_id)); alt { - [] S6b.receive(tr_DIA_S6b_STA(DIAMETER_SUCCESS)) -> value rx_dia {} - [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_STA(DIAMETER_SUCCESS)) -> value rx_dia {} + [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); } } @@ -631,16 +583,16 @@ var PDU_DIAMETER rx_dia; var template (omit) AVP avp; var octetstring sess_id; - [] S6b.receive(tr_DIA_S6b_RAR(f_nai())) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_RAR(f_nai())) -> 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); - S6b.send(ts_DIA_S6b_RAA(DIAMETER_SUCCESS, - sess_id := sess_id, - hbh_id := rx_dia.hop_by_hop_id, - ete_id := rx_dia.end_to_end_id)); + DIAMETER[DIA_S6b].send(ts_DIA_S6b_RAA(DIAMETER_SUCCESS, + sess_id := sess_id, + hbh_id := rx_dia.hop_by_hop_id, + ete_id := rx_dia.end_to_end_id)); setverdict(pass); } - [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); } } @@ -650,16 +602,16 @@ var PDU_DIAMETER rx_dia; var template (omit) AVP avp; var octetstring sess_id; - [] S6b.receive(tr_DIA_S6b_ASR(f_nai())) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_ASR(f_nai())) -> 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); - S6b.send(ts_DIA_S6b_ASA(DIAMETER_SUCCESS, - sess_id := sess_id, - hbh_id := rx_dia.hop_by_hop_id, - ete_id := rx_dia.end_to_end_id)); + DIAMETER[DIA_S6b].send(ts_DIA_S6b_ASA(DIAMETER_SUCCESS, + sess_id := sess_id, + hbh_id := rx_dia.hop_by_hop_id, + ete_id := rx_dia.end_to_end_id)); setverdict(pass); } - [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); } } @@ -1096,7 +1048,7 @@ var DIAMETER_ExperimentalResultcode exp_result_code := DIAMETER_ERROR_USER_UNKNOWN; f_GSUP_tx_SAI_REQ(); - SWx.receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia; + DIAMETER[DIA_SWx].receive(tr_DIA_SWx_MAR(g_pars.imsi)) -> value rx_dia; f_DIA_SWx_tx_MAA_error(rx_dia, ts_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(exp_result_code), 4))); diff --git a/hss/HSS_Tests.ttcn b/hss/HSS_Tests.ttcn index 1ebb673..7e55968 100644 --- a/hss/HSS_Tests.ttcn +++ b/hss/HSS_Tests.ttcn @@ -39,6 +39,8 @@ HSS_Impl mp_hss_impl := HSS_IMPL_OPEN5GS; } +const integer DIA_S6a := 0; + /* main component, we typically have one per testcase */ type component MTC_CT { @@ -58,48 +60,9 @@ } } -type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr { - port DIAMETER_Conn_PT DIAMETER_CLIENT; - port DIAMETEREM_PROC_PT DIAMETER_PROC_CLIENT; -} - -function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT { - var DIAMETER_ConnHdlr vc_conn_unused; - var PDU_DIAMETER msg; - var UINT32 ete_id; - - f_diameter_expect_imsi(imsi); - - while (true) { - alt { - [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER.send(msg); - } - [] DIAMETER.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER_CLIENT.send(msg); - } - [] DIAMETER_PROC_CLIENT.getcall(DIAMETEREM_register_eteid:{?,?}) -> param(ete_id, vc_conn_unused) { - DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) { - [] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } - DIAMETER_PROC_CLIENT.reply(DIAMETEREM_register_eteid:{ete_id, vc_conn_unused}); - } - } - } -} - /* per-session component; we typically have 1..N per testcase */ -type component Cli_Session_CT extends Prometheus_Checker_CT { +type component Cli_Session_CT extends DIAMETER_ConnHdlr, Prometheus_Checker_CT { var SessionPars g_pars; - - port DIAMETER_Conn_PT S6a; - port DIAMETEREM_PROC_PT S6a_PROC; - -} -function f_diam_connhldr_expect_eteid(UINT32 ete_id) runs on Cli_Session_CT { - S6a_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) { - [] S6a_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } } /* configuration data for a given Session */ @@ -167,7 +130,6 @@ function f_start_handler(void_fn fn, template (omit) SessionPars pars_tmpl := omit) runs on MTC_CT return Cli_Session_CT { var charstring id := testcasename(); - var DIAMETER_ConnHdlr_CT vc_conn_s6a; var Cli_Session_CT vc_conn; var SessionPars pars; @@ -179,12 +141,8 @@ vc_conn := Cli_Session_CT.create(id); - vc_conn_s6a := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_s6a:DIAMETER, vc_S6a:DIAMETER_CLIENT); - connect(vc_conn_s6a:DIAMETER_PROC, vc_S6a:DIAMETER_PROC); - connect(vc_conn:S6a, vc_conn_s6a:DIAMETER_CLIENT); - connect(vc_conn:S6a_PROC, vc_conn_s6a:DIAMETER_PROC_CLIENT); - vc_conn_s6a.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER[DIA_S6a], vc_S6a:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC[DIA_S6a], vc_S6a:DIAMETER_PROC); vc_conn.start(f_handler_init(fn, pars)); return vc_conn; @@ -193,6 +151,7 @@ private function f_handler_init(void_fn fn, SessionPars pars) runs on Cli_Session_CT { g_pars := valueof(pars); + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_S6a); f_prometheus_init(mp_hss_prometheus_hostname, mp_hss_prometheus_port); fn.apply(); } @@ -207,20 +166,20 @@ /* Unlike ULR, ULA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_diam_connhldr_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_S6a) /* TODO: change this into a ts_DIA_ULR */ - S6a.send(ts_DIA_ULR(g_pars.imsi, '111F11'O, sess_id, - mp_diam_orig_host, mp_diam_orig_realm, - mp_diam_dest_realm, hbh_id, ete_id)); + DIAMETER[DIA_S6a].send(ts_DIA_ULR(g_pars.imsi, '111F11'O, sess_id, + mp_diam_orig_host, mp_diam_orig_realm, + mp_diam_dest_realm, hbh_id, ete_id)); g_pars.s6a_next_hbh_id := g_pars.s6a_next_hbh_id + 1; g_pars.s6a_next_ete_id := g_pars.s6a_next_ete_id + 1; alt { - [] S6a.receive(tr_DIA_ULA(ula_sub_data, sess_id, ?, ?, hbh_id, ete_id)) -> value rx_dia { + [] DIAMETER[DIA_S6a].receive(tr_DIA_ULA(ula_sub_data, sess_id, ?, ?, hbh_id, ete_id)) -> value rx_dia { setverdict(pass); } - [] S6a.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6a].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected DIAMETER ", rx_dia)); } diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index e5698fd..6e79fd6 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -49,10 +49,11 @@ PDU_DIAMETER tx }; +const integer DIAMETER_ConnHdlr_MAX_PORTS := 3; type component DIAMETER_ConnHdlr { - port DIAMETER_Conn_PT DIAMETER; + port DIAMETER_Conn_PT DIAMETER[DIAMETER_ConnHdlr_MAX_PORTS]; /* procedure based port to register for incoming connections */ - port DIAMETEREM_PROC_PT DIAMETER_PROC; + port DIAMETEREM_PROC_PT DIAMETER_PROC[DIAMETER_ConnHdlr_MAX_PORTS]; } /* port between individual per-connection components and this dispatcher */ @@ -468,9 +469,9 @@ signature DIAMETEREM_register_eteid(in UINT32 ete_id, in DIAMETER_ConnHdlr hdlr); /* client/conn_hdlr side function to use procedure port to create expect in emulation */ -function f_diameter_expect_eteid(UINT32 ete_id) runs on DIAMETER_ConnHdlr { - DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) { - [] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; +function f_diameter_expect_eteid(UINT32 ete_id, integer idx := 0) runs on DIAMETER_ConnHdlr { + DIAMETER_PROC[idx].call(DIAMETEREM_register_eteid:{ete_id, self}) { + [] DIAMETER_PROC[idx].getreply(DIAMETEREM_register_eteid:{?,?}) {}; } } @@ -529,9 +530,9 @@ } /* client/conn_hdlr side function to use procedure port to create expect in emulation */ -function f_diameter_expect_imsi(hexstring imsi) runs on DIAMETER_ConnHdlr { - DIAMETER_PROC.call(DIAMETEREM_register_imsi:{imsi, self}) { - [] DIAMETER_PROC.getreply(DIAMETEREM_register_imsi:{?,?}) {}; +function f_diameter_expect_imsi(hexstring imsi, integer idx := 0) runs on DIAMETER_ConnHdlr { + DIAMETER_PROC[idx].call(DIAMETEREM_register_imsi:{imsi, self}) { + [] DIAMETER_PROC[idx].getreply(DIAMETEREM_register_imsi:{?,?}) {}; } } diff --git a/mme/ConnHdlr.ttcn b/mme/ConnHdlr.ttcn index c1e32b8..e3e62f8 100644 --- a/mme/ConnHdlr.ttcn +++ b/mme/ConnHdlr.ttcn @@ -499,7 +499,7 @@ /* Exepect AuthInfoReq (AIR) from HSS; respond with AuthInforAnswer (AIA) */ private altstep as_DIA_AuthInfo() runs on ConnHdlr { var PDU_DIAMETER rx_dia; - [] DIAMETER.receive(tr_DIA_AIR(g_pars.ue_pars.imsi)) -> value rx_dia { + [] DIAMETER[0].receive(tr_DIA_AIR(g_pars.ue_pars.imsi)) -> value rx_dia { var template (omit) AVP avp; var octetstring sess_id; var octetstring vplmn_id; @@ -516,16 +516,16 @@ /* compute tuple */ auth_info_content := { ts_AVP_EutranVec(1, '20080c3818183b522614162c07601d0d'O, '6a91970e838fd079'O, 'f11b89a2a8be00001f9c526f3d75d44c'O, '95AFAD9A0D29AFAA079A9451DF7161D7EE4CBF2AF9387F766D058BB6B44B905D'O) }; - DIAMETER.send(ts_DIA_AIA(auth_info_content, sess_id, - hbh_id := rx_dia.hop_by_hop_id, - ete_id := rx_dia.end_to_end_id)); + DIAMETER[0].send(ts_DIA_AIA(auth_info_content, sess_id, + hbh_id := rx_dia.hop_by_hop_id, + ete_id := rx_dia.end_to_end_id)); } } /* Expect UpdateLocationReq (ULR); respond with UpdateLocationAnswer (ULA) */ altstep as_DIA_UpdLoc() runs on ConnHdlr { var PDU_DIAMETER rx_dia; - [] DIAMETER.receive(tr_DIA_ULR(g_pars.ue_pars.imsi)) -> value rx_dia { + [] DIAMETER[0].receive(tr_DIA_ULR(g_pars.ue_pars.imsi)) -> value rx_dia { var template (omit) AVP avp; var hexstring imsi; var template (value) AVP_list sub_data; @@ -546,9 +546,9 @@ }) }; - DIAMETER.send(ts_DIA_ULA(sub_data, avp.avp_data.avp_BASE_NONE_Session_Id, - hbh_id := rx_dia.hop_by_hop_id, - ete_id := rx_dia.end_to_end_id)); + DIAMETER[0].send(ts_DIA_ULA(sub_data, avp.avp_data.avp_BASE_NONE_Session_Id, + hbh_id := rx_dia.hop_by_hop_id, + ete_id := rx_dia.end_to_end_id)); } } @@ -563,17 +563,17 @@ */ f_diameter_expect_eteid(ete_id); - DIAMETER.send(ts_DIA_CLR(g_pars.ue_pars.imsi, SGSN_UPDATE_PROCEDURE, - orig_host := g_pars.hss_pars.local_diam_host, - orig_realm := g_pars.hss_pars.diam_realm, - dest_host := g_pars.hss_pars.remote_diam_host, - dest_realm := g_pars.hss_pars.diam_realm, - hbh_id := hbh_id, - ete_id := ete_id)); + DIAMETER[0].send(ts_DIA_CLR(g_pars.ue_pars.imsi, SGSN_UPDATE_PROCEDURE, + orig_host := g_pars.hss_pars.local_diam_host, + orig_realm := g_pars.hss_pars.diam_realm, + dest_host := g_pars.hss_pars.remote_diam_host, + dest_realm := g_pars.hss_pars.diam_realm, + hbh_id := hbh_id, + ete_id := ete_id)); alt { - [] DIAMETER.receive(tr_DIA_CLA) -> value rx_dia {} - [] DIAMETER.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[0].receive(tr_DIA_CLA) -> value rx_dia {} + [] DIAMETER[0].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); } } diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index df24a09..586c667 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -392,8 +392,8 @@ connect(vc_conn:SGsAP_PROC, vc_SGsAP:SGsAP_PROC); } if (isbound(vc_DIAMETER)) { - connect(vc_conn:DIAMETER, vc_DIAMETER:DIAMETER_CLIENT); - connect(vc_conn:DIAMETER_PROC, vc_DIAMETER:DIAMETER_PROC); + connect(vc_conn:DIAMETER[0], vc_DIAMETER:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC[0], vc_DIAMETER:DIAMETER_PROC); } if (isbound(vc_GTP)) { connect(vc_conn:GTP[0], vc_GTP:CLIENT); @@ -424,7 +424,7 @@ remPort := mp_gn_remote_port }; - if (DIAMETER_PROC.checkstate("Connected")) { + if (DIAMETER_PROC[0].checkstate("Connected")) { f_diameter_expect_imsi(g_pars.ue_pars.imsi); } if (SGsAP_PROC.checkstate("Connected")) { diff --git a/pcrf/PCRF_Tests.ttcn b/pcrf/PCRF_Tests.ttcn index 7979d75..c62880d 100644 --- a/pcrf/PCRF_Tests.ttcn +++ b/pcrf/PCRF_Tests.ttcn @@ -34,6 +34,8 @@ }; } +const integer DIA_Gx := 0; + /* main component, we typically have one per testcase */ type component MTC_CT { @@ -53,48 +55,9 @@ } } -type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr { - port DIAMETER_Conn_PT DIAMETER_CLIENT; - port DIAMETEREM_PROC_PT DIAMETER_PROC_CLIENT; -} - -function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT { - var DIAMETER_ConnHdlr vc_conn_unused; - var PDU_DIAMETER msg; - var UINT32 ete_id; - - f_diameter_expect_imsi(imsi); - - while (true) { - alt { - [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER.send(msg); - } - [] DIAMETER.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER_CLIENT.send(msg); - } - [] DIAMETER_PROC_CLIENT.getcall(DIAMETEREM_register_eteid:{?,?}) -> param(ete_id, vc_conn_unused) { - DIAMETER_PROC.call(DIAMETEREM_register_eteid:{ete_id, self}) { - [] DIAMETER_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } - DIAMETER_PROC_CLIENT.reply(DIAMETEREM_register_eteid:{ete_id, vc_conn_unused}); - } - } - } -} - /* per-session component; we typically have 1..N per testcase */ -type component Cli_Session_CT extends Prometheus_Checker_CT { +type component Cli_Session_CT extends DIAMETER_ConnHdlr, Prometheus_Checker_CT { var SessionPars g_pars; - - port DIAMETER_Conn_PT Gx; - port DIAMETEREM_PROC_PT Gx_PROC; - -} -function f_diam_connhldr_expect_eteid(UINT32 ete_id) runs on Cli_Session_CT { - Gx_PROC.call(DIAMETEREM_register_eteid:{ete_id, null}) { - [] Gx_PROC.getreply(DIAMETEREM_register_eteid:{?,?}) {}; - } } /* configuration data for a given Session */ @@ -162,7 +125,6 @@ function f_start_handler(void_fn fn, template (omit) SessionPars pars_tmpl := omit) runs on MTC_CT return Cli_Session_CT { var charstring id := testcasename(); - var DIAMETER_ConnHdlr_CT vc_conn_gx; var Cli_Session_CT vc_conn; var SessionPars pars; @@ -174,12 +136,8 @@ vc_conn := Cli_Session_CT.create(id); - vc_conn_gx := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_gx:DIAMETER, vc_Gx:DIAMETER_CLIENT); - connect(vc_conn_gx:DIAMETER_PROC, vc_Gx:DIAMETER_PROC); - connect(vc_conn:Gx, vc_conn_gx:DIAMETER_CLIENT); - connect(vc_conn:Gx_PROC, vc_conn_gx:DIAMETER_PROC_CLIENT); - vc_conn_gx.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER[DIA_Gx], vc_Gx:DIAMETER_CLIENT); + connect(vc_conn:DIAMETER_PROC[DIA_Gx], vc_Gx:DIAMETER_PROC); vc_conn.start(f_handler_init(fn, pars)); return vc_conn; @@ -188,6 +146,7 @@ private function f_handler_init(void_fn fn, SessionPars pars) runs on Cli_Session_CT { g_pars := valueof(pars); + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gx); f_prometheus_init(mp_pcrf_prometheus_hostname, mp_pcrf_prometheus_port); fn.apply(); } @@ -204,24 +163,24 @@ /* Unlike CCR, CCA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so CCA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. */ - f_diam_connhldr_expect_eteid(ete_id); + f_diameter_expect_eteid(ete_id, idx := DIA_Gx); /* TODO: change this into a ts_DIA_ULR */ - Gx.send(ts_DIA_Gx_CCR(hbh_id, ete_id, - sess_id, - {ts_AVP_SubcrIdType(END_USER_IMSI), ts_AVP_SubcrIdData(imsi)}, - apn, - INITIAL_REQUEST, - req_num := '00000000'O - )); + DIAMETER[DIA_Gx].send(ts_DIA_Gx_CCR(hbh_id, ete_id, + sess_id, + {ts_AVP_SubcrIdType(END_USER_IMSI), ts_AVP_SubcrIdData(imsi)}, + apn, + INITIAL_REQUEST, + req_num := '00000000'O + )); g_pars.gx_next_hbh_id := g_pars.gx_next_hbh_id + 1; g_pars.gx_next_ete_id := g_pars.gx_next_ete_id + 1; alt { - [] Gx.receive(tr_DIA_Gx_CCA(sess_id)) -> value rx_dia { + [] DIAMETER[DIA_Gx].receive(tr_DIA_Gx_CCA(sess_id)) -> value rx_dia { setverdict(pass); } - [] Gx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_Gx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected DIAMETER ", rx_dia)); } diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 85d5820..9dd759b 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -26,7 +26,6 @@ import from DIAMETER_ts32_299_Templates all; import from DIAMETER_Emulation all; - modulepar { charstring mp_pgw_hostname := "127.0.0.4"; charstring mp_local_hostname_c := "127.0.0.1"; @@ -49,6 +48,10 @@ charstring mp_diam_realm := "localdomain"; } +const integer DIA_Gx := 0; +const integer DIA_Gy := 1; +const integer DIA_S6b := 2; + /* main component, we typically have one per testcase */ type component PGW_Test_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr { var GTPv2_Emulation_CT vc_GTP2; @@ -80,38 +83,10 @@ } } -type component DIAMETER_ConnHdlr_CT extends DIAMETER_ConnHdlr { - port DIAMETER_Conn_PT DIAMETER_CLIENT; -} - -function f_diam_connhldr_ct_main(hexstring imsi) runs on DIAMETER_ConnHdlr_CT { - var PDU_DIAMETER msg; - - if (DIAMETER_PROC.checkstate("Connected")) { - f_diameter_expect_imsi(imsi); - } - - while (true) { - alt { - [] DIAMETER_CLIENT.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER.send(msg); - } - [] DIAMETER.receive(PDU_DIAMETER:?) -> value msg { - DIAMETER_CLIENT.send(msg); - } - } - } -} - - /* per-session component; we typically have 1..N per testcase */ -type component PGW_Session_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr { +type component PGW_Session_CT extends GTP2_ConnHdlr, GTP1U_ConnHdlr, DIAMETER_ConnHdlr { var SessionPars g_pars; - port DIAMETER_Conn_PT Gx; - port DIAMETER_Conn_PT Gy; - port DIAMETER_Conn_PT S6b; - /* GTP-U IPv4 address remote sie */ var OCT4 g_gtpu4_remote; var OCT16 g_gtpu6_remote; @@ -332,7 +307,6 @@ function f_start_handler(void_fn fn, template (omit) SessionPars pars_tmpl := omit) runs on PGW_Test_CT return PGW_Session_CT { var charstring id := testcasename(); - var DIAMETER_ConnHdlr_CT vc_conn_gx, vc_conn_gy, vc_conn_s6b; var PGW_Session_CT vc_conn; var SessionPars pars; @@ -349,27 +323,18 @@ connect(vc_conn:GTP1U_PROC[0], vc_GTP1U:CLIENT_PROC); if (isbound(vc_Gx)) { - vc_conn_gx := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_gx:DIAMETER, vc_Gx:DIAMETER_CLIENT); - connect(vc_conn_gx:DIAMETER_PROC, vc_Gx:DIAMETER_PROC); - connect(vc_conn:Gx, vc_conn_gx:DIAMETER_CLIENT); - vc_conn_gx.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER_PROC[DIA_Gx], vc_Gx:DIAMETER_PROC); + connect(vc_conn:DIAMETER[DIA_Gx], vc_Gx:DIAMETER_CLIENT); } if (isbound(vc_Gy)) { - vc_conn_gy := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_gy:DIAMETER, vc_Gy:DIAMETER_CLIENT); - connect(vc_conn_gy:DIAMETER_PROC, vc_Gy:DIAMETER_PROC); - connect(vc_conn:Gy, vc_conn_gy:DIAMETER_CLIENT); - vc_conn_gy.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER_PROC[DIA_Gy], vc_Gy:DIAMETER_PROC); + connect(vc_conn:DIAMETER[DIA_Gy], vc_Gy:DIAMETER_CLIENT); } if (isbound(vc_S6b)) { - vc_conn_s6b := DIAMETER_ConnHdlr_CT.create(id); - connect(vc_conn_s6b:DIAMETER, vc_S6b:DIAMETER_CLIENT); - connect(vc_conn_s6b:DIAMETER_PROC, vc_S6b:DIAMETER_PROC); - connect(vc_conn:S6b, vc_conn_s6b:DIAMETER_CLIENT); - vc_conn_s6b.start(f_diam_connhldr_ct_main(pars.imsi)); + connect(vc_conn:DIAMETER_PROC[DIA_S6b], vc_S6b:DIAMETER_PROC); + connect(vc_conn:DIAMETER[DIA_S6b], vc_S6b:DIAMETER_CLIENT); } vc_conn.start(f_handler_init(fn, pars)); @@ -379,6 +344,19 @@ private function f_handler_init(void_fn fn, SessionPars pars) runs on PGW_Session_CT { g_pars := valueof(pars); + + if (DIAMETER_PROC[DIA_Gx].checkstate("Connected")) { + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gx); + } + + if (DIAMETER_PROC[DIA_Gy].checkstate("Connected")) { + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_Gy); + } + + if (DIAMETER_PROC[DIA_S6b].checkstate("Connected")) { + f_diameter_expect_imsi(g_pars.imsi, idx := DIA_S6b); + } + /* allocate + register TEI{C,D} on local side */ g_pars.teic_local := f_gtp2_allocate_teic(); g_pars.bearer.teid_local := f_gtp1u_allocate_teid(); @@ -404,19 +382,19 @@ /* S6b emulation (AAA-Server) */ private altstep as_DIA_S6b_AAR() runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; - [] S6b.receive(tr_DIA_S6b_AAR()) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_AAR()) -> value rx_dia { var template (omit) AVP avp; var octetstring sess_id; 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); - S6b.send(ts_DIA_S6b_AAA(sess_id, "aaa." & mp_diam_realm, - mp_diam_realm, mp_diam_realm, - rx_dia.hop_by_hop_id, rx_dia.end_to_end_id)); + DIAMETER[DIA_S6b].send(ts_DIA_S6b_AAA(sess_id, "aaa." & mp_diam_realm, + mp_diam_realm, mp_diam_realm, + rx_dia.hop_by_hop_id, rx_dia.end_to_end_id)); setverdict(pass); } - [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected DIAMETER ", rx_dia)); } @@ -425,7 +403,7 @@ /* Gx emulation (PCRF)*/ private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; - [] Gx.receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { + [] DIAMETER[DIA_Gx].receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { var template (omit) AVP avp; var octetstring sess_id; var AVP_Unsigned32 req_num; @@ -436,10 +414,10 @@ avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - Gx.send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, - req_type, req_num)); + DIAMETER[DIA_Gx].send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, + req_type, req_num)); } - [] Gx.receive(PDU_DIAMETER:?) -> value rx_dia { + [] DIAMETER[DIA_Gx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected DIAMETER ", rx_dia)); } @@ -643,12 +621,12 @@ private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { - [] Gy.receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value g_rx_gy { + [] DIAMETER[DIA_Gy].receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value g_rx_gy { var template (value) PDU_DIAMETER tx_dia; tx_dia := f_ts_DIA_Gy_CCA(g_rx_gy); - Gy.send(tx_dia); + DIAMETER[DIA_Gy].send(tx_dia); } - [] Gy.receive(PDU_DIAMETER:?) -> value g_rx_gy { + [] DIAMETER[DIA_Gy].receive(PDU_DIAMETER:?) -> value g_rx_gy { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected DIAMETER Gy", g_rx_gy)); } @@ -794,14 +772,14 @@ g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H); GTP2.send(g2c); - if (do_s6b and S6b.checkstate("Connected")) { + if (do_s6b and DIAMETER[DIA_S6b].checkstate("Connected")) { as_DIA_S6b_AAR(); } - if (Gx.checkstate("Connected")) { + if (DIAMETER[DIA_Gx].checkstate("Connected")) { as_DIA_Gx_CCR(INITIAL_REQUEST); } /* FIXME: When on S2b interface, SMF is not using the Gy interface, unknown reason. */ - if (Gy.checkstate("Connected")) { + if (DIAMETER[DIA_Gy].checkstate("Connected")) { as_DIA_Gy_CCR(INITIAL_REQUEST); } alt { @@ -920,10 +898,10 @@ teid_list := {}, bearer_id := g_pars.bearer.ebi); GTP2.send(g2c); - if (Gx.checkstate("Connected") and expect_diameter) { + if (DIAMETER[DIA_Gx].checkstate("Connected") and expect_diameter) { as_DIA_Gx_CCR(TERMINATION_REQUEST); } - if (Gy.checkstate("Connected") and expect_diameter) { + if (DIAMETER[DIA_Gy].checkstate("Connected") and expect_diameter) { as_DIA_Gy_CCR(TERMINATION_REQUEST); } alt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43284?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: Id88b88d2f3472e1f4daa8344ca1fc6d408edfb62 Gerrit-Change-Number: 43284 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in osmo-ttcn3-hacks[master]: pgw: SPlit PGW_Session_CT into its own file
by pespin 19 Aug '26

19 Aug '26

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43296?usp=email ) Change subject: pgw: SPlit PGW_Session_CT into its own file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43296?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1b0d7be9e9655d407576bbaa905d9360840c5c21 Gerrit-Change-Number: 43296 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Aug 2026 11:37:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026