net: make more items configurable from config file

net/config_2g3g

@@ -7,10 +7,33 @@ PUBLIC_IP2="192.168.0.42"
 MCC=001
 MNC=01
 
+BTS0_BAND=GSM-1800
+BTS0_LAC=23
+BTS0_CI=5
+BTS0_ARFCN=860
+BTS0_MAX_POWER_RED=21
+BTS0_IPA_UNIT="1234 0"
+BTS0_NSVCI=1234
+BTS0_NSEI="${BTS0_NSVCI}"
+BTS0_BVCI="${BTS0_NSVCI}"
+
+BTS1_BAND=GSM-1800
+BTS1_LAC=42
+BTS1_CI=13
+BTS1_ARFCN=862
+BTS1_MAX_POWER_RED=21
+BTS1_IPA_UNIT="1235 0"
+BTS1_NSVCI=1235
+BTS1_NSEI="${BTS1_NSVCI}"
+BTS1_BVCI="${BTS1_NSVCI}"
+
 HLR_IP="127.0.0.1"
 
 MSC_PC="0.23.1"
 
+AUTH=optional
+ENCR_A5=0
+
 SGSN_IP="${PUBLIC_IP}"
 SGSN_PC="0.23.2"
 SGSN_GB_PORT=23000

net/tmpl_std/osmo-bsc.cfg

@@ -3,25 +3,26 @@ network
  #meas-feed scenario foo23
  network country code ${MCC}
  mobile network code ${MNC}
- encryption a5 1
+ encryption a5 ${ENCR_A5}
  bts 0
   type sysmobts
-  band GSM-1800
-  location_area_code 23
+  band ${BTS0_BAND}
+  location_area_code ${BTS0_LAC}
+  cell_identity ${BTS0_CI}
   cell reselection hysteresis 14
-  ip.access unit_id 1801 0
+  ip.access unit_id ${BTS0_IPA_UNIT}
   gprs mode gprs
   gprs nsvc 0 remote ip ${GBPROXY_IP}
   gprs nsvc 0 remote udp port ${GBPROXY_GB_PORT}
   gprs nsvc 0 local udp port ${PCU_GB_PORT}
-  gprs nsvc 0 nsvci 1801
-  gprs nsei 1801
-  gprs cell bvci 1801
+  gprs nsvc 0 nsvci ${BTS0_NSVCI}
+  gprs nsei ${BTS0_NSEI}
+  gprs cell bvci ${BTS0_BVCI}
   trx 0
    rf_locked 0
-   arfcn 868
+   arfcn ${BTS0_ARFCN}
    nominal power 23
-   max_power_red 20
+   max_power_red ${BTS0_MAX_POWER_RED}
    timeslot 0
     phys_chan_config CCCH+SDCCH4
    timeslot 1
@@ -40,22 +41,23 @@ network
     phys_chan_config PDCH
  bts 1
   type sysmobts
-  band GSM-1800
-  location_area_code 42
+  band ${BTS1_BAND}
+  location_area_code ${BTS1_LAC}
+  cell_identity ${BTS1_CI}
   cell reselection hysteresis 14
-  ip.access unit_id 1802 0
+  ip.access unit_id ${BTS1_IPA_UNIT}
   gprs mode gprs
   gprs nsvc 0 remote ip ${GBPROXY_IP}
   gprs nsvc 0 remote udp port ${GBPROXY_GB_PORT}
   gprs nsvc 0 local udp port ${PCU_GB_PORT}
-  gprs nsvc 0 nsvci 1802
-  gprs nsei 1802
-  gprs cell bvci 1802
+  gprs nsvc 0 nsvci ${BTS1_NSVCI}
+  gprs nsei ${BTS1_NSEI}
+  gprs cell bvci ${BTS1_BVCI}
   trx 0
    rf_locked 0
-   arfcn 870
+   arfcn ${BTS1_ARFCN}
    nominal power 23
-   max_power_red 20
+   max_power_red ${BTS1_MAX_POWER_RED}
    timeslot 0
     phys_chan_config CCCH+SDCCH4
    timeslot 1

net/tmpl_std/osmo-msc.cfg

@@ -1,8 +1,8 @@
 network
  network country code ${MCC}
  mobile network code ${MNC}
- authentication required
- encryption a5 0
+ authentication ${AUTH}
+ encryption a5 ${ENCR_A5}
 msc
  mgw remote-ip ${MGW4MSC_IP}
  mgw endpoint-range 1 32