summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2020-06-21 19:42:31 +0200
committerHarald Welte <laforge@osmocom.org>2020-06-21 20:28:16 +0200
commitcb0cc4377c097902ed7cdcb539fd838eff1186d4 (patch)
tree1d61a6faee1ef9f7e91ea16b5dc20465cf3316a4
parent7262968a29eacb91f30430a4ebea87e78018b87d (diff)
bsc: Sync osmo-{bsc,stp}.cfg with docker-playground.git
It appears some changes were made only to the files in docker-playground.git, but not here. This means that running tests locally produced unexpected results. We must always ensure that the tests run both without and with docker, which means making sure the configs are all maintained! Change-Id: I3a3f4c572b8a390882fb8f12807018ca19e4827c
-rw-r--r--bsc/BSC_Tests.ttcn2
-rw-r--r--bsc/osmo-bsc.cfg58
-rw-r--r--bsc/osmo-stp.cfg30
3 files changed, 66 insertions, 24 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 7398612..84f8eaf 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -131,7 +131,7 @@ modulepar {
peer_pc := 187, /* 0.23.3 osmo-bsc */
peer_ssn := 254,
sio := '83'O,
- rctx := 0
+ rctx := 1
},
{
transport := BSSAP_TRANSPORT_AoIP,
diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg
index 6e80e83..a4c767a 100644
--- a/bsc/osmo-bsc.cfg
+++ b/bsc/osmo-bsc.cfg
@@ -6,10 +6,11 @@ password foo
log stderr
logging filter all 1
logging color 1
- logging print category 0
- logging timestamp 0
+ logging print category 1
+ logging timestamp 1
+ logging print extended-timestamp 1
+ logging level all everything
logging level rll notice
- logging level cc notice
logging level mm notice
logging level rr notice
logging level rsl notice
@@ -17,10 +18,8 @@ log stderr
logging level pag notice
logging level meas notice
logging level msc notice
- logging level mgcp notice
logging level ho notice
logging level ref notice
- logging level nat notice
logging level ctrl notice
logging level filter debug
logging level pcu debug
@@ -46,11 +45,19 @@ stats interval 5
!
line vty
no login
+ bind 127.0.0.1
!
e1_input
e1_line 0 driver ipa
e1_line 0 port 0
no e1_line 0 keepalive
+cs7 instance 0
+ asp asp-clnt-msc-0 2905 1905 m3ua
+ remote-ip 127.0.0.1
+ sccp-address msc2
+ point-code 0.0.2
+ sccp-address msc3
+ point-code 0.0.3
network
network country code 1
mobile network code 1
@@ -64,9 +71,8 @@ network
handover power budget interval 6
handover power budget hysteresis 3
handover maximum distance 9999
- dyn_ts_allow_tch_f 1
- periodic location update 30
timer t3113 10
+ timer t3212 30
bts 0
type sysmobts
band DCS1800
@@ -95,7 +101,6 @@ network
si5 neighbor-list add arfcn 20
codec-support fr hr efr amr
gprs mode gprs
- gprs 11bit_rach_support_for_egprs 0
gprs routing area 0
gprs network-control-order nc0
gprs cell bvci 1234
@@ -127,6 +132,7 @@ network
gprs nsvc 1 remote udp port 0
gprs nsvc 1 remote ip 0.0.0.0
no force-combined-si
+ si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3
trx 0
rf_locked 0
arfcn 871
@@ -134,7 +140,7 @@ network
max_power_red 20
rsl e1 tei 0
timeslot 0
- phys_chan_config CCCH+SDCCH4+CBCH
+ phys_chan_config CCCH+SDCCH4
hopping enabled 0
timeslot 1
phys_chan_config TCH/F
@@ -185,7 +191,6 @@ network
si5 neighbor-list add arfcn 20
codec-support fr hr efr amr
gprs mode gprs
- gprs 11bit_rach_support_for_egprs 0
gprs routing area 0
gprs network-control-order nc0
gprs cell bvci 1235
@@ -217,6 +222,7 @@ network
gprs nsvc 1 remote udp port 0
gprs nsvc 1 remote ip 0.0.0.0
no force-combined-si
+ si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3
trx 0
rf_locked 0
arfcn 871
@@ -224,7 +230,7 @@ network
max_power_red 20
rsl e1 tei 0
timeslot 0
- phys_chan_config CCCH+SDCCH4+CBCH
+ phys_chan_config CCCH+SDCCH4
hopping enabled 0
timeslot 1
phys_chan_config TCH/F
@@ -275,7 +281,6 @@ network
si5 neighbor-list add arfcn 20
codec-support fr hr efr amr
gprs mode gprs
- gprs 11bit_rach_support_for_egprs 0
gprs routing area 0
gprs network-control-order nc0
gprs cell bvci 1236
@@ -307,6 +312,7 @@ network
gprs nsvc 1 remote udp port 0
gprs nsvc 1 remote ip 0.0.0.0
no force-combined-si
+ si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3
trx 0
rf_locked 0
arfcn 871
@@ -314,7 +320,7 @@ network
max_power_red 20
rsl e1 tei 0
timeslot 0
- phys_chan_config CCCH+SDCCH4+CBCH
+ phys_chan_config CCCH+SDCCH4
hopping enabled 0
timeslot 1
phys_chan_config TCH/F
@@ -341,7 +347,7 @@ network
type sysmobts
band DCS1800
cell_identity 3
- location_area_code 2
+ location_area_code 3
# re-use bts 2's ARFCN 871 and BSIC 12 (to test handover config)
base_station_id_code 12
trx 0
@@ -381,10 +387,34 @@ msc 0
amr-config 5_15k forbidden
amr-config 4_75k forbidden
codec-list fr1 fr2 fr3 hr1 hr3
+ mgw remote-ip 127.0.0.1
lcls-mode mgw-loop
+msc 1
+ msc-addr msc2
+ mgw remote-ip 127.0.0.1
+msc 2
+ msc-addr msc3
+ mgw remote-ip 127.0.0.1
+
+network
+ nri bitlen 10
+ # a NULL NRI that is outside the NRI ranges used by the MSCs:
+ nri null add 0
+ # a NULL NRI that is also used by an MSC:
+ nri null add 1
+msc 0
+ nri add 1 255
+msc 1
+ nri add 256 511
+msc 2
+ nri add 512 767
+ # range 768-1024 is not assigned to any MSC on purpose
+
bsc
mid-call-timeout 0
no missing-msc-text
+ctrl
+ bind 127.0.0.1
cbc
remote-ip 127.0.0.1
remote-port 48049
diff --git a/bsc/osmo-stp.cfg b/bsc/osmo-stp.cfg
index f40a02f..8b8ccdb 100644
--- a/bsc/osmo-stp.cfg
+++ b/bsc/osmo-stp.cfg
@@ -6,7 +6,8 @@ log stderr
logging filter all 1
logging color 1
logging print category 1
- logging timestamp 0
+ logging timestamp 1
+ logging print extended-timestamp 1
logging level all everything
logging level lglobal notice
logging level llapd notice
@@ -31,23 +32,34 @@ line vty
!
cs7 instance 0
xua rkm routing-key-allocation dynamic-permitted
-! asp virt-bsc0-0 22905 2905 m3ua
-! local-ip 127.0.0.1
-! remote-ip 127.0.0.1
asp virt-msc0-0 23905 2905 m3ua
local-ip 127.0.0.1
remote-ip 127.0.0.1
as mahlzeit ipa
- routing-key 1 0.23.4
+ routing-key 0 0.23.4
point-code override dpc 0.23.1
-! as virt-bsc0 m3ua
-! asp virt-bsc0-0
-! routing-key 0 0.24.1
as virt-msc0 m3ua
asp virt-msc0-0
- routing-key 0 0.23.1
+ routing-key 1 0.23.1
+
+ asp virt-msc1-0 23906 2905 m3ua
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ as virt-msc1 m3ua
+ asp virt-msc1-0
+ routing-key 2 0.0.2
+
+ asp virt-msc2-0 23907 2905 m3ua
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ as virt-msc2 m3ua
+ asp virt-msc2-0
+ routing-key 3 0.0.3
+
route-table system
update route 0.23.1 7.255.7 linkset virt-msc0
+ update route 0.0.2 7.255.7 linkset virt-msc1
+ update route 0.0.3 7.255.7 linkset virt-msc2
listen m3ua 2905
accept-asp-connections dynamic-permitted
listen ipa 5000