merge legacy nitb template

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

@@ -12,9 +12,9 @@ log stderr
   logging level all everything
   logging level rll notice
   logging level cc info
-  logging level mm debug
+  logging level mm info
   logging level rr notice
-  logging level rsl notice
+  logging level rsl error
   logging level nm notice
   logging level mncc notice
   logging level pag notice
@@ -34,10 +34,7 @@ log stderr
   logging level ctrl notice
   logging level smpp fatal
   logging level filter notice
-  logging level ranap debug
+  logging level lglobal error
-  logging level sua debug
-  logging level pcu debug
-  logging level lglobal notice
   logging level llapd notice
   logging level linp notice
   logging level lmux notice
@@ -111,12 +108,12 @@ network
   ip.access unit_id 1000 0
   oml ip.access stream_id 255 line 0
   neighbor-list mode automatic
-  codec-support fr amr
+  <% if @mncc_codec == 'AMR' -%>codec-support fr amr
-  amr tch-f modes 3
+  amr tch-h modes 4 5
-  amr tch-f start-mode auto
+  amr tch-h start-mode 4
-  amr tch-h modes 3
+<% else -%>codec-support fr
-  amr tch-h start-mode auto
+<% end -%>
-  gprs mode gprs
+<% if @gprs == 'active' -%>  gprs mode gprs
   gprs 11bit_rach_support_for_egprs 0
   gprs routing area 0
   gprs network-control-order nc0
@@ -144,11 +141,8 @@ network
   gprs nsvc 0 local udp port 23000
   gprs nsvc 0 remote udp port 23001
   gprs nsvc 0 remote ip 127.0.0.1
-  gprs nsvc 1 nsvci 0
+<% else -%>  gprs mode none
-  gprs nsvc 1 local udp port 0
+  <% end -%>no force-combined-si
-  gprs nsvc 1 remote udp port 0
-  gprs nsvc 1 remote ip 0.0.0.0
-  no force-combined-si
   trx 0
    rf_locked 0
    arfcn <%= @arfcn_A %>
@@ -156,29 +150,50 @@ network
    max_power_red <%= @max_power_red %>
    rsl e1 tei 0
    timeslot 0
-    phys_chan_config CCCH
+     phys_chan_config CCCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 1
-    phys_chan_config SDCCH8
+     phys_chan_config SDCCH8
-    hopping enabled 0
+     hopping enabled 0
+<% if @gprs == 'active' -%>
    timeslot 2
-    phys_chan_config TCH/F
+     phys_chan_config TCH/F_PDCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 3
-    phys_chan_config TCH/F
+     phys_chan_config TCH/F_PDCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 4
-    phys_chan_config TCH/F
+     phys_chan_config TCH/F_PDCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 5
-    phys_chan_config TCH/F
+     phys_chan_config TCH/F_PDCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 6
-    phys_chan_config TCH/F
+     phys_chan_config TCH/F_PDCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 7
-    phys_chan_config PDCH
+     phys_chan_config PDCH
-    hopping enabled 0
+     hopping enabled 0
+<% else -%>
+   timeslot 2
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 3
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 4
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 5
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 6
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 7
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+<% end -%>
 <% if @arfcn_B -%>
  bts 1
   type sysmobts
@@ -198,13 +213,44 @@ network
   channel-descrption bs-pa-mfrms 5
   channel-descrption bs-ag-blks-res 1
   rach emergency call allowed 1
-  early-classmark-sending forbidden
   ip.access unit_id 1000 1
   oml ip.access stream_id 255 line 0
   neighbor-list mode automatic
-  codec-support fr amr
+  <% if @mncc_codec == 'AMR' -%>codec-support fr amr
-  gprs mode none
+  amr tch-h modes 4 5
-  no force-combined-si
+  amr tch-h start-mode 4
+<% else -%>codec-support fr
+<% end -%>
+<% if @gprs == 'active' -%>  gprs mode gprs
+  gprs 11bit_rach_support_for_egprs 0
+  gprs routing area 0
+  gprs network-control-order nc0
+  gprs cell bvci 3
+  gprs cell timer blocking-timer 3
+  gprs cell timer blocking-retries 3
+  gprs cell timer unblocking-retries 3
+  gprs cell timer reset-timer 3
+  gprs cell timer reset-retries 3
+  gprs cell timer suspend-timer 10
+  gprs cell timer suspend-retries 3
+  gprs cell timer resume-timer 10
+  gprs cell timer resume-retries 3
+  gprs cell timer capability-update-timer 10
+  gprs cell timer capability-update-retries 3
+  gprs nsei 952
+  gprs ns timer tns-block 3
+  gprs ns timer tns-block-retries 3
+  gprs ns timer tns-reset 3
+  gprs ns timer tns-reset-retries 3
+  gprs ns timer tns-test 30
+  gprs ns timer tns-alive 3
+  gprs ns timer tns-alive-retries 10
+  gprs nsvc 0 nsvci 952
+  gprs nsvc 0 local udp port 23000
+  gprs nsvc 0 remote udp port 23001
+  gprs nsvc 0 remote ip 172.16.0.11
+<% else -%>  gprs mode none
+  <% end -%>no force-combined-si
   depends-on-bts 0
   trx 0
    rf_locked 0
@@ -213,29 +259,268 @@ network
    max_power_red <%= @max_power_red %>
    rsl e1 tei 0
    timeslot 0
-    phys_chan_config CCCH
+     phys_chan_config CCCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 1
-    phys_chan_config SDCCH8
+     phys_chan_config SDCCH8
-    hopping enabled 0
+     hopping enabled 0
+<% if @gprs == 'active' -%>
    timeslot 2
-    phys_chan_config TCH/F
+     phys_chan_config TCH/F_PDCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 3
-    phys_chan_config TCH/F
+     phys_chan_config TCH/F_PDCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 4
-    phys_chan_config TCH/F
+     phys_chan_config TCH/F_PDCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 5
-    phys_chan_config TCH/F
+     phys_chan_config TCH/F_PDCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 6
-    phys_chan_config TCH/F
+     phys_chan_config TCH/F_PDCH
-    hopping enabled 0
+     hopping enabled 0
    timeslot 7
-    phys_chan_config TCH/F
+     phys_chan_config PDCH
-    hopping enabled 0
+     hopping enabled 0
+<% else -%>
+   timeslot 2
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 3
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 4
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 5
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 6
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 7
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+<% end -%>
+<% end -%>
+<% if @bts2_ip_address -%>
+ bts 2
+  type sysmobts
+  band GSM850
+  cell_identity 2
+  location_area_code <%= @lac %>
+  base_station_id_code 63
+  ms max power 33
+  cell reselection hysteresis 14
+  rxlev access min 0
+  periodic location update 30
+  channel allocator ascending
+  rach tx integer 9
+  rach max transmission 7
+  channel-descrption attach 1
+  channel-descrption bs-pa-mfrms 5
+  channel-descrption bs-ag-blks-res 1
+  rach emergency call allowed 1
+  ip.access unit_id 1000 2
+  oml ip.access stream_id 255 line 0
+  neighbor-list mode automatic
+  codec-support fr
+  gprs mode none
+  no force-combined-si
+  trx 0
+   rf_locked 0
+   arfcn <%= @arfcn_C %>
+   nominal power 37
+   max_power_red <%= @max_power_red %>
+   rsl e1 tei 0
+   timeslot 0
+     phys_chan_config CCCH
+     hopping enabled 0
+   timeslot 1
+     phys_chan_config SDCCH8
+     hopping enabled 0
+   timeslot 2
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 3
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 4
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 5
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 6
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 7
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+ bts 3
+  type sysmobts
+  band GSM850
+  cell_identity 3
+  location_area_code <%= @lac %>
+  base_station_id_code 63
+  ms max power 33
+  cell reselection hysteresis 14
+  rxlev access min 0
+  periodic location update 30
+  channel allocator ascending
+  rach tx integer 9
+  rach max transmission 7
+  channel-descrption attach 1
+  channel-descrption bs-pa-mfrms 5
+  channel-descrption bs-ag-blks-res 1
+  rach emergency call allowed 1
+  ip.access unit_id 1000 3
+  oml ip.access stream_id 255 line 0
+  neighbor-list mode automatic
+  codec-support fr
+  gprs mode none
+  no force-combined-si
+  depends-on-bts 2
+  trx 0
+   rf_locked 0
+   arfcn <%= @arfcn_D %>
+   nominal power 37
+   max_power_red <%= @max_power_red %>
+   rsl e1 tei 0
+   timeslot 0
+     phys_chan_config CCCH
+     hopping enabled 0
+   timeslot 1
+     phys_chan_config SDCCH8
+     hopping enabled 0
+   timeslot 2
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 3
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 4
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 5
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 6
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 7
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+<% end -%>
+<% if @bts3_ip_address -%>
+ bts 4
+  type sysmobts
+  band GSM850
+  cell_identity 4
+  location_area_code <%= @lac %>
+  base_station_id_code 63
+  ms max power 33
+  cell reselection hysteresis 14
+  rxlev access min 0
+  periodic location update 30
+  channel allocator ascending
+  rach tx integer 9
+  rach max transmission 7
+  channel-descrption attach 1
+  channel-descrption bs-pa-mfrms 5
+  channel-descrption bs-ag-blks-res 1
+  rach emergency call allowed 1
+  ip.access unit_id 1000 4
+  oml ip.access stream_id 255 line 0
+  neighbor-list mode automatic
+  codec-support fr
+  gprs mode none
+  no force-combined-si
+  trx 0
+   rf_locked 0
+   arfcn <%= @arfcn_E %>
+   nominal power 37
+   max_power_red <%= @max_power_red %>
+   rsl e1 tei 0
+   timeslot 0
+     phys_chan_config CCCH
+     hopping enabled 0
+   timeslot 1
+     phys_chan_config SDCCH8
+     hopping enabled 0
+   timeslot 2
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 3
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 4
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 5
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 6
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 7
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+ bts 5
+  type sysmobts
+  band GSM850
+  cell_identity 5
+  location_area_code <%= @lac %>
+  base_station_id_code 63
+  ms max power 33
+  cell reselection hysteresis 14
+  rxlev access min 0
+  periodic location update 30
+  channel allocator ascending
+  rach tx integer 9
+  rach max transmission 7
+  channel-descrption attach 1
+  channel-descrption bs-pa-mfrms 5
+  channel-descrption bs-ag-blks-res 1
+  rach emergency call allowed 1
+  ip.access unit_id 1000 5
+  oml ip.access stream_id 255 line 0
+  neighbor-list mode automatic
+  codec-support fr
+  gprs mode none
+  no force-combined-si
+  depends-on-bts 4
+  trx 0
+   rf_locked 0
+   arfcn <%= @arfcn_F %>
+   nominal power 37
+   max_power_red <%= @max_power_red %>
+   rsl e1 tei 0
+   timeslot 0
+     phys_chan_config CCCH
+     hopping enabled 0
+   timeslot 1
+     phys_chan_config SDCCH8
+     hopping enabled 0
+   timeslot 2
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 3
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 4
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 5
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 6
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
+   timeslot 7
+     phys_chan_config <%= @phys_chan %>
+     hopping enabled 0
 <% end -%>
 mncc-int
  default-codec tch-f fr
@@ -249,11 +534,12 @@ smpp
  policy closed
  smpp-first
  esme OSMPP
-  password Password
+  no alert-notifications
+  password <%= @smsc_password %>
   default-route
-  no alert-notifications
- esme NOTIFY
-  password Password
  esme ISMPP
-  password Password
   no alert-notifications
+  password <%= @smsc_password %>
+ esme NOTIFY
+  password <%= @smpp_password %>
+  no deliver-src-imsi