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

osmith has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified neels: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged