From 74083c2f84e28a8fb4048583dad1dd54864e244f Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Wed, 29 Jul 2020 00:43:01 +0200
Subject: [PATCH] bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH

The bsc/BSC_Tests_CBSP.ttcn rely on a configuration where the first three BTS
carry out SMSCB messaging, and the fourth BTS does not. That requires a CBCH
channel config on bts 0, 1, 2.

Side effects:

- adjust the number of available SDCCH (for TC_chan_exhaustion).

- there now is a CBCH channel description in SI4, add this to
  SystemInformationConfig_default.

Related: Idbcc703ace7012fb395f0eef3e445df28b368d74 (docker-playground)
Change-Id: Iac46ee2cc5bc0978d5f5baa550baf493a7c56b1b
---
 bsc/BSC_Tests.ttcn | 21 +++++++++++++++++++--
 bsc/osmo-bsc.cfg   |  6 +++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 1c02cb642..22c94d4d1 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -70,7 +70,7 @@ const float T3101_MAX := 12.0;
 /* make sure to sync this with the osmo-bts.cfg you're using */
 const integer NUM_TCHH_PER_BTS := 2;
 const integer NUM_TCHF_PER_BTS := 4;
-const integer NUM_SDCCH_PER_BTS := 4;
+const integer NUM_SDCCH_PER_BTS := 3;
 
 
 /* per-BTS state which we keep */
@@ -267,7 +267,24 @@ template SystemInformationConfig SystemInformationConfig_default := {
 		re_not_allowed := true,
 		acc := '0000010000000000'B
 	    },
-	    cbch_chan_desc := omit,
+	    cbch_chan_desc := {
+		iei := '64'O,
+		v := {
+		    chan_nr := {
+			u := {
+			sdcch4 := {
+			    tag := '001'B,
+			    sub_chan := 2
+			}
+			},
+			tn := 0
+		    },
+		    tsc := 2,
+		    h := false,
+		    arfcn := 871,
+		    maio_hsn := omit
+		}
+	    },
 	    cbch_mobile_alloc := omit,
 	    rest_octets := {
 		sel_params := {
diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg
index a4c767a6b..cbadece53 100644
--- a/bsc/osmo-bsc.cfg
+++ b/bsc/osmo-bsc.cfg
@@ -140,7 +140,7 @@ network
    max_power_red 20
    rsl e1 tei 0
    timeslot 0
-    phys_chan_config CCCH+SDCCH4
+    phys_chan_config CCCH+SDCCH4+CBCH
     hopping enabled 0
    timeslot 1
     phys_chan_config TCH/F
@@ -230,7 +230,7 @@ network
    max_power_red 20
    rsl e1 tei 0
    timeslot 0
-    phys_chan_config CCCH+SDCCH4
+    phys_chan_config CCCH+SDCCH4+CBCH
     hopping enabled 0
    timeslot 1
     phys_chan_config TCH/F
@@ -320,7 +320,7 @@ network
    max_power_red 20
    rsl e1 tei 0
    timeslot 0
-    phys_chan_config CCCH+SDCCH4
+    phys_chan_config CCCH+SDCCH4+CBCH
     hopping enabled 0
    timeslot 1
     phys_chan_config TCH/F