May 2024 - gerrit-log - lists.osmocom.org

[M] Change in openbsc[master]: tests: adjust to osmotestconfig no copytree change

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/36940?usp=email ) Change subject: tests: adjust to osmotestconfig no copytree change ...................................................................... tests: adjust to osmotestconfig no copytree change openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg references a bscs.config in the same directory. With a recent change in osmotestconfig.py, the file does not get copied anymore to the test directory. Copying additional files around caused problems when running osmotestconfig.py during 'make distcheck'. (openbsc didn't run into these issues because we don't run the vty-tests in 'make distcheck'.) Make the test pass by running it on a copy of the config without: nat bscs-config-file bscs.config Related: osmo-python-tests Ic312d546da1c21f68a80b6a188616ef9bc84f4c6 Change-Id: Ice759b2205308ffb827293256eb1c0de9ac67edd --- M openbsc/osmoappdesc.py A openbsc/tests/osmo-bsc-nat.cfg 2 files changed, 89 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/40/36940/1 diff --git a/openbsc/osmoappdesc.py b/openbsc/osmoappdesc.py index ba3ccf9..8fee080 100644 --- a/openbsc/osmoappdesc.py +++ b/openbsc/osmoappdesc.py @@ -29,7 +29,7 @@ app_configs = { "osmo-bsc-sccplite": ["doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"], - "nat": ["doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg"], + "nat": ["tests/osmo-bsc-nat.cfg"], "mgcp": ["doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg"], "nitb": ["doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg", "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"], diff --git a/openbsc/tests/osmo-bsc-nat.cfg b/openbsc/tests/osmo-bsc-nat.cfg new file mode 100644 index 0000000..4b0f266 --- /dev/null +++ b/openbsc/tests/osmo-bsc-nat.cfg @@ -0,0 +1,66 @@ +# Same as doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg, but without 'bscs-config-file' +! +! OsmoBSCNAT (0.12.0.266-2daa9) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging timestamp 0 + logging level all debug + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level mncc notice + logging level pag notice + logging level meas notice + logging level sccp notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level db notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp debug + logging level llc debug + logging level sndcp debug + logging level nat notice + logging level ctrl notice + logging level smpp debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice +! +line vty + no login +! +mgcp + bind ip 0.0.0.0 + bind port 2427 + rtp bts-base 4000 + rtp net-base 16000 + rtp ip-dscp 0 + no rtcp-omit + sdp audio-payload number 126 + sdp audio-payload name AMR/8000 + loop 0 + number endpoints 1 + call-agent ip 127.0.0.1 + rtp transcoder-base 0 + transcoder-remote-base 4000 +nat + msc ip 127.0.0.1 + msc port 5000 + timeout auth 2 + timeout ping 20 + timeout pong 5 + ip-dscp 0 + access-list bla imsi-allow ^11$ -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/36940?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ice759b2205308ffb827293256eb1c0de9ac67edd Gerrit-Change-Number: 36940 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Action PJSIPAccessNetworkInfo

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email ) Change subject: asterisk: Use Action PJSIPAccessNetworkInfo ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I'm gonna merge this patchset later today after one week waiting here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36886?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2759d12caeaca81a9224997a29541c325d65fe30 Gerrit-Change-Number: 36886 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 28 May 2024 09:13:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-msc[master]: libmsc: reset the LU delay timer (X36) on MO/MT SMS

by pespin

Attention is currently required from: fixeria, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email ) Change subject: libmsc: reset the LU delay timer (X36) on MO/MT SMS ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad4ace6038be4b6037e341e7d9d187bef2917d80 Gerrit-Change-Number: 36865 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 May 2024 09:11:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-msc[master]: libmsc: add timer X36 for delaying LU connections

by pespin

Attention is currently required from: fixeria, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email ) Change subject: libmsc: add timer X36 for delaying LU connections ...................................................................... Patch Set 6: Code-Review+1 (1 comment) File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/36760/comment/fc31ca73_a5daed17 PS6, Line 186: msc_a_put(msc_a, MSC_A_USE_LOCATION_UPDATING); imho the "msc_a_put_lu_deferred" name is a bit misleading, since it's not always deferred. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 May 2024 09:11:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-msc[master]: libmsc: add timer X36 for delaying LU connections

by fixeria

Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email to look at the new patch set (#6). Change subject: libmsc: add timer X36 for delaying LU connections ...................................................................... libmsc: add timer X36 for delaying LU connections The idea is to allow re-using the radio channel that was used for Location Updating to deliver MT SMS over GSUP. This is achieved by delaying release of a BSSAP/RANAP connection and thus delaying the release of the radio channel. The delay can be configured using new timer X36 (default 0 ms), separately for GERAN and UTRAN. Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Related: osmo-ttcn3-hacks.git I74fa174ea649adb2112c8e471c0e339a2197a08d Related: SYS#6913 --- M include/osmocom/msc/msc_a.h M src/libmsc/msc_a.c M src/libmsc/ran_infra.c 3 files changed, 65 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/60/36760/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[S] Change in osmo-msc[master]: libmsc: reset the LU delay timer (X36) on MO/MT SMS

by fixeria

Attention is currently required from: fixeria, laforge, neels, pespin. Hello Jenkins Builder, laforge, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin Change subject: libmsc: reset the LU delay timer (X36) on MO/MT SMS ...................................................................... libmsc: reset the LU delay timer (X36) on MO/MT SMS We don't want to delay the BSSAP/RANAP connection release any longer than it takes to submit or deliver an SMS. Thus, whenever a new SMS transaction is being allocated, drop the LU token. Change-Id: Iad4ace6038be4b6037e341e7d9d187bef2917d80 Related: osmo-ttcn3-hacks.git I74fa174ea649adb2112c8e471c0e339a2197a08d Related: SYS#6913 --- M src/libmsc/gsm_04_11.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/65/36865/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36865?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iad4ace6038be4b6037e341e7d9d187bef2917d80 Gerrit-Change-Number: 36865 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU connections

by fixeria

Attention is currently required from: laforge, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email ) Change subject: libmsc: add X5 timer for delaying LU connections ...................................................................... Patch Set 4: (4 comments) Patchset: PS4: > Just an idea: […] I suggested this improvement to the customer (see note-16 in SYS#6913), but they refused. I would still like to implement this, but I ran out of the estimated time, so I'll leave this as a potential improvement for a separate patch. PS4: > If the SMSC has a response message to the readyForSM saying "ack, i had nothing to submit", then I would again like to remove this timeout, as soon as osmo-msc supports those messages. This sounds logical and would be nice, but there exists no such thing in MAP protocol and thus should not be in GSUP, unless we really want to deviate from the former. See 3GPP TS 29.002, Table 12.4/1. File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/36760/comment/db8c35e7_5129ac6b PS4, Line 164: static void msc_a_put_use_lu(struct msc_a *msc_a) > (i'd prefer the name msc_a_put_lu_deferred() […] Done File src/libmsc/ran_infra.c: https://gerrit.osmocom.org/c/osmo-msc/+/36760/comment/cd9271a5_0f3703ef PS4, Line 47: { .T = -5, .default_val = 0, .unit = OSMO_TDEF_MS, .desc = "Additional delay for LU connections" }, \ (two separate things in one thread making it a bit hard to respond) doc string change: ack, updated in the new patchset. > you need to add a new timer entry to the list in the wiki: [...] Done. > I would encourage to avoid re-using the same timer numbers. > By that scheme, currently the next available X timer is X 36 or -36. I remember this was discussed somewhere, but I am not sure if we ever reached an agreement on the numbering scope of those Osmocom specific X-timers. According to that table, timer numbers like X1 and X2 are re-used in several projects, but AFAIU this is because they were added before you suggested to make X-timer numbers globally unique? Also, there is nothing on that wiki page saying "please avoid re-using the same timer numbers"... I don't have a strong opinion here, so I'll just follow your suggestion. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 May 2024 07:55:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: add TC_gsup_mt_sms_lu_delay for X36 (LU delay) timer

by fixeria

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: msc: add TC_gsup_mt_sms_lu_delay for X36 (LU delay) timer ...................................................................... msc: add TC_gsup_mt_sms_lu_delay for X36 (LU delay) timer Change-Id: I74fa174ea649adb2112c8e471c0e339a2197a08d Related: osmo-msc.git Ic519cab55d65e47b2636124427dab1a1d80fab78 Related: SYS#6913 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml 3 files changed, 79 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/36772/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I74fa174ea649adb2112c8e471c0e339a2197a08d Gerrit-Change-Number: 36772 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[M] Change in osmo-msc[master]: libmsc: add X5 timer for delaying LU connections

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: libmsc: add X5 timer for delaying LU connections ...................................................................... libmsc: add X5 timer for delaying LU connections The idea is to allow re-using the radio channel that was used for Location Updating to deliver MT SMS over GSUP. This is achieved by delaying release of a BSSAP/RANAP connection and thus delaying the release of the radio channel. The delay can be configured using new timer X5 (default 0 ms), separately for GERAN and UTRAN. Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Related: osmo-ttcn3-hacks.git I74fa174ea649adb2112c8e471c0e339a2197a08d Related: SYS#6913 --- M include/osmocom/msc/msc_a.h M src/libmsc/msc_a.c M src/libmsc/ran_infra.c 3 files changed, 65 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/60/36760/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic519cab55d65e47b2636124427dab1a1d80fab78 Gerrit-Change-Number: 36760 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[M] Change in osmo-sgsn[master]: doc: set state-dir to /var/lib/osmocom/osmo-sgsn

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email ) Change subject: doc: set state-dir to /var/lib/osmocom/osmo-sgsn ...................................................................... doc: set state-dir to /var/lib/osmocom/osmo-sgsn Be consistent with osmo-ggsn, and set the state dir to /var/lib/osmocom/osmo-sgsn. Without this patch, it defaults to the current directory, which means in case of running with the systemd service, /var/lib/osmocom. Copy osmo-sgsn.cfg and osmo-sgsn-accept-all.cfg to the tests dir and do not set the state-dir there. Usually the user that runs the VTY and CTRL tests is not allowed to write to /var/lib/osmocom. (I've also tried generating these on the fly, but that breaks in 'make distcheck', as I would need to write to the source dir or would need to change osmo-python-tests etc. to read the config file from another directory.) Related: osmo-ggsn I5b51529b4f8bd2462e54f58a1ce2e2d7c76ff46a Depends: osmo-python-tests Ic312d546da1c21f68a80b6a188616ef9bc84f4c6 Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70 --- M doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg M doc/examples/osmo-sgsn/osmo-sgsn.cfg M doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg M osmoappdesc.py M tests/Makefile.am M tests/ctrl_test_runner.py A tests/osmo-sgsn-accept-all.cfg A tests/osmo-sgsn.cfg M tests/vty_test_runner.py 9 files changed, 111 insertions(+), 8 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg index 69000b4..9bc1520 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg @@ -14,6 +14,7 @@ no login ! sgsn + gtp state-dir /var/lib/osmocom/osmo-sgsn gtp local-ip 127.0.0.1 ggsn 0 remote-ip 127.0.0.2 ggsn 0 gtp-version 1 diff --git a/doc/examples/osmo-sgsn/osmo-sgsn.cfg b/doc/examples/osmo-sgsn/osmo-sgsn.cfg index 0b5ef4b..8104725 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn.cfg @@ -14,6 +14,7 @@ no login ! sgsn + gtp state-dir /var/lib/osmocom/osmo-sgsn gtp local-ip 127.0.0.1 ggsn 0 remote-ip 127.0.0.2 ggsn 0 gtp-version 1 diff --git a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg index a7ed9cf..d7fbd75 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg @@ -23,6 +23,7 @@ asp asp-clnt-OsmoSGSN-A routing-key 3 0.23.4 sgsn + gtp state-dir /var/lib/osmocom/osmo-sgsn gtp local-ip 127.0.0.1 ggsn 0 remote-ip 127.0.0.2 ggsn 0 gtp-version 1 diff --git a/osmoappdesc.py b/osmoappdesc.py index c327597..b0a9164 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -16,7 +16,7 @@ app_configs = { - "sgsn": ["doc/examples/osmo-sgsn/osmo-sgsn.cfg"], + "sgsn": ["tests/osmo-sgsn.cfg"], "gtphub": ["doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg"] } @@ -25,7 +25,6 @@ (4253, "src/gtphub/osmo-gtphub", "OsmoGTPhub", "gtphub") ] -vty_command = ["./src/sgsn/osmo-sgsn", "-c", - "doc/examples/osmo-sgsn/osmo-sgsn.cfg"] +vty_command = ["./src/sgsn/osmo-sgsn", "-c", "tests/osmo-sgsn.cfg"] vty_app = apps[0] diff --git a/tests/Makefile.am b/tests/Makefile.am index 2c07ac9..fc5af0b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,6 +32,8 @@ $(TESTSUITE) \ vty_test_runner.py \ ctrl_test_runner.py \ + osmo-sgsn-accept-all.cfg \ + osmo-sgsn.cfg \ osmo-sgsn_test-nodes.vty \ $(NULL) @@ -62,7 +64,7 @@ vty-transcript-test: $(top_builddir)/src/sgsn/osmo-sgsn osmo_verify_transcript_vty.py -v \ -n OsmoSGSN -p 4245 \ - -r "$(top_builddir)/src/sgsn/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \ + -r "$(top_builddir)/src/sgsn/osmo-sgsn -c $(top_srcdir)/tests/osmo-sgsn.cfg" \ $(U) $${T:-$(srcdir)/osmo-sgsn*.vty} rm -f $(builddir)/gsn_restart diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index 69b2478..20c59eb 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -145,8 +145,7 @@ class TestCtrlSGSN(TestCtrlBase): def ctrl_command(self): - return ["./src/sgsn/osmo-sgsn", "-c", - "doc/examples/osmo-sgsn/osmo-sgsn.cfg"] + return ["./src/sgsn/osmo-sgsn", "-c", "tests/osmo-sgsn.cfg"] def ctrl_app(self): return (4251, "./src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn") diff --git a/tests/osmo-sgsn-accept-all.cfg b/tests/osmo-sgsn-accept-all.cfg new file mode 100644 index 0000000..46a5d61 --- /dev/null +++ b/tests/osmo-sgsn-accept-all.cfg @@ -0,0 +1,38 @@ +# Same as doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg, but without 'gtp state-dir' +! +! Osmocom SGSN configuration +! +! +log stderr + logging color 1 + logging print category-hex 0 + logging print category 1 + logging timestamp 0 + logging print file basename last + logging print level 1 + +line vty + no login +! +sgsn + gtp local-ip 127.0.0.1 + ggsn 0 remote-ip 127.0.0.2 + ggsn 0 gtp-version 1 + ggsn 0 echo-interval 60 + authentication optional + auth-policy accept-all +! +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + bind udp local + listen 127.0.0.1 23000 + accept-ipaccess +! +bssgp +! diff --git a/tests/osmo-sgsn.cfg b/tests/osmo-sgsn.cfg new file mode 100644 index 0000000..cf8509c --- /dev/null +++ b/tests/osmo-sgsn.cfg @@ -0,0 +1,40 @@ +# Same as doc/examples/osmo-sgsn/osmo-sgsn.cfg, but without 'gtp state-dir' +! +! Osmocom SGSN configuration +! +! +log stderr + logging color 1 + logging print category-hex 0 + logging print category 1 + logging timestamp 0 + logging print file basename last + logging print level 1 + +line vty + no login +! +sgsn + gtp local-ip 127.0.0.1 + ggsn 0 remote-ip 127.0.0.2 + ggsn 0 gtp-version 1 + ggsn 0 echo-interval 60 + authentication required + auth-policy remote + gsup remote-ip 127.0.0.1 + gsup remote-port 4222 +! +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + bind udp local + listen 127.0.0.1 23000 + accept-ipaccess +! +bssgp +! diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index 0b7df8c..aaa76ed 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -70,8 +70,7 @@ class TestVTYSGSN(TestVTYBase): def vty_command(self): - return ["./src/sgsn/osmo-sgsn", "-c", - "doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg"] + return ["./src/sgsn/osmo-sgsn", "-c", "tests/osmo-sgsn-accept-all.cfg"] def vty_app(self): return (4245, "./src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn") -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70 Gerrit-Change-Number: 36845 Gerrit-PatchSet: 6 Gerrit-Owner: osmith <osmith(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> Gerrit-MessageType: merged

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024