diff --git a/modules/rhizo_base/templates/osmo-nitb.cfg.erb b/modules/rhizo_base/templates/osmo-nitb.cfg.erb index fb9ccd4..518e757 100644 --- a/modules/rhizo_base/templates/osmo-nitb.cfg.erb +++ b/modules/rhizo_base/templates/osmo-nitb.cfg.erb @@ -141,6 +141,26 @@ network timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 +<% if @gprs == 'active' -%> + timeslot 2 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 6 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 +<% else -%> timeslot 2 phys_chan_config TCH/F hopping enabled 0 @@ -154,19 +174,12 @@ network phys_chan_config TCH/F hopping enabled 0 timeslot 6 -<% if @gprs == 'active' -%> - phys_chan_config TCH/F_PDCH -<% else -%> phys_chan_config TCH/F -<% end -%> hopping enabled 0 timeslot 7 -<% if @gprs == 'active' -%> - phys_chan_config PDCH -<% else -%> phys_chan_config TCH/F -<% end -%> hopping enabled 0 +<% end -%> <% if @arfcn_B -%> bts 1 type sysmobts @@ -189,8 +202,36 @@ network oml ip.access stream_id 255 line 0 neighbor-list mode automatic codec-support fr - gprs mode none - no force-combined-si + <% 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 2 + 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 951 + 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 951 + 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 @@ -204,6 +245,26 @@ network timeslot 1 phys_chan_config SDCCH8 hopping enabled 0 +<% if @gprs == 'active' -%> + timeslot 2 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 6 + phys_chan_config TCH/F_PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 +<% else -%> timeslot 2 phys_chan_config TCH/F hopping enabled 0 @@ -223,6 +284,7 @@ network phys_chan_config TCH/F hopping enabled 0 <% end -%> +<% end -%> <% if @bts2_ip_address -%> bts 2 type sysmobts @@ -444,6 +506,7 @@ network mncc-int default-codec tch-f fr default-codec tch-h hr + meas-feed destination 127.0.0.1 8888 nitb subscriber-create-on-demand no assign-tmsi