Update Osmo Config Files

modules/rhizo_base/templates/osmo-bsc-bts.erb

@@ -30,18 +30,18 @@
 <% if bts["lte_n"] -%>  si2quater neighbor-list add earfcn <%= bts["lte_n"] %> thresh-hi 4 thresh-lo 32 prio 7 qrxlv 32 meas 6
 <% end -%>
   codec-support fr amr
-  amr tch-f modes 3 4 5
+  amr tch-f modes 4
   amr tch-f threshold ms 32
   amr tch-f hysteresis ms 8
   amr tch-f threshold bts 32
   amr tch-f hysteresis bts 8
-  amr tch-f start-mode 3
-  amr tch-h modes 2 3 4 5
+  amr tch-f start-mode auto
+  amr tch-h modes 4
   amr tch-h threshold ms 32
   amr tch-h hysteresis ms 8
   amr tch-h threshold bts 32
   amr tch-h hysteresis bts 8
-  amr tch-h start-mode 3
+  amr tch-h start-mode auto
   gprs mode <%= bts["gprs_m"] %>
   gprs routing area 21
   gprs network-control-order nc0
@@ -67,7 +67,7 @@
   gprs ns timer tns-alive 3
   gprs ns timer tns-alive-retries 10
   gprs nsvc 0 nsvci 10<%= index+2 %>
-  gprs nsvc 0 local udp port 23<%= bts["lac"] %>
+  gprs nsvc 0 local udp port 23<%= index+Integer(bts["lac"]) %>
   gprs nsvc 0 remote udp port 23000
   gprs nsvc 0 remote ip <%= @sgsn_ip_address %>
   gprs nsvc 1 nsvci 0

modules/rhizo_base/templates/osmo-bsc-head.erb

@@ -74,14 +74,16 @@ network
  paging any use tch 0
  handover 1
  handover algorithm 2
- handover2 window rxlev averaging 5
- handover2 window rxlev neighbor averaging 5
- handover2 power budget interval 99
+ handover2 window rxlev averaging 7
+ handover2 window rxlev neighbor averaging 7
+ handover2 power budget interval 6
  handover2 power budget hysteresis 10
- handover2 min rxlev -109
- handover2 min rxqual 7
+ handover2 maximum distance 10
+ handover2 min rxlev -95
+ handover2 min rxqual 5
  handover2 penalty-time failed-ho 5
  handover2 penalty-time failed-assignment 5
+ handover2 min-free-slots tch/h 2
  handover2 congestion-check 30
 <% if @mncc_codec == 'AMR' -%>
  dyn_ts_allow_tch_f 0

modules/rhizo_base/templates/osmo-bsc-tail.erb

@@ -4,20 +4,20 @@ msc 0
 <% elsif (@mncc_codec == 'GSM:AMR' or @mncc_codec == 'AMR:GSM') -%>
  codec-list fr1 fr3 hr3
 <% else -%>
- codec-list fr3 hr3
+ codec-list hr3
 <% end -%>
  allow-emergency allow
- amr-config 12_2k forbidden
+ amr-config 12_2k allowed
  amr-config 10_2k forbidden
  amr-config 7_95k allowed
  amr-config 7_40k allowed
  amr-config 6_70k allowed
- amr-config 5_90k allowed
- amr-config 5_15k forbidden
+ amr-config 5_90k forbidden
+ amr-config 5_15k allowed
  amr-config 4_75k forbidden
  amr-payload octet-aligned
  asp-protocol m3ua
- lcls-mode disabled
+ lcls-mode <% if @lcls == '1' -%>bts-loop<% else %>disabled<% end %>
  lcls-codec-mismatch forbidden
  mgw remote-ip 127.0.0.1
  mgw remote-port 2427

modules/rhizo_base/templates/osmo-msc.cfg.erb

@@ -82,6 +82,8 @@ msc
  mncc external /tmp/bsc_mncc
  mncc guard-timeout 180
  ncss guard-timeout 30
+<% if @lcls == '1' -%> lcls-permitted
+<% end -%>
  assign-tmsi
  cs7-instance-a 0
  auth-tuple-max-reuse-count 3
@@ -116,3 +118,12 @@ sgs
  local-port 29118
  local-ip 0.0.0.0
  vlr-name vlr.msc001.mnc<%= @mnc %>.mcc<%= @mcc %>.3gppnetwork.org
+smsc
+ database /var/lib/osmocom/sms.db
+ queue trigger-holdoff 5
+ queue max-pending 30
+ queue max-failure 3
+ database delete-delivered 1
+ database delete-expired 0
+ validity-period minimum 600
+ validity-period default 10080

modules/rhizo_base/templates/osmo-msc.override.erb

@@ -1,4 +1,5 @@
 [Service]
+WorkingDirectory=/var/lib/osmocom
 ExecStart=
 ExecStart=/usr/<% if @osmo_local_bin.include? 'osmo-msc' -%>local/<% end -%>bin/osmo-msc -c /etc/osmocom/osmo-msc.cfg
 ExecStartPost=/home/rhizomatica/bin/swap_lac.sh