keith/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add chan type and AMR option to nitb template

Browse source
This commit is contained in:
Wile E. Coyote 2019-05-27 16:42:52 +00:00
parent c269e18523
commit 2976b71bd4
2 changed files with 59 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/rhizo_base/manifests/openbsc.pp
View file

@ -77,6 +77,14 @@ class rhizo_base::openbsc::common {
$smsc_password = $rhizo_base::smsc_password $smsc_password = $rhizo_base::smsc_password
$gprs = $rhizo_base::gprs $gprs = $rhizo_base::gprs
$smpp_password = $rhizo_base::smpp_password $smpp_password = $rhizo_base::smpp_password
$mncc_codec = $rhizo_base::mncc_codec
if $mncc_codec == "AMR" {
$phys_chan = "TCH/H"
} else {
$phys_chan = "TCH/F"
}
service { 'osmocom-nitb': service { 'osmocom-nitb':
enable => false, enable => false,

94
modules/rhizo_base/templates/osmo-nitb.cfg.erb
View file

@ -97,8 +97,12 @@ network
ip.access unit_id 1000 0 ip.access unit_id 1000 0
oml ip.access stream_id 255 line 0 oml ip.access stream_id 255 line 0
neighbor-list mode automatic neighbor-list mode automatic
codec-support fr <% if @mncc_codec == 'AMR' -%>codec-support fr amr
<% if @gprs == 'active' -%>gprs mode gprs amr tch-h modes 4 5
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 11bit_rach_support_for_egprs 0
gprs routing area 0 gprs routing area 0
gprs network-control-order nc0 gprs network-control-order nc0
@ -126,7 +130,7 @@ network
gprs nsvc 0 local udp port 23000 gprs nsvc 0 local udp port 23000
gprs nsvc 0 remote udp port 23001 gprs nsvc 0 remote udp port 23001
gprs nsvc 0 remote ip 127.0.0.1 gprs nsvc 0 remote ip 127.0.0.1
<% else -%>gprs mode none <% else -%> gprs mode none
<% end -%>no force-combined-si <% end -%>no force-combined-si
trx 0 trx 0
rf_locked 0 rf_locked 0
@ -161,22 +165,22 @@ network
hopping enabled 0 hopping enabled 0
<% else -%> <% else -%>
timeslot 2 timeslot 2
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 3 timeslot 3
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 4 timeslot 4
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 5 timeslot 5
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 6 timeslot 6
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 7 timeslot 7
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
<% end -%> <% end -%>
<% if @arfcn_B -%> <% if @arfcn_B -%>
@ -200,8 +204,12 @@ network
ip.access unit_id 1000 1 ip.access unit_id 1000 1
oml ip.access stream_id 255 line 0 oml ip.access stream_id 255 line 0
neighbor-list mode automatic neighbor-list mode automatic
codec-support fr <% if @mncc_codec == 'AMR' -%>codec-support fr amr
<% if @gprs == 'active' -%>gprs mode gprs amr tch-h modes 4 5
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 11bit_rach_support_for_egprs 0
gprs routing area 0 gprs routing area 0
gprs network-control-order nc0 gprs network-control-order nc0
@ -229,7 +237,7 @@ network
gprs nsvc 0 local udp port 23000 gprs nsvc 0 local udp port 23000
gprs nsvc 0 remote udp port 23001 gprs nsvc 0 remote udp port 23001
gprs nsvc 0 remote ip 172.16.0.11 gprs nsvc 0 remote ip 172.16.0.11
<% else -%>gprs mode none <% else -%> gprs mode none
<% end -%>no force-combined-si <% end -%>no force-combined-si
depends-on-bts 0 depends-on-bts 0
trx 0 trx 0
@ -265,22 +273,22 @@ network
hopping enabled 0 hopping enabled 0
<% else -%> <% else -%>
timeslot 2 timeslot 2
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 3 timeslot 3
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 4 timeslot 4
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 5 timeslot 5
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 6 timeslot 6
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 7 timeslot 7
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
<% end -%> <% end -%>
<% end -%> <% end -%>
@ -321,22 +329,22 @@ network
phys_chan_config SDCCH8 phys_chan_config SDCCH8
hopping enabled 0 hopping enabled 0
timeslot 2 timeslot 2
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 3 timeslot 3
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 4 timeslot 4
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 5 timeslot 5
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 6 timeslot 6
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 7 timeslot 7
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
bts 3 bts 3
type sysmobts type sysmobts
@ -375,22 +383,22 @@ network
phys_chan_config SDCCH8 phys_chan_config SDCCH8
hopping enabled 0 hopping enabled 0
timeslot 2 timeslot 2
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 3 timeslot 3
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 4 timeslot 4
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 5 timeslot 5
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 6 timeslot 6
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 7 timeslot 7
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
<% end -%> <% end -%>
<% if @bts3_ip_address -%> <% if @bts3_ip_address -%>
@ -430,22 +438,22 @@ network
phys_chan_config SDCCH8 phys_chan_config SDCCH8
hopping enabled 0 hopping enabled 0
timeslot 2 timeslot 2
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 3 timeslot 3
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 4 timeslot 4
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 5 timeslot 5
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 6 timeslot 6
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 7 timeslot 7
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
bts 5 bts 5
type sysmobts type sysmobts
@ -484,27 +492,27 @@ network
phys_chan_config SDCCH8 phys_chan_config SDCCH8
hopping enabled 0 hopping enabled 0
timeslot 2 timeslot 2
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 3 timeslot 3
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 4 timeslot 4
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 5 timeslot 5
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 6 timeslot 6
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
timeslot 7 timeslot 7
phys_chan_config TCH/F phys_chan_config <%= @phys_chan %>
hopping enabled 0 hopping enabled 0
<% end -%> <% end -%>
mncc-int mncc-int
default-codec tch-f fr default-codec tch-f fr
default-codec tch-h hr default-codec tch-h amr
meas-feed destination 127.0.0.1 8888 meas-feed destination 127.0.0.1 8888
nitb nitb
subscriber-create-on-demand subscriber-create-on-demand