net/templates: support running a second bsc

New config variables: BSC_COUNT, BSC1_*

Change-Id: If0fa5c5b4c76ae037d109211bbb27132689b4f80

net/config_2g3g

@@ -84,10 +84,21 @@ MGW4BSC0_IP="${TO_RAN_IP}"
 MGW4BSC0_PORT="2427"
 MGW4BSC0_VTY_IP="127.0.0.7"
 
+MGW4BSC1_IP="127.0.0.11"
+MGW4BSC1_PORT="2427"
+MGW4BSC1_VTY_IP="127.0.0.11"
+
+BSC_COUNT=1
+
 BSC0_IP="${TO_RAN_IP}"
 BSC0_PC="0.23.3"
 BSC0_CODEC_LIST="hr3"
 
+# Enabled only when BSC_COUNT=2
+BSC1_IP="127.0.0.10"
+BSC1_PC="0.23.4"
+BSC1_CODEC_LIST="hr3"
+
 HNBGW_PC="0.3.0"
 HNBGW_IP="${TO_RAN_IP}"
 

net/templates/osmo-bsc-1.cfg

@@ -0,0 +1,22 @@
+${include(common_template_warning)}
+${include(common_osmo_bsc)}
+
+e1_input
+ ipa bind ${BSC1_IP}
+
+cs7 instance 0
+ point-code ${BSC1_PC}
+ asp asp-clnt-bsc-1 2905 0 m3ua
+  remote-ip ${STP_RAN_IP}
+
+msc 0
+ mgw remote-ip ${MGW4BSC1_IP}
+ mgw remote-port ${MGW4BSC1_PORT}
+ mgw endpoint-domain bsc1
+ codec-list ${BSC1_CODEC_LIST}
+
+ctrl
+ bind ${BSC1_IP}
+
+line vty
+ bind ${BSC1_IP}

net/templates/osmo-mgw-for-bsc-1.cfg

@@ -0,0 +1,16 @@
+${include(common_template_warning)}
+mgcp
+ domain bsc1
+ bind ip ${MGW4BSC1_IP}
+ bind port ${MGW4BSC1_PORT}
+ rtp net-range 50004 60000
+ number endpoints 1024
+line vty
+ bind ${MGW4BSC1_VTY_IP}
+
+${foreach(LOG_OUTPUT)}
+log ${LOG_OUTPUTn_TYPE}
+${include(common_logging)}
+ logging level rtp info
+ logging level lmgcp info
+${foreach_end}

net/templates/run.sh

@@ -173,13 +173,13 @@ gbproxy="osmo-gbproxy"
 sgsn="osmo-sgsn"
 ggsn="osmo-ggsn"
 mgw4msc="osmo-mgw -c osmo-mgw-for-msc.cfg"
-#mgw4bsc="gdb -ex run --args osmo-mgw -c osmo-mgw-for-bsc-0.cfg"
-#mgw4bsc="strace osmo-mgw -c osmo-mgw-for-bsc-0.cfg"
-mgw4bsc="osmo-mgw -c osmo-mgw-for-bsc-0.cfg"
+#mgw4bsc="gdb -ex run --args osmo-mgw"
+#mgw4bsc="strace osmo-mgw"
+mgw4bsc="osmo-mgw"
 hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade"
 stp4cn="osmo-stp -c osmo-stp-cn.cfg"
 stp4ran="osmo-stp -c osmo-stp-ran.cfg"
-bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc-0.cfg"
+bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc"
 bscnat="osmo-bsc-nat"
 
 if [ "x${MSC_MNCC}" != "xinternal" ]; then
@@ -250,9 +250,6 @@ term "$gbproxy" GBPROXY
 sleep .2
 term "$mgw4msc" MGW4MSC
 
-sleep .2
-term "$mgw4bsc" MGW4BSC
-
 sleep .2
 term "$msc" MSC
 
@@ -260,7 +257,20 @@ sleep 2
 term "$hnbgw" HNBGW
 
 sleep .2
-term "$bsc" BSC
+
+if [ "$BSC_COUNT" = 1 ]; then
+  term "$mgw4bsc -c osmo-mgw-for-bsc-0.cfg" MGW4BSC
+  sleep .2
+  term "$bsc -c osmo-bsc-0.cfg" BSC
+else
+  term "$mgw4bsc -c osmo-mgw-for-bsc-0.cfg" MGW4BSC0
+  sleep .2
+  term "$mgw4bsc -c osmo-mgw-for-bsc-1.cfg" MGW4BSC1
+  sleep .2
+  term "$bsc -c osmo-bsc-0.cfg" BSC0
+  sleep .2
+  term "$bsc -c osmo-bsc-1.cfg" BSC1
+fi
 
 if [ "x${MSC_MNCC}" != "xinternal" ]; then
   sleep .2