AETHER-3321 Refactor configuration code in enodebd
AETHER-3520 Make enodebd containerized
AETHER-3504 Geomap of Grafana with enodeb coordinate information
Change-Id: Ie425254fa1a8b286004d2bcd366cf6c7057c925c
diff --git a/device_config/configuration_init.py b/device_config/configuration_init.py
index 6139c06..8acb152 100644
--- a/device_config/configuration_init.py
+++ b/device_config/configuration_init.py
@@ -191,15 +191,22 @@
# magma_configs/serial_number/ and magma_configs/acs_common.yml
# The second parameter is the name of gateway configuration in
# override_configs/gateway.mconfig
+
+ # params.column1 = SingleEnodebConfig key
+ # params.column2 = sn config
+ # params.column3 = common_config
+ # params.column4 = mconfig
+
params = [
- ["earfcndl", "earfcndl"],
- ["subframeAssignment", "subframe_assignment"],
- ["special_subframe_pattern", "special_subframe_pattern"],
- ["pci", "pci"],
- ["plmnidList", "plmnid_list"],
- ["tac", "tac"],
- ["bandwidthMhz", "bandwidth_mhz"],
- ["allowEnodebTransmit", "allow_enodeb_transmit"]
+ ["earfcndl", "earfcn_downlink1", "earfcndl" * 2],
+ ["subframe_assignment", "subframe_assignment", "subframeAssignment", "subframe_assignment"],
+ ["special_subframe_pattern", "subframe_configuration", "specialSubframePattern", "special_subframe_pattern"],
+ ["pci", "pci1", "pci", "pci"],
+ ["plmnid_list", "plmnid_list", "plmnidList", "plmnid_list"],
+ ["tac", "tac1", "tac", "tac"],
+ ["bandwidth_mhz", "downlink_bandwidth", "bandwidthMhz", "bandwidth_mhz"],
+ # Note: mconfig doesn't have allowEnodebTransmit
+ ["allow_enodeb_transmit", "allow_enodeb_transmit", "allowEnodebTransmit", "allowEnodebTransmit"]
]
extend_params = ["cell_id", "mme_address", "mme_port"]
@@ -212,8 +219,8 @@
enb_config = enb_configs.get(enb_serial, dict())
for param in params:
- params_dict[param[1]] = enb_config.get(param[0],
- common_config.get(param[0], mconfig.__getattribute__(param[1]))
+ params_dict[param[0]] = enb_config.get(param[1],
+ common_config.get(param[0], mconfig.__getattribute__(param[0]))
)
for param in extend_params: