From 7b0e543e83b2270e1ce362d24c96ad42eee648f0 Mon Sep 17 00:00:00 2001 From: Ciaby Date: Mon, 16 Feb 2015 14:37:43 -0600 Subject: [PATCH] Add support for multiple BTSs --- .../rhizomatica_base_system/manifests/init.pp | 18 +- .../templates/osmo-nitb.cfg.erb | 220 +++++++++++++++++- 2 files changed, 230 insertions(+), 8 deletions(-) diff --git a/modules/rhizomatica_base_system/manifests/init.pp b/modules/rhizomatica_base_system/manifests/init.pp index 92aef84..53416ca 100644 --- a/modules/rhizomatica_base_system/manifests/init.pp +++ b/modules/rhizomatica_base_system/manifests/init.pp @@ -12,7 +12,6 @@ # class rhizomatica_base_system { - $bts1_ip_address = hiera('rhizo::bts1_ip_address') $mail_admins = hiera('rhizo::mail_admins') $smsc_password = hiera('rhizo::smsc_password') $kannel_admin_password = hiera('rhizo::kannel_admin_password') @@ -32,9 +31,20 @@ class rhizomatica_base_system { $postcode = hiera('rhizo::postcode') $pbxcode = hiera('rhizo::pbxcode') # network name - $network_name = hiera('rhizo::network_name') - $arfcn_A = hiera('rhizo::arfcn_A') - $arfcn_B = hiera('rhizo::arfcn_B') + $network_name = hiera('rhizo::network_name') + + #BTSs configuration + $bts1_ip_address = hiera('rhizo::bts1_ip_address') + $arfcn_A = hiera('rhizo::arfcn_A') + $arfcn_B = hiera('rhizo::arfcn_B') + + $bts2_ip_address = hiera('rhizo::bts2_ip_address', undef) + $arfcn_C = hiera('rhizo::arfcn_C', undef) + $arfcn_D = hiera('rhizo::arfcn_D', undef) + + $bts3_ip_address = hiera('rhizo::bts3_ip_address', undef) + $arfcn_E = hiera('rhizo::arfcn_E', undef) + $arfcn_F = hiera('rhizo::arfcn_F', undef) # VPN ip address $vpn_ip_address = hiera('rhizo::vpn_ip_address') diff --git a/modules/rhizomatica_base_system/templates/osmo-nitb.cfg.erb b/modules/rhizomatica_base_system/templates/osmo-nitb.cfg.erb index f499e45..3dc0969 100644 --- a/modules/rhizomatica_base_system/templates/osmo-nitb.cfg.erb +++ b/modules/rhizomatica_base_system/templates/osmo-nitb.cfg.erb @@ -47,18 +47,18 @@ e1_input e1_line 0 port 0 no e1_line 0 keepalive network - network country code 1 - mobile network code 1 + network country code 334 + mobile network code 7 short name <%= @network_name %> long name <%= @network_name %> - auth policy accept-all + auth policy <%= @auth_policy %> location updating reject cause 13 encryption a5 0 neci 1 paging any use tch 1 rrlp mode none mm info 1 - handover 1 + handover 0 handover window rxlev averaging 10 handover window rxqual averaging 1 handover window rxlev neighbor averaging 10 @@ -183,6 +183,218 @@ network timeslot 7 phys_chan_config TCH/F hopping enabled 0 +<% if @bts2_ip_address %> + bts 2 + type sysmobts + band GSM850 + cell_identity 2 + location_area_code 1 + 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 + 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 0 + 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 TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + bts 3 + type sysmobts + band GSM850 + cell_identity 3 + location_area_code 1 + 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 + 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 + trx 0 + rf_locked 0 + arfcn <%= @arfcn_D %> + nominal power 37 + max_power_red 0 + 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 TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 +<% end %> +<% if @bts3_ip_address %> + bts 4 + type sysmobts + band GSM850 + cell_identity 4 + location_area_code 1 + 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 + 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 0 + 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 TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 + bts 5 + type sysmobts + band GSM850 + cell_identity 5 + location_area_code 1 + 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 + 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 + trx 0 + rf_locked 0 + arfcn <%= @arfcn_F %> + nominal power 37 + max_power_red 0 + 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 TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 7 + phys_chan_config TCH/F + hopping enabled 0 +<% end %> mncc-int default-codec tch-f fr default-codec tch-h hr