- gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_pfcp_heartbeat
by fixeria 05 Sep '24

05 Sep '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38037?usp=email ) Change subject: s1gw: add TC_pfcp_heartbeat ...................................................................... s1gw: add TC_pfcp_heartbeat Change-Id: Iadb24c2c346a62aa8b59d24475e71f683fc3dfe6 --- M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 2 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/38037/1 diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 00b83e8..3c8dfb4 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -272,12 +272,38 @@ vc_conn.done; } +function f_TC_pfcp_heartbeat(charstring id) runs on ConnHdlr { + var integer rts; + + f_ConnHdlr_register_pfcp(); + + /* Tx Heartbeat Request */ + rts := f_pfcp_get_recovery_timestamp(); + PFCP.send(ts_PFCP_Heartbeat_Req(rts)); + + /* Expect Heartbeat Response + * TODO: validate the indicated Recovery Time Stamp against + * the one that we received in the PFCP Association Setup. */ + f_ConnHdlr_pfcp_expect(tr_PFCP_Heartbeat_Resp); + setverdict(pass); +} +testcase TC_pfcp_heartbeat() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars); + var ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_ConnHdlr_spawn(refers(f_TC_pfcp_heartbeat), pars); + vc_conn.done; +} + control { execute( TC_setup() ); execute( TC_setup_multi() ); execute( TC_conn_term_by_mme() ); execute( TC_conn_term_mme_unavail() ); execute( TC_e_rab_setup() ); + execute( TC_pfcp_heartbeat() ); } } diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index ed75300..87cd893 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,8 +1,9 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='5' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='6' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='S1GW_Tests' name='TC_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_by_mme' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_mme_unavail' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_setup' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38037?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: Iadb24c2c346a62aa8b59d24475e71f683fc3dfe6 Gerrit-Change-Number: 38037 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: library/PFCP_Emulation: look up by SeqNr and SEID separately
by fixeria 05 Sep '24

05 Sep '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38032?usp=email ) Change subject: library/PFCP_Emulation: look up by SeqNr and SEID separately ...................................................................... library/PFCP_Emulation: look up by SeqNr and SEID separately This allows routing of PFCP PDUs without SEID by SeqNr. An example of such a PDU is the Heartbeat Request. Change-Id: Ic7912d944e94852a587993708d51439ec90f08cd --- M library/PFCP_Emulation.ttcn 1 file changed, 27 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/38032/1 diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index 9cd9a86..74f4cdd 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -74,13 +74,20 @@ type record of PFCPEM_conn PFCPEM_conns; -private function f_PFCPEM_conn_by_seid_or_seqnr(OCT8 seid, LIN3_BO_LAST seqnr) runs on PFCP_Emulation_CT return PFCP_ConnHdlr { - log("looking for seid ", seid, " seqnr ", seqnr, " in conns ", g_conns); +private function f_PFCPEM_conn_by_seqnr(LIN3_BO_LAST seqnr) +runs on PFCP_Emulation_CT return PFCP_ConnHdlr { for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { if (isbound(g_conns[i].pfcp_msg_sequence_number) and seqnr == g_conns[i].pfcp_msg_sequence_number) { return g_conns[i].vc_conn; } + } + return null; +}; + +private function f_PFCPEM_conn_by_seid(OCT8 seid) +runs on PFCP_Emulation_CT return PFCP_ConnHdlr { + for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { if (isbound(g_conns[i].seid) and seid == g_conns[i].seid) { return g_conns[i].vc_conn; @@ -89,6 +96,23 @@ return null; }; +private function f_PFCPEM_conn_for_pdu(in PDU_PFCP pdu) +runs on PFCP_Emulation_CT return PFCP_ConnHdlr { + var PFCP_ConnHdlr vc_conn := null; + + vc_conn := f_PFCPEM_conn_by_seqnr(pdu.sequence_number); + if (vc_conn != null) { + return vc_conn; + } + + /* If there is a SEID, we can look it up */ + if (pdu.s_flag == '1'B) { + vc_conn := f_PFCPEM_conn_by_seid(pdu.seid); + } + + return vc_conn; +}; + private function f_PFCPEM_add_conn(PFCP_ConnHdlr vc_conn) runs on PFCP_Emulation_CT { for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { if (g_conns[i].vc_conn == vc_conn) { @@ -134,11 +158,7 @@ [] PFCP.receive(tr_PFCP_UD(?)) -> value ud { log("PFCP_Emulation main() PFCP.receive: ", ud); - vc_conn := null; - if (ud.pdu.s_flag == '1'B) { - /* There is a SEID */ - vc_conn := f_PFCPEM_conn_by_seid_or_seqnr(ud.pdu.seid, ud.pdu.sequence_number); - } + vc_conn := f_PFCPEM_conn_for_pdu(ud.pdu); if (vc_conn != null) { log("found destination ", vc_conn); CLIENT.send(ud.pdu) to vc_conn; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38032?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: Ic7912d944e94852a587993708d51439ec90f08cd Gerrit-Change-Number: 38032 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: move vc_PFCP from ConnHdlr to test_CT
by fixeria 05 Sep '24

05 Sep '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38031?usp=email ) Change subject: hnbgw: move vc_PFCP from ConnHdlr to test_CT ...................................................................... hnbgw: move vc_PFCP from ConnHdlr to test_CT Change-Id: Iaf7a54c674f2dc549572d918beb6f355f48ee700 --- M hnbgw/HNBGW_Tests.ttcn M library/PFCP_Emulation.ttcn 2 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/38031/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 3765411..5204f38 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -350,6 +350,7 @@ var MGCP_Emulation_CT vc_MGCP; port TELNETasp_PT HNBGWVTY; var StatsD_Checker_CT vc_STATSD; + var PFCP_Emulation_CT vc_PFCP; /* global test case guard timer (actual timeout value is set in f_init()) */ timer T_guard := 30.0; @@ -397,7 +398,7 @@ vc_MGCP.start(MGCP_Emulation.main(ops, pars, id)); } -function f_init_pfcp(charstring id) runs on ConnHdlr { +function f_init_pfcp(charstring id) runs on test_CT { id := id & "-PFCP"; var PFCP_Emulation_Cfg pfcp_cfg := { @@ -409,8 +410,6 @@ }; vc_PFCP := PFCP_Emulation_CT.create(id) alive; - connect(self:PFCP, vc_PFCP:CLIENT); - connect(self:PFCP_PROC, vc_PFCP:CLIENT_PROC); vc_PFCP.start(PFCP_Emulation.main(pfcp_cfg)); } @@ -622,6 +621,11 @@ connect(vc_conn:STATSD_PROC, vc_STATSD:STATSD_PROC); + if (isbound(vc_PFCP)) { + connect(vc_conn:PFCP, vc_PFCP:CLIENT); + connect(vc_conn:PFCP_PROC, vc_PFCP:CLIENT_PROC); + } + return vc_conn; } @@ -651,8 +655,6 @@ /* make parameters available via component variable */ g_pars := pars; - f_init_pfcp(testcasename()); - /* start guard timer and activate it as default */ g_Tguard.start(t_guard); activate(as_Tguard_ConnHdlr()); @@ -2030,6 +2032,7 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); + f_init_pfcp(testcasename()); f_sleep(1.0); vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment_with_pfcp), t_pars(7, ps_domain := true)); @@ -2093,6 +2096,7 @@ testcase TC_ps_rab_assignment_without_pfcp() runs on test_CT { var ConnHdlr vc_conn; f_init(); + f_init_pfcp(testcasename()); f_sleep(1.0); vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment_without_pfcp), t_pars(7, ps_domain := true)); diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index 2fb3a8a..9cd9a86 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -199,7 +199,6 @@ type component PFCP_ConnHdlr { port PFCPEM_PT PFCP; port PFCPEM_PROC_PT PFCP_PROC; - var PFCP_Emulation_CT vc_PFCP; }; function f_pfcp_register() runs on PFCP_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38031?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: Iaf7a54c674f2dc549572d918beb6f355f48ee700 Gerrit-Change-Number: 38031 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: library/PFCP_Emulation: fix routing of incoming PDUs
by fixeria 05 Sep '24

05 Sep '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38033?usp=email ) Change subject: library/PFCP_Emulation: fix routing of incoming PDUs ...................................................................... library/PFCP_Emulation: fix routing of incoming PDUs Before this patch, the PFCP_Emulation component was unable to route incoming PDUs properly. The problem is that the SeqNr and SEID were neither stored nor updated whem sending outgoing PDUs, and thus remained unbound all the time. Change-Id: I8e62471915ab9a917ac960d3078e89669b5ac0ea --- M library/PFCP_Emulation.ttcn 1 file changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/38033/1 diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index 74f4cdd..c671095 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -77,8 +77,7 @@ private function f_PFCPEM_conn_by_seqnr(LIN3_BO_LAST seqnr) runs on PFCP_Emulation_CT return PFCP_ConnHdlr { for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { - if (isbound(g_conns[i].pfcp_msg_sequence_number) - and seqnr == g_conns[i].pfcp_msg_sequence_number) { + if (seqnr == g_conns[i].pfcp_msg_sequence_number) { return g_conns[i].vc_conn; } } @@ -88,8 +87,7 @@ private function f_PFCPEM_conn_by_seid(OCT8 seid) runs on PFCP_Emulation_CT return PFCP_ConnHdlr { for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { - if (isbound(g_conns[i].seid) - and seid == g_conns[i].seid) { + if (seid == g_conns[i].seid) { return g_conns[i].vc_conn; } } @@ -113,14 +111,15 @@ return vc_conn; }; -private function f_PFCPEM_add_conn(PFCP_ConnHdlr vc_conn) runs on PFCP_Emulation_CT { +private function f_PFCPEM_conn_add_or_update(in PFCPEM_conn conn) +runs on PFCP_Emulation_CT { for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { - if (g_conns[i].vc_conn == vc_conn) { + if (g_conns[i].vc_conn == conn.vc_conn) { + g_conns[i] := conn; /* update */ return; } } /* Not in the list yet, add. */ - var PFCPEM_conn conn := { vc_conn := vc_conn }; g_conns := g_conns & { conn }; } @@ -184,14 +183,14 @@ pdu := pdu }; - f_PFCPEM_add_conn(vc_conn); + f_PFCPEM_conn_add_or_update({vc_conn, pdu.seid, pdu.sequence_number}); PFCP.send(ud); } [] CLIENT_PROC.getcall(PFCPEM_register:{}) -> sender vc_conn { log("PFCP_Emulation main() CLIENT_PROC.getcall(PFCPEM_register)"); - f_PFCPEM_add_conn(vc_conn); + f_PFCPEM_conn_add_or_update({vc_conn, omit, omit}); CLIENT_PROC.reply(PFCPEM_register:{}) to vc_conn; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38033?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: I8e62471915ab9a917ac960d3078e89669b5ac0ea Gerrit-Change-Number: 38033 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: pfcp_peer: fix incorrect order of logging arguments
by fixeria 05 Sep '24

05 Sep '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38030?usp=email ) Change subject: pfcp_peer: fix incorrect order of logging arguments ...................................................................... pfcp_peer: fix incorrect order of logging arguments Change-Id: I4c2326d7143e8d4035d75cc60b53fc8cf33611cb --- M src/pfcp_peer.erl 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/30/38030/1 diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index 8c29a9f..c97304b 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -303,10 +303,10 @@ -spec decode_pdu(binary(), tuple(), peer_state()) -> pfcp_pdu(). decode_pdu(Data, {FromIp, FromPort}, _S) -> ?LOG_DEBUG("Rx encoded PFCP PDU from ~p:~p: ~p", - [Data, FromIp, FromPort]), + [FromIp, FromPort, Data]), PDU = pfcp_packet:decode(Data), ?LOG_DEBUG("Rx PFCP PDU from ~p:~p: ~p", - [PDU, FromIp, FromPort]), + [FromIp, FromPort, PDU]), %% TODO: check PDU#pfcp.seq_no %% TODO: there can be batched PDUs PDU. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38030?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4c2326d7143e8d4035d75cc60b53fc8cf33611cb Gerrit-Change-Number: 38030 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-msc[master]: .deb/.rpm: add osmocom user during package install
by keith 05 Sep '24

05 Sep '24

Attention is currently required from: msuraev. keith has posted comments on this change by msuraev. ( https://gerrit.osmocom.org/c/osmo-msc/+/29709?usp=email ) Change subject: .deb/.rpm: add osmocom user during package install ...................................................................... Patch Set 2: (1 comment) File debian/postinst: https://gerrit.osmocom.org/c/osmo-msc/+/29709/comment/74a42f7e_dbba8ecc?usp… : PS2, Line 32: chperms root osmocom 2775 /etc/osmocom I know this is merged, but we might also have changed the permission on an existing MNCC socket. - and it is user configurable so you'ld have to parse the config for it. if osmo-msc is unable to access the socket, it will not restart after this upgrade. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29709?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I41d47c0884d09d4674ec806d77e43bc8f08d9b64 Gerrit-Change-Number: 29709 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(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> Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Sep 2024 04:13:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-ttcn3-hacks[master]: ctrl, hnbgw: access rate counter groups by given ID instead of index
by neels 04 Sep '24

04 Sep '24

Attention is currently required from: laforge, pespin. neels has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37882?usp=email ) Change subject: ctrl, hnbgw: access rate counter groups by given ID instead of index ...................................................................... Patch Set 4: (1 comment) Patchset: PS2: > you are missing the use of array indexes in this API verifying rate counters via the ctrl interface. […] I thought some more about this, and a nicer API would actually be one where the object identification is also part of the array entry. It could be a string, then callers could enter "msc.0" or "hnb.by_name.A1B2C3". That would be nice, but I currently prefer not to spend time on our testing API cosmetics, and just use this patch that is quickest to success. There is another compound to this: when we revert this patch to osmo-hnbgw https://gerrit.osmocom.org/c/osmo-hnbgw/+/38002 then the object identification behavior does not change, and we don't currently need these patches here applied at all to fix our test suite. (The general mismatch of using "obj.N" for volatile objects still exists, but it would not show in the test suite, because osmo-hnbgw will always snap back to hnb.0.) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37882?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: I70e74e7554482df67aa1d90bc04314124dea444f Gerrit-Change-Number: 37882 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Sep 2024 21:41:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: pcrf: Validate Gx metrics
by pespin 04 Sep '24

04 Sep '24

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38029?usp=email ) Change subject: pcrf: Validate Gx metrics ...................................................................... Patch Set 1: (1 comment) This change is ready for review. Patchset: PS1: Marking as ready, found the culprit in open5gs: https://github.com/open5gs/open5gs/pull/3442 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38029?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: I4eab93f14d45f291c391d9519dc1462508f8a1eb Gerrit-Change-Number: 38029 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 04 Sep 2024 19:35:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in osmo-ttcn3-hacks[master]: pcrf: Validate Gx metrics
by pespin 04 Sep '24

04 Sep '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38029?usp=email ) Change subject: pcrf: Validate Gx metrics ...................................................................... pcrf: Validate Gx metrics Change-Id: I4eab93f14d45f291c391d9519dc1462508f8a1eb --- M pcrf/PCRF_Tests.ttcn 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/38029/1 diff --git a/pcrf/PCRF_Tests.ttcn b/pcrf/PCRF_Tests.ttcn index 3cfe1bf..d7d2ed7 100644 --- a/pcrf/PCRF_Tests.ttcn +++ b/pcrf/PCRF_Tests.ttcn @@ -230,7 +230,15 @@ /* Test that PCRF can serve metrics over prometheus */ private function f_TC_ccr_cca() runs on Cli_Session_CT { + var PrometheusExpects expects := valueof({ + ts_PrometheusExpect("gx_rx_ccr", COUNTER, min := 1, max := 1), + ts_PrometheusExpect("gx_tx_cca", COUNTER, min := 1, max := 1) + }); + var PrometheusMetrics prom_snapshot := f_prometheus_snapshot(f_prometheus_keys_from_expect(expects)); + f_dia_ccr_cca(); + + f_prometheus_expect_from_snapshot(expects, wait_converge := true, snapshot := prom_snapshot); setverdict(pass); } testcase TC_ccr_cca() runs on MTC_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38029?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: I4eab93f14d45f291c391d9519dc1462508f8a1eb Gerrit-Change-Number: 38029 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: Introduce PCRF_Tests testsuite
by pespin 04 Sep '24

04 Sep '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38028?usp=email ) Change subject: Introduce PCRF_Tests testsuite ...................................................................... Introduce PCRF_Tests testsuite Change-Id: I381577111ccadaefe42f6abe3cd9bb30cc8ceb56 --- M library/DIAMETER_Templates.ttcn M library/DIAMETER_ts29_212_Templates.ttcn A pcrf/PCRF_Tests.cfg A pcrf/PCRF_Tests.default A pcrf/PCRF_Tests.ttcn A pcrf/create_test_subscribers.sh A pcrf/expected-results.xml A pcrf/freediameter.conf A pcrf/gen_links.sh A pcrf/mongod.conf A pcrf/open5gs-pcrf.yaml A pcrf/regen_makefile.sh A pcrf/testenv.cfg 13 files changed, 795 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/38028/1 diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 7148513..bb63d51 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -200,6 +200,7 @@ address_data := addr_data } +/* RFC 4006 8.46 Subscription-Id */ template (present) GenericAVP tr_AVP_SubcrId(template (present) DCC_NONE_Subscription_Id t) := { avp := { avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id), @@ -208,7 +209,16 @@ } } } +template (value) GenericAVP ts_AVP_SubcrId(template (value) DCC_NONE_Subscription_Id t) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id), + avp_data := { + avp_DCC_NONE_Subscription_Id := t + } + } +} +/* RFC 4006 8.47 Subscription-Id-Type */ template (present) GenericAVP tr_AVP_SubcrIdType(template (present) DCC_NONE_Subscription_Id_Type t) := { avp := { avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id_Type), @@ -217,7 +227,16 @@ } } } +template (value) GenericAVP ts_AVP_SubcrIdType(template (value) DCC_NONE_Subscription_Id_Type t) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id_Type), + avp_data := { + avp_DCC_NONE_Subscription_Id_Type := t + } + } +} +/* RFC 4006 8.48 Subscription-Id-Data */ template (present) GenericAVP tr_AVP_SubcrIdData(template (present) DCC_NONE_Subscription_Id_Data t) := { avp := { avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id_Data), @@ -226,6 +245,14 @@ } } } +template (value) GenericAVP ts_AVP_SubcrIdData(template (value) DCC_NONE_Subscription_Id_Data t) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id_Data), + avp_data := { + avp_DCC_NONE_Subscription_Id_Data := t + } + } +} template (present) GenericAVP tr_AVP_RequestedAction(template (present) DCC_NONE_Requested_Action t := ?) := { avp := { @@ -1125,6 +1152,14 @@ } } } +template (value) GenericAVP ts_AVP_3GPP_CalledStationId(template (value) DNAS_NONE_Called_Station_Id id) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_DNAS_NONE_Called_Station_Id), + avp_data := { + avp_DNAS_NONE_Called_Station_Id := id + } + } +} /* RFC6733 8.7. Auth-Request-Type AVP */ template (value) GenericAVP ts_AVP_AuthRequestType(BASE_NONE_Auth_Request_Type auth_req_type) := { diff --git a/library/DIAMETER_ts29_212_Templates.ttcn b/library/DIAMETER_ts29_212_Templates.ttcn index 209ac10..73d5177 100644 --- a/library/DIAMETER_ts29_212_Templates.ttcn +++ b/library/DIAMETER_ts29_212_Templates.ttcn @@ -38,6 +38,27 @@ tr_AVP_CcReqNum(?) )); +template (value) PDU_DIAMETER +ts_DIA_Gx_CCR(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) octetstring sess_id, + template (value) DCC_NONE_Subscription_Id subscr_id, + template (value) DNAS_NONE_Called_Station_Id called_station_id, + template (value) DCC_NONE_CC_Request_Type req_type := INITIAL_REQUEST, + template (value) AVP_Unsigned32 req_num := '00000000'O) +:= ts_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + app_id:=int2oct(c_DIAMETER_3GPP_Gx_AID, 4), hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_OriginHost("pcrf.localdomain"), + ts_AVP_OriginRealm("localdomain"), + ts_AVP_DestinationRealm("localdomain"), + ts_AVP_AuthAppId(int2oct(c_DIAMETER_3GPP_Gx_AID, 4)), + ts_AVP_CcReqType(req_type), + ts_AVP_CcReqNum(req_num), + ts_AVP_SubcrId(subscr_id), + ts_AVP_3GPP_CalledStationId(called_station_id) + }); + /* 3GPP TS 29.212 5.6.3 Credit-Control-Answer (CC-Answer, CCA) Command */ template (value) PDU_DIAMETER ts_DIA_Gx_CCA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, @@ -66,4 +87,19 @@ // origin }); +template (present) PDU_DIAMETER +tr_DIA_Gx_CCA(template (present) octetstring sess_id := ?, + template (present) DCC_NONE_CC_Request_Type req_type := ?, + template (present) DIAMETER_Resultcode res_code := DIAMETER_SUCCESS) +:= tr_DIAMETER(flags:='01000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId(sess_id), + tr_AVP_ResultCode(res_code), + tr_AVP_OriginHost, + tr_AVP_OriginRealm, + tr_AVP_AuthAppId(int2oct(c_DIAMETER_3GPP_Gx_AID, 4)), + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?) + )); + } /* module */ diff --git a/pcrf/PCRF_Tests.cfg b/pcrf/PCRF_Tests.cfg new file mode 100644 index 0000000..456d84f --- /dev/null +++ b/pcrf/PCRF_Tests.cfg @@ -0,0 +1,26 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./PCRF_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +mp_pcrf_hostname := "127.0.0.201"; +mp_pcrf_port := 3868; +mp_diam_local_hostname := "127.0.0.202"; +mp_diam_local_port := 3868; +mp_diam_orig_realm := "localdomain"; +mp_diam_orig_host := "smf.localdomain"; +mp_diam_dest_realm := "localdomain"; +mp_diam_dest_host := "pcrf.localdomain"; + +[MAIN_CONTROLLER] + +[EXECUTE] +PCRF_Tests.control diff --git a/pcrf/PCRF_Tests.default b/pcrf/PCRF_Tests.default new file mode 100644 index 0000000..3a78848 --- /dev/null +++ b/pcrf/PCRF_Tests.default @@ -0,0 +1,9 @@ +[LOGGING] + +[TESTPORT_PARAMETERS] +*.TCP.noDelay := "yes" // turn off nagle +*.HTTP.use_notification_ASPs := "yes" + +[MODULE_PARAMETERS] + +[EXECUTE] diff --git a/pcrf/PCRF_Tests.ttcn b/pcrf/PCRF_Tests.ttcn new file mode 100644 index 0000000..3cfe1bf --- /dev/null +++ b/pcrf/PCRF_Tests.ttcn @@ -0,0 +1,250 @@ +module PCRF_Tests { + +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 DIAMETER_Types all; +import from DIAMETER_Templates all; +import from DIAMETER_ts29_212_Templates all; +import from DIAMETER_Emulation all; + +import from Prometheus_Checker all; + +type record of hexstring SubscriberConfigs; + +modulepar { + charstring mp_pcrf_hostname := "127.0.0.4"; + integer mp_pcrf_port := 3868; + charstring mp_pcrf_prometheus_hostname := "127.0.0.5"; + integer mp_pcrf_prometheus_port := c_prometheus_default_http_port; + charstring mp_diam_local_hostname := "127.0.0.1"; + integer mp_diam_local_port := 3868; + charstring mp_diam_orig_realm := "localdomain"; + charstring mp_diam_orig_host := "smf.localdomain"; + charstring mp_diam_dest_realm := "localdomain"; + charstring mp_diam_dest_host := "pcrf.localdomain"; + SubscriberConfigs subscribers := { + /* Existing subscriber, ULA returns SERVICE_GRANTED */ + '001010000000000'H, + '001010000000001'H + }; +} + +/* main component, we typically have one per testcase */ +type component MTC_CT { + + /* emulated SMF */ + var DIAMETER_Emulation_CT vc_Gx; + port DIAMETER_PT Gx_UNIT; + port DIAMETEREM_PROC_PT Gx_PROC; + /* global test case guard timer (actual timeout value is set in f_init()) */ + timer T_guard; +} + +/* global altstep for global guard timer; */ +altstep as_Tguard() runs on MTC_CT { + [] T_guard.timeout { + setverdict(fail, "Timeout of T_guard"); + mtc.stop; + } +} + +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 { + 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 */ +type record SessionPars { + hexstring imsi, + uint32_t gx_next_hbh_id, + uint32_t gx_next_ete_id +} + +template (value) SessionPars +t_SessionPars(hexstring imsi, uint32_t gx_next_hbh_id := 1000, uint32_t gx_next_ete_id := 22220) := { + imsi := imsi, + gx_next_hbh_id := gx_next_hbh_id, + gx_next_ete_id := gx_next_ete_id +} + +type function void_fn() runs on Cli_Session_CT; + +friend function DiameterForwardUnitdataCallback(PDU_DIAMETER msg) +runs on DIAMETER_Emulation_CT return template PDU_DIAMETER { + DIAMETER_UNIT.send(msg); + return omit; +} + +friend function f_init_diameter(charstring id) runs on MTC_CT { + var DIAMETEROps ops := { + create_cb := refers(DIAMETER_Emulation.ExpectedCreateCallback), + unitdata_cb := refers(DiameterForwardUnitdataCallback), + raw := false /* handler mode (IMSI based routing) */ + }; + var DIAMETER_conn_parameters pars; + + /* Gx setup: */ + pars := { + remote_ip := mp_pcrf_hostname, + remote_sctp_port := mp_pcrf_port, + local_ip := mp_diam_local_hostname, + local_sctp_port := mp_diam_local_port, + origin_host := mp_diam_orig_host, + origin_realm := mp_diam_orig_realm, + auth_app_id := omit, + vendor_app_id := c_DIAMETER_3GPP_Gx_AID + }; + vc_Gx := DIAMETER_Emulation_CT.create(id); + map(vc_Gx:DIAMETER, system:DIAMETER_CODEC_PT); + connect(vc_Gx:DIAMETER_UNIT, self:Gx_UNIT); + connect(vc_Gx:DIAMETER_PROC, self:Gx_PROC); + vc_Gx.start(DIAMETER_Emulation.main(ops, pars, id)); + + f_diameter_wait_capability(Gx_UNIT); + /* Give some time for our emulation to get out of SUSPECT list of SUT (3 watchdong ping-pongs): + * RFC6733 sec 5.1 + * RFC3539 sec 3.4.1 [5] + * https://github.com/freeDiameter/freeDiameter/blob/master/libfdcore/p_psm.c#… + */ + f_sleep(1.0); +} + +private function f_init(float guard_timeout := 60.0) runs on MTC_CT { + T_guard.start(guard_timeout); + activate(as_Tguard()); + f_init_diameter(testcasename()); +} + +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; + + if (isvalue(pars_tmpl)) { + pars := valueof(pars_tmpl); + } else { + /*TODO: set default values */ + } + + 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)); + + vc_conn.start(f_handler_init(fn, pars)); + return vc_conn; +} + +private function f_handler_init(void_fn fn, SessionPars pars) +runs on Cli_Session_CT { + g_pars := valueof(pars); + f_prometheus_init(mp_pcrf_prometheus_hostname, mp_pcrf_prometheus_port); + fn.apply(); +} + +/* CCR + CCA against PCRF */ +private function f_dia_ccr_cca() runs on Cli_Session_CT { + var octetstring sess_id := char2oct("foobar"); + var PDU_DIAMETER rx_dia; + var UINT32 hbh_id := int2oct(g_pars.gx_next_hbh_id, 4); + var UINT32 ete_id := int2oct(g_pars.gx_next_ete_id, 4); + var octetstring imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); + var octetstring apn := char2oct("internet"); + + /* 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); + + /* 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 + )); + 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 { + setverdict(pass); + } + [] Gx.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected DIAMETER ", rx_dia)); + } + } +} + +/* Test that PCRF can serve metrics over prometheus */ +private function f_TC_ccr_cca() runs on Cli_Session_CT { + f_dia_ccr_cca(); + setverdict(pass); +} +testcase TC_ccr_cca() runs on MTC_CT { + var Cli_Session_CT vc_conn; + var SessionPars pars := valueof(t_SessionPars(subscribers[0])); + f_init(); + vc_conn := f_start_handler(refers(f_TC_ccr_cca), pars); + vc_conn.done; +} + + +control { + execute( TC_ccr_cca() ); +} + + +} diff --git a/pcrf/create_test_subscribers.sh b/pcrf/create_test_subscribers.sh new file mode 100755 index 0000000..f5b6c5b --- /dev/null +++ b/pcrf/create_test_subscribers.sh @@ -0,0 +1,27 @@ +#!/bin/sh -ex +DB_URI="mongodb://127.0.0.103/open5gs" +DBCTL="$TESTENV_CACHE_DIR/open5gs-dbctl" +DBCTL_CMD="$DBCTL --db_uri=$DB_URI" + +if ! [ -e "$DBCTL" ]; then + wget "https://raw.githubusercontent.com/open5gs/open5gs/v2.7.1/misc/db/open5gs-db…" \ + -O "$DBCTL" +fi + +if ! [ -x "$DBCTL" ]; then + chmod +x "$DBCTL" +fi + +# mongod needs some time to bootstrap... +while ! mongosh --quiet $DB_URI</dev/null; do + sleep 1 +done + +# Create a test subscriber with IMSI=001010000000000 +$DBCTL_CMD add 001010000000000 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 + +# Mark test subscriber with IMSI=001010000000001 as: +# Subscriber-Status=OPERATOR_DETERMINED_BARRING (1) +# Operator-Determined-Barring="Barring of all outgoing inter-zonal calls except those directed to the home PLMN country" (7) +$DBCTL_CMD add 001010000000001 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 +$DBCTL_CMD subscriber_status 001010000000001 1 7 diff --git a/pcrf/expected-results.xml b/pcrf/expected-results.xml new file mode 100644 index 0000000..cd706a2 --- /dev/null +++ b/pcrf/expected-results.xml @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<testsuite name='Titan' tests='1' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> + <testcase classname='PCRF_Tests' name='TC_metrics_prometheus' time='MASKED'/> +</testsuite> diff --git a/pcrf/freediameter.conf b/pcrf/freediameter.conf new file mode 100644 index 0000000..563c1f1 --- /dev/null +++ b/pcrf/freediameter.conf @@ -0,0 +1,265 @@ +# This is a sample configuration file for freeDiameter daemon. + +# Most of the options can be omitted, as they default to reasonable values. +# Only TLS-related options must be configured properly in usual setups. + +# It is possible to use "include" keyword to import additional files +# e.g.: include "/etc/freeDiameter.d/*.conf" +# This is exactly equivalent as copy & paste the content of the included file(s) +# where the "include" keyword is found. + + +############################################################## +## Peer identity and realm + +# The Diameter Identity of this daemon. +# This must be a valid FQDN that resolves to the local host. +# Default: hostname's FQDN +#Identity = "aaa.koganei.freediameter.net"; +Identity = "pcrf.localdomain"; + +# The Diameter Realm of this daemon. +# Default: the domain part of Identity (after the first dot). +#Realm = "koganei.freediameter.net"; +Realm = "localdomain"; + +############################################################## +## Transport protocol configuration + +# The port this peer is listening on for incoming connections (TCP and SCTP). +# Default: 3868. Use 0 to disable. +Port = 3868; + +# The port this peer is listening on for incoming TLS-protected connections (TCP and SCTP). +# See TLS_old_method for more information about TLS flavours. +# Note: we use TLS/SCTP instead of DTLS/SCTP at the moment. This will change in future version of freeDiameter. +# Default: 5868. Use 0 to disable. +SecPort = 0; + +# Use RFC3588 method for TLS protection, where TLS is negociated after CER/CEA exchange is completed +# on the unsecure connection. The alternative is RFC6733 mechanism, where TLS protects also the +# CER/CEA exchange on a dedicated secure port. +# This parameter only affects outgoing connections. +# The setting can be also defined per-peer (see Peers configuration section). +# Default: use RFC6733 method with separate port for TLS. +#TLS_old_method; + +# Disable use of TCP protocol (only listen and connect over SCTP) +# Default : TCP enabled +#No_TCP; + +# Disable use of SCTP protocol (only listen and connect over TCP) +# Default : SCTP enabled +#No_SCTP; +# This option is ignored if freeDiameter is compiled with DISABLE_SCTP option. + +# Prefer TCP instead of SCTP for establishing new connections. +# This setting may be overwritten per peer in peer configuration blocs. +# Default : SCTP is attempted first. +#Prefer_TCP; + +# Default number of streams per SCTP associations. +# This setting may be overwritten per peer basis. +# Default : 30 streams +#SCTP_streams = 30; + +############################################################## +## Endpoint configuration + +# Disable use of IP addresses (only IPv6) +# Default : IP enabled +#No_IP; + +# Disable use of IPv6 addresses (only IP) +# Default : IPv6 enabled +#No_IPv6; + +# Specify local addresses the server must bind to +# Default : listen on all addresses available. +#ListenOn = "202.249.37.5"; +#ListenOn = "2001:200:903:2::202:1"; +#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0"; +ListenOn = "127.0.0.201"; + + +############################################################## +## Server configuration + +# How many Diameter peers are allowed to be connecting at the same time ? +# This parameter limits the number of incoming connections from the time +# the connection is accepted until the first CER is received. +# Default: 5 unidentified clients in paralel. +#ThreadsPerServer = 5; + +############################################################## +## TLS Configuration + +# TLS is managed by the GNUTLS library in the freeDiameter daemon. +# You may find more information about parameters and special behaviors +# in the relevant documentation. +# http://www.gnu.org/software/gnutls/manual/ + +# Credentials of the local peer +# The X509 certificate and private key file to use for the local peer. +# The files must contain PKCS-1 encoded RSA key, in PEM format. +# (These parameters are passed to gnutls_certificate_set_x509_key_file function) +# Default : NO DEFAULT +#TLS_Cred = "<x509 certif file.PEM>" , "<x509 private key file.PEM>"; +#TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key"; + +# Certificate authority / trust anchors +# The file containing the list of trusted Certificate Authorities (PEM list) +# (This parameter is passed to gnutls_certificate_set_x509_trust_file function) +# The directive can appear several times to specify several files. +# Default : GNUTLS default behavior +#TLS_CA = "<file.PEM>"; + +# Certificate Revocation List file +# The information about revoked certificates. +# The file contains a list of trusted CRLs in PEM format. They should have been verified before. +# (This parameter is passed to gnutls_certificate_set_x509_crl_file function) +# Note: openssl CRL format might have interoperability issue with GNUTLS format. +# Default : GNUTLS default behavior +#TLS_CRL = "<file.PEM>"; + +# GNU TLS Priority string +# This string allows to configure the behavior of GNUTLS key exchanges +# algorithms. See gnutls_priority_init function documentation for information. +# You should also refer to the Diameter required TLS support here: +# http://tools.ietf.org/html/rfc6733#section-13.1 +# Default : "NORMAL" +# Example: TLS_Prio = "NONE:+VERS-TLS1.1:+AES-128-CBC:+RSA:+SHA1:+COMP-NULL"; +#TLS_Prio = "NORMAL"; + +# Diffie-Hellman parameters size +# Set the number of bits for generated DH parameters +# Valid value should be 768, 1024, 2048, 3072 or 4096. +# (This parameter is passed to gnutls_dh_params_generate2 function, +# it usually should match RSA key size) +# Default : 1024 +#TLS_DH_Bits = 1024; + +# Alternatively, you can specify a file to load the PKCS#3 encoded +# DH parameters directly from. This accelerates the daemon start +# but is slightly less secure. If this file is provided, the +# TLS_DH_Bits parameters has no effect. +# Default : no default. +#TLS_DH_File = "<file.PEM>"; + + +############################################################## +## Timers configuration + +# The Tc timer of this peer. +# It is the delay before a new attempt is made to reconnect a disconnected peer. +# The value is expressed in seconds. The recommended value is 30 seconds. +# Default: 30 +#TcTimer = 30; + +# The Tw timer of this peer. +# It is the delay before a watchdog message is sent, as described in RFC 3539. +# The value is expressed in seconds. The default value is 30 seconds. Value must +# be greater or equal to 6 seconds. See details in the RFC. +# Default: 30 +#TwTimer = 30; + +############################################################## +## Applications configuration + +# Disable the relaying of Diameter messages? +# For messages not handled locally, the default behavior is to forward the +# message to another peer if any is available, according to the routing +# algorithms. In addition the "0xffffff" application is advertised in CER/CEA +# exchanges. +# Default: Relaying is enabled. +#NoRelay; +NoRelay; + +# Number of server threads that can handle incoming messages at the same time. +# Default: 4 +#AppServThreads = 4; + +# Other applications are configured by loaded extensions. + +############################################################## +## Extensions configuration + +# The freeDiameter framework merely provides support for +# Diameter Base Protocol. The specific application behaviors, +# as well as advanced functions, are provided +# by loadable extensions (plug-ins). +# These extensions may in addition receive the name of a +# configuration file, the format of which is extension-specific. +# +# Format: +#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ; +# +# Examples: +#LoadExtension = "extensions/sample.fdx"; +#LoadExtension = "extensions/sample.fdx":"conf/sample.conf"; + +# Extensions are named as follow: +# dict_* for extensions that add content to the dictionary definitions. +# dbg_* for extensions useful only to retrieve more information on the framework execution. +# acl_* : Access control list, to control which peers are allowed to connect. +# rt_* : routing extensions that impact how messages are forwarded to other peers. +# app_* : applications, these extensions usually register callbacks to handle specific messages. +# test_* : dummy extensions that are useful only in testing environments. + + +# The dbg_msg_dump.fdx extension allows you to tweak the way freeDiameter displays some +# information about some events. This extension does not actually use a configuration file +# but receives directly a parameter in the string passed to the extension. Here are some examples: +## LoadExtension = "dbg_msg_dumps.fdx" : "0x1111"; # Removes all default hooks, very quiet even in case of errors. +## LoadExtension = "dbg_msg_dumps.fdx" : "0x2222"; # Display all events with few details. +## LoadExtension = "dbg_msg_dumps.fdx" : "0x0080"; # Dump complete information about sent and received messages. +# The four digits respectively control: connections, routing decisions, sent/received messages, errors. +# The values for each digit are: +# 0 - default - keep the default behavior +# 1 - quiet - remove any specific log +# 2 - compact - display only a summary of the information +# 4 - full - display the complete information on a single long line +# 8 - tree - display the complete information in an easier to read format spanning several lines. + +LoadExtension = "dbg_msg_dumps.fdx" : "0x8888"; +LoadExtension = "dict_rfc5777.fdx"; +LoadExtension = "dict_mip6i.fdx"; +LoadExtension = "dict_nasreq.fdx"; +LoadExtension = "dict_nas_mipv6.fdx"; +LoadExtension = "dict_dcca.fdx"; +LoadExtension = "dict_dcca_3gpp.fdx"; + + +############################################################## +## Peers configuration + +# The local server listens for incoming connections. By default, +# all unknown connecting peers are rejected. Extensions can override this behavior (e.g., acl_wl). +# +# In addition to incoming connections, the local peer can +# be configured to establish and maintain connections to some +# Diameter nodes and allow connections from these nodes. +# This is achieved with the ConnectPeer directive described below. +# +# Note that the configured Diameter Identity MUST match +# the information received inside CEA, or the connection will be aborted. +# +# Format: +#ConnectPeer = "diameterid" [ { parameter1; parameter2; ...} ] ; +# Parameters that can be specified in the peer's parameter list: +# No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; +# No_TLS; # assume transparent security instead of TLS. DTLS is not supported yet (will change in future versions). +# Port = 5868; # The port to connect to +# TcTimer = 30; +# TwTimer = 30; +# ConnectTo = "202.249.37.5"; +# ConnectTo = "2001:200:903:2::202:1"; +# TLS_Prio = "NORMAL"; +# Realm = "realm.net"; # Reject the peer if it does not advertise this realm. +# Examples: +#ConnectPeer = "aaa.wide.ad.jp"; +#ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ; +ConnectPeer = "smf.localdomain" { ConnectTo = "127.0.0.202"; Port = 3868; No_TLS; TcTimer = 2; }; + + +############################################################## diff --git a/pcrf/gen_links.sh b/pcrf/gen_links.sh new file mode 100755 index 0000000..baa8315 --- /dev/null +++ b/pcrf/gen_links.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # GSM 7-bit coding +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.IPL4asp/src +FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.DIAMETER_ProtocolModule_Generator/src +FILES="DIAMETER_EncDec.cc" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Abstract_Socket/src +FILES="Abstract_Socket.cc Abstract_Socket.hh " +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.HTTPmsg/src +FILES="HTTPmsg_MessageLen.ttcn HTTPmsg_MessageLen_Function.cc HTTPmsg_PT.cc HTTPmsg_PT.hh HTTPmsg_PortType.ttcn HTTPmsg_Types.ttcn " +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " +FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn " +FILES+="SCTP_Templates.ttcn " +FILES+="HTTP_Adapter.ttcn Prometheus_Checker.ttcn " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/pcrf/mongod.conf b/pcrf/mongod.conf new file mode 100644 index 0000000..ff648f4 --- /dev/null +++ b/pcrf/mongod.conf @@ -0,0 +1,45 @@ +# mongod.conf + +# for documentation of all options, see: +# http://docs.mongodb.org/manual/reference/configuration-options/ + +# Where and how to store data. +storage: + dbPath: db +# journal: +# enabled: true +# engine: +# mmapv1: +# wiredTiger: + +# where to write logging data. +# systemLog: +# destination: file +# logAppend: true +# path: /data/mongod.log + +# network interfaces +net: + port: 27017 + bindIp: 127.0.0.103 + + +# how the process runs +processManagement: + timeZoneInfo: /usr/share/zoneinfo + +#security: + +#operationProfiling: + +#replication: + +#sharding: + +## Enterprise-Only Options: + +#auditLog: + +#snmp: + + diff --git a/pcrf/open5gs-pcrf.yaml b/pcrf/open5gs-pcrf.yaml new file mode 100644 index 0000000..dcab51a --- /dev/null +++ b/pcrf/open5gs-pcrf.yaml @@ -0,0 +1,18 @@ +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/pcrf.yaml.in + +db_uri: mongodb://127.0.0.103/open5gs + +logger: + level: trace + +global: + max: + ue: 1024 + +pcrf: + freeDiameter: freediameter.conf + diameter_stats_interval: 1 + metrics: + server: + - address: 127.0.0.5 + port: 9090 \ No newline at end of file diff --git a/pcrf/regen_makefile.sh b/pcrf/regen_makefile.sh new file mode 100755 index 0000000..7d703ad --- /dev/null +++ b/pcrf/regen_makefile.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +NAME=PCRF_Tests + +FILES=" + *.ttcn + Abstract_Socket.cc + DIAMETER_CodecPort_CtrlFunctDef.cc + DIAMETER_EncDec.cc + HTTPmsg_MessageLen_Function.cc + HTTPmsg_PT.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + Native_FunctionDefs.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc +" + +export CPPFLAGS_TTCN3=" +" + +../regen-makefile.sh -e $NAME $FILES diff --git a/pcrf/testenv.cfg b/pcrf/testenv.cfg new file mode 100644 index 0000000..221e4a9 --- /dev/null +++ b/pcrf/testenv.cfg @@ -0,0 +1,17 @@ +[testsuite] +program=PCRF_Tests +config=PCRF_Tests.cfg + +[db] +prepare=mkdir db +program=mongod --config mongod.conf +setup=create_test_subscribers.sh +copy=mongod.conf +make=no +package=no + +[pcrf] +program=open5gs-pcrfd -c open5gs-pcrf.yaml +make=open5gs +copy=open5gs-pcrf.yaml freediameter.conf +package=open5gs-pcrf -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38028?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: I381577111ccadaefe42f6abe3cd9bb30cc8ceb56 Gerrit-Change-Number: 38028 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log