osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43668?usp=email )
Change subject: bts: testenv: fake_trx.py -> osmo-trx-proxy ......................................................................
bts: testenv: fake_trx.py -> osmo-trx-proxy
Use the new osmo-trx-proxy instead of fake_trx.py.
Related: OS#6672 Depends: osmo-trx I995b44bf9a884cf5ba6db8333e6f08c9604a58a5 Change-Id: I8eadd99f3263fde08b31dc228dddfc87a38dba52 --- M _testenv/data/osmo-dev/testenv.opts M _testenv/data/podman/Dockerfile A bts/osmo-trx-proxy.cfg M bts/testenv_generic.cfg M bts/testenv_hopping.cfg M bts/testenv_oml.cfg 6 files changed, 63 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/43668/1
diff --git a/_testenv/data/osmo-dev/testenv.opts b/_testenv/data/osmo-dev/testenv.opts index 4ee524b..f6456df 100644 --- a/_testenv/data/osmo-dev/testenv.opts +++ b/_testenv/data/osmo-dev/testenv.opts @@ -1,3 +1,4 @@ osmo-bts --enable-trx osmo-remsim --disable-remsim-client-ifdhandler onomondo-ipa -DMEM_EMIT_DEBUG=ON +osmo-trx --with-proxy diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 6a1a42a..cc9816b 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -43,6 +43,7 @@ libdbd-sqlite3 \ libdbi-dev \ libelf-dev \ + libfftw3-dev \ libgcc-*-dev \ libgcrypt-dev \ libgnutls28-dev \ diff --git a/bts/osmo-trx-proxy.cfg b/bts/osmo-trx-proxy.cfg new file mode 100644 index 0000000..a48ad9c --- /dev/null +++ b/bts/osmo-trx-proxy.cfg @@ -0,0 +1,34 @@ +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print thread-id 0 + logging print extended-timestamp 1 + logging print level 1 + logging print file basename last + logging level set-all notice + logging level proxy info + logging level trxc info + logging level trxd notice + logging level lglobal notice +! +proxy + bind-addr 127.0.0.1 + clck-gen start-fn random + clck-gen ind-period 102 + pm-rssi-noise -110 + path-loss 110 + nominal-toa256 0 + nominal-ci 90 + ep bts + remote-addr 127.0.0.1 + base-port 5700 + num-chans 3 + tx-power 50 + ep ms + remote-addr 127.0.0.1 + base-port 6700 + num-chans 3 + tx-power 50 + no clock-socket diff --git a/bts/testenv_generic.cfg b/bts/testenv_generic.cfg index 5094177..62d679b 100644 --- a/bts/testenv_generic.cfg +++ b/bts/testenv_generic.cfg @@ -8,10 +8,15 @@ package=osmo-bsc copy=osmo-bsc.cfg
-[fake-trx] -program=run_fake_trx.sh -make=.make.osmocom-bb.clone -package=osmocom-bb-trx-toolkit +[trx-proxy] +program=osmo-trx-proxy +make=osmo-trx +package=osmo-trx-proxy +copy=osmo-trx-proxy.cfg +# Remove *_latest after osmo-trx >= 1.9.0 was released +program_latest=run_fake_trx.sh +make_latest=.make.osmocom-bb.clone +package_latest=osmocom-bb-trx-toolkit
[trxcon] program=trxcon diff --git a/bts/testenv_hopping.cfg b/bts/testenv_hopping.cfg index 99943f1..e90f638 100644 --- a/bts/testenv_hopping.cfg +++ b/bts/testenv_hopping.cfg @@ -11,10 +11,15 @@ package=osmo-bsc libosmocore-utils copy=osmo-bsc.cfg osmo-bsc-fh.confmerge
-[fake-trx] -program=run_fake_trx.sh -make=.make.osmocom-bb.clone -package=osmocom-bb-trx-toolkit +[trx-proxy] +program=osmo-trx-proxy +make=osmo-trx +package=osmo-trx-proxy +copy=osmo-trx-proxy.cfg +# Remove *_latest after osmo-trx >= 1.9.0 was released +program_latest=run_fake_trx.sh +make_latest=.make.osmocom-bb.clone +package_latest=osmocom-bb-trx-toolkit
[trxcon] program=trxcon diff --git a/bts/testenv_oml.cfg b/bts/testenv_oml.cfg index 7b7651e..c1cce63 100644 --- a/bts/testenv_oml.cfg +++ b/bts/testenv_oml.cfg @@ -2,10 +2,15 @@ program=BTS_Tests config=BTS_Tests_OML.cfg
-[fake-trx] -program=run_fake_trx.sh -make=.make.osmocom-bb.clone -package=osmocom-bb-trx-toolkit +[trx-proxy] +program=osmo-trx-proxy +make=osmo-trx +package=osmo-trx-proxy +copy=osmo-trx-proxy.cfg +# Remove *_latest after osmo-trx >= 1.9.0 was released +program_latest=run_fake_trx.sh +make_latest=.make.osmocom-bb.clone +package_latest=osmocom-bb-trx-toolkit
[trxcon] program=trxcon