net/templates: move bsc cfg/vars to bsc0

Prepare support for a second BSC, in order to test OsmoBSCNAT.

* Rename BSC_* variables to BSC0_*
* Rename MGW4BSC_* variables to MGW4BSC0_*
* Rename osmo-bsc.cfg to osmo-bsc-0.cfg
* Rename osmo-mgw-for-bsc.cfg to osmo-mgw-for-bsc-0.cfg

Change-Id: Iaba2e3143b7bb6451a0104042e69d47ee5f48d3c

net/config_2g3g

@@ -80,13 +80,13 @@ MGW4MSC_IP="${TO_RAN_IU_IP}"
 MGW4MSC_PORT="2427"
 MGW4MSC_VTY_IP="127.0.0.6"
 
-MGW4BSC_IP="${TO_RAN_IP}"
-MGW4BSC_PORT="2427"
-MGW4BSC_VTY_IP="127.0.0.7"
+MGW4BSC0_IP="${TO_RAN_IP}"
+MGW4BSC0_PORT="2427"
+MGW4BSC0_VTY_IP="127.0.0.7"
 
-BSC_IP="${TO_RAN_IP}"
-BSC_PC="0.23.3"
-BSC_CODEC_LIST="hr3"
+BSC0_IP="${TO_RAN_IP}"
+BSC0_PC="0.23.3"
+BSC0_CODEC_LIST="hr3"
 
 HNBGW_PC="0.3.0"
 HNBGW_IP="${TO_RAN_IP}"
@@ -120,7 +120,7 @@ STP_RAN_IP="127.0.0.1"
 # STP_RAN_IP="127.0.0.2"
 
 # Enabled only when STP_CN_IP != STP_RAN_IP
-BSCNAT_CN_PC="${BSC_PC}"
+BSCNAT_CN_PC="${BSC0_PC}"
 BSCNAT_CN_IP="127.0.0.3"
 BSCNAT_RAN_PC="${MSC_PC}"
 BSCNAT_RAN_IP="127.0.0.4"

net/templates/osmo-bsc-0.cfg

@@ -0,0 +1,16 @@
+${include(common_template_warning)}
+${include(common_osmo_bsc)}
+
+e1_input
+ ipa bind ${BSC0_IP}
+
+cs7 instance 0
+ point-code ${BSC0_PC}
+ asp asp-clnt-bsc-0 2905 0 m3ua
+  remote-ip ${STP_RAN_IP}
+
+msc 0
+ mgw remote-ip ${MGW4BSC0_IP}
+ mgw remote-port ${MGW4BSC0_PORT}
+ mgw endpoint-domain bsc0
+ codec-list ${BSC0_CODEC_LIST}

net/templates/osmo-bsc-nat.cfg

@@ -16,7 +16,7 @@ cs7 instance 1
   local-ip ${BSCNAT_RAN_IP}
  sccp-address bsc
   routing-indicator PC
-  point-code ${BSC_PC}
+  point-code ${BSC0_PC}
   subsystem-number 254
 
 bsc-nat

net/templates/osmo-bsc.cfg

@@ -1,16 +0,0 @@
-${include(common_template_warning)}
-${include(common_osmo_bsc)}
-
-e1_input
- ipa bind ${BSC_IP}
-
-cs7 instance 0
- point-code ${BSC_PC}
- asp asp-clnt-bsc-0 2905 0 m3ua
-  remote-ip ${STP_RAN_IP}
-
-msc 0
- mgw remote-ip ${MGW4BSC_IP}
- mgw remote-port ${MGW4BSC_PORT}
- mgw endpoint-domain bsc
- codec-list ${BSC_CODEC_LIST}

net/templates/osmo-bts.cfg

@@ -27,7 +27,7 @@ phy 0
 bts 0
  band ${BTS_BAND}
  ipa unit-id ${BTS0_IPA_UNIT}
- oml remote-ip ${BSC_IP}
+ oml remote-ip ${BSC0_IP}
  gsmtap-sapi ccch
  gsmtap-sapi pdtch
  trx 0

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

@@ -1,12 +1,12 @@
 ${include(common_template_warning)}
 mgcp
- domain bsc
- bind ip ${MGW4BSC_IP}
- bind port ${MGW4BSC_PORT}
+ domain bsc0
+ bind ip ${MGW4BSC0_IP}
+ bind port ${MGW4BSC0_PORT}
  rtp net-range 50004 60000
  number endpoints 1024
 line vty
- bind ${MGW4BSC_VTY_IP}
+ bind ${MGW4BSC0_VTY_IP}
 
 ${foreach(LOG_OUTPUT)}
 log ${LOG_OUTPUTn_TYPE}

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.cfg"
-#mgw4bsc="strace osmo-mgw -c osmo-mgw-for-bsc.cfg"
-mgw4bsc="osmo-mgw -c osmo-mgw-for-bsc.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"
 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.cfg"
+bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc-0.cfg"
 bscnat="osmo-bsc-nat"
 
 if [ "x${MSC_MNCC}" != "xinternal" ]; then