osmith submitted this change.

View Change

bts: testenv: fake_trx.py -> osmo-trx-proxy

Use the new osmo-trx-proxy instead of fake_trx.py.

Change-Id: I8eadd99f3263fde08b31dc228dddfc87a38dba52
Depends: osmo-trx.git I995b44bf9a884cf5ba6db8333e6f08c9604a58a5
Related: OS#6638, OS#6672
---
M _testenv/data/osmo-dev/testenv.opts
A bts/osmo-trx-proxy.cfg
M bts/testenv_generic.cfg
M bts/testenv_hopping.cfg
M bts/testenv_oml.cfg
5 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/_testenv/data/osmo-dev/testenv.opts b/_testenv/data/osmo-dev/testenv.opts
index 4ee524b..371c722 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 --disable-multi-arfcn --with-proxy
diff --git a/bts/osmo-trx-proxy.cfg b/bts/osmo-trx-proxy.cfg
new file mode 100644
index 0000000..6fa8f06
--- /dev/null
+++ b/bts/osmo-trx-proxy.cfg
@@ -0,0 +1,37 @@
+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
+!
+cpu-sched
+ policy rr 32
+!
+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 4
+  tx-power 50
+ ep ms
+  remote-addr 127.0.0.1
+  base-port 6700
+  num-chans 1
+  tx-power 50
+  no clock-socket
diff --git a/bts/testenv_generic.cfg b/bts/testenv_generic.cfg
index 5094177..87831cd 100644
--- a/bts/testenv_generic.cfg
+++ b/bts/testenv_generic.cfg
@@ -8,10 +8,16 @@
 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]
+prepare=require_ulimit_r.sh 32
+program=osmo-trx-proxy
+make=osmo-trx
+package=osmo-trx-proxy
+copy=osmo-trx-proxy.cfg
+# TODO: 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..b9fadc3 100644
--- a/bts/testenv_hopping.cfg
+++ b/bts/testenv_hopping.cfg
@@ -11,10 +11,16 @@
 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]
+prepare=require_ulimit_r.sh 32
+program=osmo-trx-proxy
+make=osmo-trx
+package=osmo-trx-proxy
+copy=osmo-trx-proxy.cfg
+# TODO: 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..a7f561d 100644
--- a/bts/testenv_oml.cfg
+++ b/bts/testenv_oml.cfg
@@ -2,10 +2,16 @@
 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]
+prepare=require_ulimit_r.sh 32
+program=osmo-trx-proxy
+make=osmo-trx
+package=osmo-trx-proxy
+copy=osmo-trx-proxy.cfg
+# TODO: 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

To view, visit change 43668. To unsubscribe, or for help writing mail filters, visit settings.