Change in osmo-ttcn3-hacks[master]: bsc: Ensure osmo-bsc.fg + BSC_Tests_CBSP.ttcn defaults match

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17682 )

Change subject: bsc: Ensure osmo-bsc.fg + BSC_Tests_CBSP.ttcn defaults match
......................................................................

bsc: Ensure osmo-bsc.fg + BSC_Tests_CBSP.ttcn defaults match

We want to make sure that the tests + config match

Change-Id: I9d6ed0aed34bb983c8db225c7762ceffa642decd
---
M bsc/BSC_Tests_CBSP.ttcn
M bsc/osmo-bsc.cfg
2 files changed, 16 insertions(+), 12 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index bf1d99e..ff054fe 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -42,14 +42,14 @@
 	integer mp_cbc_port := 48049;
 	integer mp_bsc_cbsp_port := 48050;
 
-	/* BTS 0: 262-42-1-0 with CBCH
-	 * BTS 1: 262-42-1-1 with CBCH
-	 * BTS 2: 262-42-2-1 with CBCH
-	 * BTS 3: 262-42-2-3 without CBCH */
-	GsmCgiAbstract mp_cgi_bts0 := { '262'H, '42'H, 1, 0 };
-	GsmCgiAbstract mp_cgi_bts1 := { '262'H, '42'H, 1, 1 };
-	GsmCgiAbstract mp_cgi_bts2 := { '262'H, '42'H, 2, 1 };
-	GsmCgiAbstract mp_cgi_bts3 := { '262'H, '42'H, 2, 3 };
+	/* BTS 0: 001-01-1-0 with CBCH
+	 * BTS 1: 001-01-1-1 with CBCH
+	 * BTS 2: 001-01-2-1 with CBCH
+	 * BTS 3: 001-01-2-3 without CBCH */
+	GsmCgiAbstract mp_cgi_bts0 := { '001'H, '01'H, 1, 0 };
+	GsmCgiAbstract mp_cgi_bts1 := { '001'H, '01'H, 1, 1 };
+	GsmCgiAbstract mp_cgi_bts2 := { '001'H, '01'H, 2, 1 };
+	GsmCgiAbstract mp_cgi_bts3 := { '001'H, '01'H, 2, 3 };
 }
 
 private type record GsmCgiAbstract {
diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg
index 74fe255..f490433 100644
--- a/bsc/osmo-bsc.cfg
+++ b/bsc/osmo-bsc.cfg
@@ -134,7 +134,7 @@
    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
@@ -224,7 +224,7 @@
    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
@@ -314,7 +314,7 @@
    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
@@ -341,7 +341,7 @@
   type sysmobts
   band DCS1800
   cell_identity 3
-  location_area_code 3
+  location_area_code 2
   # re-use bts 2's ARFCN 871 and BSIC 12 (to test handover config)
   base_station_id_code 12
   trx 0
@@ -387,3 +387,7 @@
  mid-call-timeout 0
  no missing-msc-text
  access-list-name bsc-list
+cbc
+ remote-ip 127.0.0.1
+ remote-port 48049
+ listen-port 48050

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17682
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I9d6ed0aed34bb983c8db225c7762ceffa642decd
Gerrit-Change-Number: 17682
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200401/167b6bc2/attachment.htm>