aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2020-10-20 18:02:49 +0200
committerHarald Welte <laforge@osmocom.org>2020-10-20 18:04:57 +0200
commit5ebf798131b787d5319f1248e14061c44ccf06db (patch)
tree44391162372e5dfcf9f0086f12b35f46620dd802
parent629fb2ab68527eb08eade11f3e0ee54471f6fe3f (diff)
bts: Run everything over 127.0.0.1
When the test is executed outside of docker, having to manage all those different IP addresses while manually starting programs can be quite cumbersome. Let's just run everything over localhost, like we always do with other tests. Now the only cumbersome command to start is trxcon, as it defaults to only one TRX and adding additional TRX is rather complicated: ./fake_trx.py --trx TRX1@127.0.0.1:5700/1 --trx TRX2@127.0.0.1:5700/2 --trx TRX3@127.0.0.1:5700/3 Change-Id: Iea8519685da7d73696ce9cc2541e93c45c099828
-rw-r--r--bts/BTS_Tests.cfg10
-rw-r--r--bts/osmo-bsc.cfg6
-rw-r--r--bts/osmo-bts.cfg10
3 files changed, 13 insertions, 13 deletions
diff --git a/bts/BTS_Tests.cfg b/bts/BTS_Tests.cfg
index ed041639..46733594 100644
--- a/bts/BTS_Tests.cfg
+++ b/bts/BTS_Tests.cfg
@@ -12,17 +12,17 @@
#*.BTSVTY.CTRL_HOSTNAME := "10.9.1.191" # sysmoBTS Max
#*.BTSVTY.CTRL_HOSTNAME := "10.9.1.162" # sysmoBTS Pau
#*.BTSVTY.CTRL_HOSTNAME := "192.168.100.130" # sysmoBTS home
-*.BTSVTY.CTRL_HOSTNAME := "127.0.0.20" # osmo-bts-trx
-*.BSCVTY.CTRL_HOSTNAME := "127.0.0.11" # osmo-bsc
+#*.BTSVTY.CTRL_HOSTNAME := "127.0.0.20" # osmo-bts-trx
+#*.BSCVTY.CTRL_HOSTNAME := "127.0.0.11" # osmo-bsc
[MODULE_PARAMETERS]
L1CTL_PortType.m_l1ctl_sock_path := "/tmp/osmocom_l2"
#BTS_Tests.mp_rsl_ip := "10.9.1.2" # office
#BTS_Tests.mp_rsl_ip := "192.168.100.2" # home
-BTS_Tests.mp_rsl_ip := "127.0.0.10"
+#BTS_Tests.mp_rsl_ip := "127.0.0.10"
BTS_Tests.mp_pcu_socket := "/tmp/pcu_sock"
-BTS_Tests.mp_bts_trxc_ip := "127.0.0.21"
-BTS_Tests.mp_ctrl_ip := "127.0.0.20"
+#BTS_Tests.mp_bts_trxc_ip := "127.0.0.21"
+#BTS_Tests.mp_ctrl_ip := "127.0.0.20"
#BTS_Tests_OML.mp_oml_ip := "192.168.102.239" # home
#BTS_Tests_OML.mp_oml_port := 3002
diff --git a/bts/osmo-bsc.cfg b/bts/osmo-bsc.cfg
index dcdacd0e..1b8c8e63 100644
--- a/bts/osmo-bsc.cfg
+++ b/bts/osmo-bsc.cfg
@@ -3,7 +3,7 @@
!!
password foo
!
-log gsmtap 127.0.0.10
+log gsmtap 127.0.0.1
logging level set-all debug
logging filter all 1
!
@@ -27,7 +27,7 @@ stats interval 5
!
line vty
no login
- bind 127.0.0.11
+ bind 127.0.0.1
!
e1_input
e1_line 0 driver ipa
@@ -75,7 +75,7 @@ network
early-classmark-sending forbidden
early-classmark-sending-3g allowed
ip.access unit_id 1234 0
- ip.access rsl-ip 127.0.0.10
+ ip.access rsl-ip 127.0.0.2
oml ip.access stream_id 255 line 0
neighbor-list mode manual-si5
neighbor-list add arfcn 100
diff --git a/bts/osmo-bts.cfg b/bts/osmo-bts.cfg
index 0e4cdf2d..b7282da9 100644
--- a/bts/osmo-bts.cfg
+++ b/bts/osmo-bts.cfg
@@ -2,7 +2,7 @@
! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty
!!
!
-log gsmtap 127.0.0.10
+log gsmtap 127.0.0.1
logging level set-all debug
logging filter all 1
!
@@ -25,15 +25,15 @@ log stderr
!
line vty
no login
- bind 127.0.0.20
+ bind 127.0.0.1
!
e1_input
e1_line 0 driver ipa
e1_line 0 port 0
no e1_line 0 keepalive
phy 0
- osmotrx ip local 127.0.0.20
- osmotrx ip remote 127.0.0.21
+ osmotrx ip local 127.0.0.1
+ osmotrx ip remote 127.0.0.1
osmotrx fn-advance 20
osmotrx rts-advance 5
instance 0
@@ -85,4 +85,4 @@ bts 0
power-ramp step-interval 1
phy 0 instance 3
ctrl
- bind 127.0.0.20
+ bind 127.0.0.1