June 2025 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: stp: ipa: Introduce test TC_combinedlset_loadshare

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40533?usp=email ) Change subject: stp: ipa: Introduce test TC_combinedlset_loadshare ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40533?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib39c34b997f72991efe27dfbe3ffbe987fa40acc Gerrit-Change-Number: 40533 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

2 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Fix typo unknwon -> unknown

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40534?usp=email ) Change subject: Fix typo unknwon -> unknown ...................................................................... Fix typo unknwon -> unknown Change-Id: I483090332931d85a8808bd558c4d4ac4d36fa16b --- M bts/BTS_Tests.ttcn M stp/STP_Tests_IPA.ttcn 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/40534/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 9c6f238..de02359 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2464,7 +2464,7 @@ case (RSL_ALG_ID_A5_6) { return 6; } case (RSL_ALG_ID_A5_7) { return 7; } case else { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknwon Algorithm ID"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknown Algorithm ID"); /* Make compiler happy by calling mtc.stop here. It is already * called in f_shutdown */ mtc.stop; @@ -2482,7 +2482,7 @@ case (RSL_ALG_ID_A5_6) { return '101'B; } case (RSL_ALG_ID_A5_7) { return '110'B; } case else { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknwon Algorithm ID"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknown Algorithm ID"); /* Make compiler happy by calling mtc.stop here. It is already * called in f_shutdown */ mtc.stop; diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 2aab7c3..b34297e 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -301,13 +301,13 @@ setverdict(pass); } -private function f_tc_tmt_override(boolean unknwon_dynamic_asp) +private function f_tc_tmt_override(boolean unknown_dynamic_asp) runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-override-sender", "ipa-asp-override-receiver0", "ipa-asp-override-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); - if (unknwon_dynamic_asp) { + if (unknown_dynamic_asp) { ipa_configs[0].local_port := 3002; ipa_configs[1].local_port := 3003; ipa_configs[2].local_port := 3004; @@ -347,14 +347,14 @@ } } -private function f_tc_tmt_loadshare_roundrobin(boolean unknwon_dynamic_asp) +private function f_tc_tmt_loadshare_roundrobin(boolean unknown_dynamic_asp) runs on IPA_CT { var integer i; var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0", "ipa-asp-loadshare-receiver0", "ipa-asp-loadshare-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); - if (unknwon_dynamic_asp) { + if (unknown_dynamic_asp) { ipa_configs[0].local_port := 3005; ipa_configs[1].local_port := 3006; ipa_configs[2].local_port := 3007; @@ -415,7 +415,7 @@ } } -private function f_tc_tmt_loadshare_sls(boolean unknwon_dynamic_asp) +private function f_tc_tmt_loadshare_sls(boolean unknown_dynamic_asp) runs on IPA_CT { var integer i; @@ -424,7 +424,7 @@ "ipa-asp-loadshare-receiver0", "ipa-asp-loadshare-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); - if (unknwon_dynamic_asp) { + if (unknown_dynamic_asp) { ipa_configs[0].local_port := 9998; ipa_configs[1].local_port := 9999; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40534?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: I483090332931d85a8808bd558c4d4ac4d36fa16b Gerrit-Change-Number: 40534 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: ipa: Introduce test TC_combinedlset_loadshare

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40533?usp=email ) Change subject: stp: ipa: Introduce test TC_combinedlset_loadshare ...................................................................... stp: ipa: Introduce test TC_combinedlset_loadshare Test combined linkset loadsharing on IPA AS. Change-Id: Ib39c34b997f72991efe27dfbe3ffbe987fa40acc tChange-Id: I029ac9f3c664d2f30cddc36f6eb1b39295689247 Related: SYS#7112 --- M stp/STP_Tests_IPA.cfg M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml M stp/osmo-stp-ipa.confmerge 4 files changed, 152 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/40533/1 diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg index 9e9538e..8f6c24a 100644 --- a/stp/STP_Tests_IPA.cfg +++ b/stp/STP_Tests_IPA.cfg @@ -62,6 +62,20 @@ local_port := 20007 }, { + asp_name := "ipa-asp-LS0-0-0", + as_name := "ipa-as-LS0-0", + is_server := false, + remote_port := 5000, + local_port := 20010 + }, + { + asp_name := "ipa-asp-LS0-1-0", + as_name := "ipa-as-LS0-1", + is_server := false, + remote_port := 5000, + local_port := 20011 + }, + { asp_name := "ipa-asp-client0", as_name := "ipa-as-client0", is_server := true, diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 3fb0ace..2aab7c3 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -425,8 +425,8 @@ "ipa-asp-loadshare-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); if (unknwon_dynamic_asp) { - ipa_configs[0].local_port := 3010; - ipa_configs[1].local_port := 3011; + ipa_configs[0].local_port := 9998; + ipa_configs[1].local_port := 9999; } f_init_ipa(ipa_configs := ipa_configs); @@ -528,6 +528,114 @@ f_tc_tmt_loadshare_sls(true); } +/* Test AS Loadsharing, (distributing traffic within linksets/ASs of a combined linkset). + * STP routing table is configured with 1 combined linkset towards PC 32 mask /14 with 2 + * AS routes ("ipa-as-LS0-0", "ipa-as-LS0-1") with same priority, each using 1 + * ASP ("ipa-asp-LS0-0-0", "ipa-asp-LS0-1-0"). + * We take advantage of the fact that AS "ipa-as-loadshare-receiver" is never used + * to transmit in other tests and use it here for the routing of its configured + * "point-code override dpc 32" towards the "ipa-as-LS0-{0,1}" in the STP config. + */ +private function f_tc_combinedlset_loadshare(boolean unknown_dynamic_asp) +runs on IPA_CT { + var integer i; + + var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-receiver0", + "ipa-asp-loadshare-receiver1", + "ipa-asp-LS0-0-0", + "ipa-asp-LS0-1-0" }; + var IpaConfigs ipa_configs := ipa_build_configs(asps); + if (unknown_dynamic_asp) { + ipa_configs[0].local_port := 9998; + ipa_configs[1].local_port := 9999; + } + + f_init_ipa(ipa_configs := ipa_configs); + + /* bring up the 'sender' side (single ASP in AS) */ + f_connect_ipa(0); + /* activate the first 'receiver' side ASP */ + f_connect_ipa(2); + + /* verify traffic is routed from sender to [sole] receiver */ + for (i := 0; i < 10; i := i+1) { + f_test_traffic(0, 2); + } + + /* activate the second 'receiver' side ASP */ + f_connect_ipa(3); + + /* verify traffic is routed from sender to new receiver */ + const integer iter_per_asp := 20; + const integer NUM_SLS := 16; /* SLS in ITU is 4 bits. */ + var integer num_rx_1 := 0; + var integer num_rx_2 := 0; + var Integers sls_num_rx_1 := {}; + var Integers sls_num_rx_2 := {}; + for (i := 0; i < NUM_SLS; i := i + 1) { + sls_num_rx_1 := sls_num_rx_1 & {0}; + sls_num_rx_2 := sls_num_rx_2 & {0}; + } + for (i := 0; i < iter_per_asp; i := i+1) { + var octetstring data := f_SCCP_UDT(); + f_IPA_send(0, data); + alt { + [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(3, data, sls_num_rx_2, num_rx_2); + } + } + + /* All traffic should still be sent to the same receiver, since + * OPC+DPC+SLS cannot change in IPA ASPs. + * However, depending on how the SLS seed tables were allocated, it can + * be that STP was routing through Alternative Route and now that the + * 2nd receiver is up it is now routing to it (Normal Route). Account + * for both scenarios. */ + if (not ((num_rx_1 == iter_per_asp and num_rx_2 == 0) or (num_rx_2 == iter_per_asp and num_rx_1 == 0))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected all traffic through same receiver!"); + } + + + /* activate the second 'sender' side ASP */ + f_connect_ipa(1); + + num_rx_1 := 0; + num_rx_2 := 0; + sls_num_rx_1 := {}; + sls_num_rx_2 := {}; + for (i := 0; i < NUM_SLS; i := i + 1) { + sls_num_rx_1 := sls_num_rx_1 & {0}; + sls_num_rx_2 := sls_num_rx_2 & {0}; + } + for (i := 0; i < 2*iter_per_asp; i := i+1) { + var octetstring data := f_SCCP_UDT(); + f_IPA_send(i mod 2, data); + alt { + [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(3, data, sls_num_rx_2, num_rx_2); + } + } + /* Make sure traffic was sent over both ASPs and that it was distributed: */ + if (num_rx_1 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 1st ASP!"); + } + if (num_rx_2 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 2nd ASP!"); + } + if (num_rx_1 + num_rx_2 != 2*iter_per_asp) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx ", num_rx_1 + num_rx_2 ," packets in total vs exp ", 2*iter_per_asp)); + } + setverdict(pass); +} +testcase TC_combinedlset_loadshare() runs on IPA_CT { + f_tc_combinedlset_loadshare(false); +} +/* same as above, with "accept-asp-connections dynamic-permitted" and clients from unknown ASPs */ +testcase TC_unknown_client_dynamic_combinedlset_loadshare() runs on IPA_CT { + f_tc_combinedlset_loadshare(true); +} + private function f_IPA_ping(integer idx) runs on IPA_CT { var IpaCcmMsgtype ipa_ping_msg := IPAC_MSGT_PING; @@ -641,6 +749,8 @@ execute( TC_tmt_loadshare_roundrobin() ); execute( TC_tmt_loadshare_sls() ); execute( TC_unknown_client_dynamic_tmt_loadshare() ); + execute( TC_combinedlset_loadshare() ); + execute( TC_unknown_client_dynamic_combinedlset_loadshare() ); execute( TC_beat() ); execute( TC_beat_timeout() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 646ca7b..91115d9 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='60' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='62' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='STP_Tests_M3UA' name='TC_connect_asp_up' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat_payload' time='MASKED'/> @@ -59,6 +59,8 @@ <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_roundrobin' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_sls' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_combinedlset_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_combinedlset_loadshare' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_clnt_beat_timeout' time='MASKED'/> diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge index 954f175..ef95384 100644 --- a/stp/osmo-stp-ipa.confmerge +++ b/stp/osmo-stp-ipa.confmerge @@ -53,6 +53,26 @@ point-code override dpc 34 asp ipa-asp-override-receiver0 asp ipa-asp-override-receiver1 + ! CombinedLinkset-loadsharing AS(P)s: + asp ipa-asp-LS0-0-0 20010 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + asp ipa-asp-LS0-1-0 20011 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as ipa-as-LS0-0 ipa + point-code override dpc 38 + routing-key 0 44 + asp ipa-asp-LS0-0-0 + as ipa-as-LS0-1 ipa + point-code override dpc 39 + routing-key 0 45 + asp ipa-asp-LS0-1-0 + ! CLIENT asp ipa-asp-client0 6001 7001 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 @@ -68,6 +88,9 @@ ! route-table system update route 31 16777215 linkset ipa-as-loadshare-receiver + ! These 2 below are used in TC_combinedlset_loadshare to route traffic from ipa-as-loadshare-receiver towards: + update route 32 16777215 linkset ipa-as-LS0-0 priority 6 + update route 32 16777215 linkset ipa-as-LS0-1 priority 6 update route 33 16777215 linkset ipa-as-override-receiver ! !SERVERS: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40533?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: Ib39c34b997f72991efe27dfbe3ffbe987fa40acc Gerrit-Change-Number: 40533 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: enft_kpi: enb_set_addr/1: restrict ULDL values

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40531?usp=email ) Change subject: enft_kpi: enb_set_addr/1: restrict ULDL values ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40531?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4e6bc5b392db334f5c79f30076e5e864af1db27d Gerrit-Change-Number: 40531 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 10:45:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: enft_kpi: flush the table on init

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?usp=email ) Change subject: enft_kpi: flush the table on init ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I96bf4f7b6d5c9104fad0d6f98eda56e7a4e4fa7d Gerrit-Change-Number: 40532 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 10:45:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: enft_kpi: flush the table on init

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?usp=email ) Change subject: enft_kpi: flush the table on init ...................................................................... Patch Set 1: (1 comment) File src/enft_kpi.erl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532/comment/c433094e_4a58… : PS1, Line 515: nft_exec(Cmds). you should probably be deleting the rules filtering the traffic towards table TName too? Probably the ones you add in line 528 with enftables:nft_cmd_add_rule()? -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I96bf4f7b6d5c9104fad0d6f98eda56e7a4e4fa7d Gerrit-Change-Number: 40532 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 10:45:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

2 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: ipa: Introduce test TC_combinedlset_loadshare

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?usp=email ) Change subject: stp: ipa: Introduce test TC_combinedlset_loadshare ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File stp/STP_Tests_IPA.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530/comment/33c6576b_a4cf… : PS1, Line 539: unknwon_dynamic_asp ```suggestion private function f_tc_combinedlset_loadshare(boolean unknown_dynamic_asp) ``` this typo is also elsewhere in this file, maybe create a separate patch to fix that? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?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: I029ac9f3c664d2f30cddc36f6eb1b39295689247 Gerrit-Change-Number: 40530 Gerrit-PatchSet: 1 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 10:37:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Add helper function to build SCCP UDT encoded octetstring

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40529?usp=email ) Change subject: stp: Add helper function to build SCCP UDT encoded octetstring ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40529?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: I67961807bba4853b58e4b6f87eb3f2b56e9bb027 Gerrit-Change-Number: 40529 Gerrit-PatchSet: 1 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 10:27:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: enft_kpi: enb_set_addr/1: restrict ULDL values

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40531?usp=email ) Change subject: enft_kpi: enb_set_addr/1: restrict ULDL values ...................................................................... enft_kpi: enb_set_addr/1: restrict ULDL values Change-Id: I4e6bc5b392db334f5c79f30076e5e864af1db27d Related: SYS#7307 --- M src/enft_kpi.erl 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/31/40531/1 diff --git a/src/enft_kpi.erl b/src/enft_kpi.erl index 9086298..cc2107a 100644 --- a/src/enft_kpi.erl +++ b/src/enft_kpi.erl @@ -119,8 +119,11 @@ -spec enb_set_addr(ULDLAddr) -> ok when ULDLAddr :: uldl_addr(). -enb_set_addr(ULDLAddr) -> - gen_server:cast(?MODULE, {?FUNCTION_NAME, self(), ULDLAddr}). +enb_set_addr({ul, Addr}) -> + gen_server:cast(?MODULE, {?FUNCTION_NAME, self(), {ul, Addr}}); + +enb_set_addr({dl, Addr}) -> + gen_server:cast(?MODULE, {?FUNCTION_NAME, self(), {dl, Addr}}). -spec enb_unregister() -> ok | {error, term()}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40531?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: I4e6bc5b392db334f5c79f30076e5e864af1db27d Gerrit-Change-Number: 40531 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[S] Change in ...osmo-s1gw[master]: enft_kpi: flush the table on init

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?usp=email ) Change subject: enft_kpi: flush the table on init ...................................................................... enft_kpi: flush the table on init Older versions of nftables, including the 1.0.6 provided by Osmocom, do not support setting the "owner" flag when creating a table via JSON. Ensure that we start with a clean state by deleting the table on init. Change-Id: I96bf4f7b6d5c9104fad0d6f98eda56e7a4e4fa7d Related: SYS#7307 --- M src/enft_kpi.erl 1 file changed, 30 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/32/40532/1 diff --git a/src/enft_kpi.erl b/src/enft_kpi.erl index cc2107a..f8cf126 100644 --- a/src/enft_kpi.erl +++ b/src/enft_kpi.erl @@ -149,20 +149,11 @@ process_flag(trap_exit, true), TName = maps:get(table_name, Cfg, "osmo-s1gw"), Interval = maps:get(interval, Cfg, 3000), - %% ignore (accept) anything but GTPU @ udp/2152 - R1 = [enftables:nft_expr_match_ip_proto("udp", ?OP_NEQ), - enftables:nft_expr_accept()], - R2 = [enftables:nft_expr_match_udp_dport(?GTPU_PORT, ?OP_NEQ), - enftables:nft_expr_accept()], - Cmds = [enftables:nft_cmd_add_table(TName, [<< "owner" >>]), - nft_cmd_add_chain(TName, "gtpu-ul", "prerouting"), - nft_cmd_add_chain(TName, "gtpu-dl", "postrouting"), - enftables:nft_cmd_add_rule(TName, "gtpu-ul", R1), - enftables:nft_cmd_add_rule(TName, "gtpu-dl", R1), - enftables:nft_cmd_add_rule(TName, "gtpu-ul", R2), - enftables:nft_cmd_add_rule(TName, "gtpu-dl", R2) - ], - case nft_exec(Cmds) of + %% flush the table, in case it remained + %% it may not exist, so we ignore the result + nft_flush_table(TName), + %% create and initialize the table + case nft_init_table(TName) of ok -> ?LOG_INFO("NFT table ~p has been initialized", [TName]), spawn_link(fun() -> heartbeat(Interval) end), @@ -317,7 +308,7 @@ ?LOG_NOTICE("Terminating, reason ~p", [Reason]), case Cfg of #{enable := true, table_name := TName} -> - nft_exec([enftables:nft_cmd_del_table(TName)]), %% delete the table + nft_flush_table(TName), ok; _ -> ok %% stub mode end. @@ -518,6 +509,30 @@ end. +-spec nft_flush_table(string()) -> enftables:result(). +nft_flush_table(TName) -> + Cmds = [enftables:nft_cmd_del_table(TName)], + nft_exec(Cmds). + + +-spec nft_init_table(string()) -> enftables:result(). +nft_init_table(TName) -> + %% ignore (accept) anything but GTPU @ udp/2152 + R1 = [enftables:nft_expr_match_ip_proto("udp", ?OP_NEQ), + enftables:nft_expr_accept()], + R2 = [enftables:nft_expr_match_udp_dport(?GTPU_PORT, ?OP_NEQ), + enftables:nft_expr_accept()], + Cmds = [enftables:nft_cmd_add_table(TName, [<< "owner" >>]), + nft_cmd_add_chain(TName, "gtpu-ul", "prerouting"), + nft_cmd_add_chain(TName, "gtpu-dl", "postrouting"), + enftables:nft_cmd_add_rule(TName, "gtpu-ul", R1), + enftables:nft_cmd_add_rule(TName, "gtpu-dl", R1), + enftables:nft_cmd_add_rule(TName, "gtpu-ul", R2), + enftables:nft_cmd_add_rule(TName, "gtpu-dl", R2) + ], + nft_exec(Cmds). + + -spec nft_exec(Cmds) -> enftables:result() when Cmds :: [enftables:nft_cmd()]. nft_exec(Cmds) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40532?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: I96bf4f7b6d5c9104fad0d6f98eda56e7a4e4fa7d Gerrit-Change-Number: 40532 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025