Commit db6993c2 authored by Joanne Hugé's avatar Joanne Hugé

ors-amarisoft: Add N39 configuration (ssb_pos_bitmap parameter needed)

parent 823fa7b2
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = cdda32a8e0b4a5037b5d42fe53a32fe6 md5sum = 7b96a100c24e3b282246ae79e97b887b
[template-lte-enb-epc] [template-lte-enb-epc]
_update_hash_filename_ = instance-enb-epc.jinja2.cfg _update_hash_filename_ = instance-enb-epc.jinja2.cfg
...@@ -28,11 +28,11 @@ md5sum = 80ee6b6aae270e5a44e84ba8edc6b3c6 ...@@ -28,11 +28,11 @@ md5sum = 80ee6b6aae270e5a44e84ba8edc6b3c6
[template-lte-gnb-epc] [template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
md5sum = b15e678779dee0a26746487990fedc01 md5sum = c160dac9b21ca748452e466bb3016ac8
[template-lte-gnb] [template-lte-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum = f636b5a0fe543c4d3b3eaf3fcc7fd854 md5sum = 8c8d05845be9b7c2c3f79bd3309ba88d
[template-lte-epc] [template-lte-epc]
_update_hash_filename_ = instance-epc.jinja2.cfg _update_hash_filename_ = instance-epc.jinja2.cfg
...@@ -48,7 +48,7 @@ md5sum = 890642570bb905033d88c8ef7426850b ...@@ -48,7 +48,7 @@ md5sum = 890642570bb905033d88c8ef7426850b
[gnb.jinja2.cfg] [gnb.jinja2.cfg]
filename = config/gnb.jinja2.cfg filename = config/gnb.jinja2.cfg
md5sum = 655186dae112b1baf561ae320ed86eef md5sum = f90764f76dcc707da55aa91db847d2bb
[ltelogs.jinja2.sh] [ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh filename = ltelogs.jinja2.sh
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
band: {{ slapparameter_dict.get('nr_band', slap_configuration['configuration.default_nr_band']) }}, band: {{ slapparameter_dict.get('nr_band', slap_configuration['configuration.default_nr_band']) }},
dl_nr_arfcn: {{ slapparameter_dict.get('dl_nr_arfcn', slap_configuration['configuration.default_dl_nr_arfcn']) }}, dl_nr_arfcn: {{ slapparameter_dict.get('dl_nr_arfcn', slap_configuration['configuration.default_dl_nr_arfcn']) }},
subcarrier_spacing: 30, /* kHz */ subcarrier_spacing: 30, /* kHz */
ssb_pos_bitmap: "10000000", ssb_pos_bitmap: "{{ slapparameter_dict.get('ssb_pos_bitmap', slap_configuration['configuration.default_nr_ssb_pos_bitmap']) }}",
#endif #endif
#else #else
band: 7, band: 7,
......
...@@ -91,6 +91,9 @@ config-gnb_config_link = {{ dumps(slapparameter_dict["gnb_config_link"]) }} ...@@ -91,6 +91,9 @@ config-gnb_config_link = {{ dumps(slapparameter_dict["gnb_config_link"]) }}
{% if slapparameter_dict.get("gnb_config_version", None) %} {% if slapparameter_dict.get("gnb_config_version", None) %}
config-gnb_config_version = {{ dumps(slapparameter_dict["gnb_config_version"]) }} config-gnb_config_version = {{ dumps(slapparameter_dict["gnb_config_version"]) }}
{% endif %} {% endif %}
{% if slapparameter_dict.get("ssb_pos_bitmap", None) %}
config-ssb_pos_bitmap = {{ dumps(slapparameter_dict["ssb_pos_bitmap"]) }}
{% endif %}
[monitor-base-url-dict] [monitor-base-url-dict]
lte-epc-request = ${lte-epc-request:connection-monitor-base-url} lte-epc-request = ${lte-epc-request:connection-monitor-base-url}
......
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
"description": "gNB ID", "description": "gNB ID",
"type": "string", "type": "string",
"default": "0x12345" "default": "0x12345"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": {{ default_nr_ssb_pos_bitmap }}
} }
} }
} }
...@@ -42,6 +42,7 @@ configuration.default_nr_dl_freq = {{ default_nr_dl_freq }} ...@@ -42,6 +42,7 @@ configuration.default_nr_dl_freq = {{ default_nr_dl_freq }}
configuration.default_nr_bandwidth = {{ default_nr_bandwidth }} configuration.default_nr_bandwidth = {{ default_nr_bandwidth }}
configuration.default_nr_tx_gain = {{ default_nr_tx_gain }} configuration.default_nr_tx_gain = {{ default_nr_tx_gain }}
configuration.default_nr_rx_gain = {{ default_nr_rx_gain }} configuration.default_nr_rx_gain = {{ default_nr_rx_gain }}
configuration.default_nr_ssb_pos_bitmap = {{ default_nr_ssb_pos_bitmap }}
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
......
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
"description": "gNB ID", "description": "gNB ID",
"type": "string", "type": "string",
"default": "0x12345" "default": "0x12345"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": 1000
} }
} }
} }
\ No newline at end of file
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
"description": "gNB ID", "description": "gNB ID",
"type": "string", "type": "string",
"default": "0x12345" "default": "0x12345"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": 1000
} }
} }
} }
\ No newline at end of file
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
"description": "gNB ID", "description": "gNB ID",
"type": "string", "type": "string",
"default": "0x12345" "default": "0x12345"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": 10000000
} }
} }
} }
\ No newline at end of file
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
"description": "gNB ID", "description": "gNB ID",
"type": "string", "type": "string",
"default": "0x12345" "default": "0x12345"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": 10000000
} }
} }
} }
\ No newline at end of file
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
"description": "gNB ID", "description": "gNB ID",
"type": "string", "type": "string",
"default": "0x12345" "default": "0x12345"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": 10000000
} }
} }
} }
\ No newline at end of file
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
"description": "gNB ID", "description": "gNB ID",
"type": "string", "type": "string",
"default": "0x12345" "default": "0x12345"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": 10000000
} }
} }
} }
\ No newline at end of file
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
"description": "gNB ID", "description": "gNB ID",
"type": "string", "type": "string",
"default": "0x12345" "default": "0x12345"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": 10000000
} }
} }
} }
\ No newline at end of file
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
"description": "gNB ID", "description": "gNB ID",
"type": "string", "type": "string",
"default": "0x12345" "default": "0x12345"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": 10000000
} }
} }
} }
\ No newline at end of file
...@@ -108,6 +108,7 @@ extra-context = ...@@ -108,6 +108,7 @@ extra-context =
raw default_nr_bandwidth ${enb:default-nr-bandwidth} raw default_nr_bandwidth ${enb:default-nr-bandwidth}
raw default_nr_tx_gain ${enb:default-nr-tx-gain} raw default_nr_tx_gain ${enb:default-nr-tx-gain}
raw default_nr_rx_gain ${enb:default-nr-rx-gain} raw default_nr_rx_gain ${enb:default-nr-rx-gain}
raw default_nr_ssb_pos_bitmap ${enb:default-nr-ssb-pos-bitmap}
raw min_frequency ${enb:min-frequency} raw min_frequency ${enb:min-frequency}
raw max_frequency ${enb:max-frequency} raw max_frequency ${enb:max-frequency}
key local_ipv4 local-ipv4-address:local-ipv4 key local_ipv4 local-ipv4-address:local-ipv4
......
...@@ -33,6 +33,7 @@ rf_mode_context_list = [ ...@@ -33,6 +33,7 @@ rf_mode_context_list = [
'default_nr_bandwidth': NR_BANDWIDTH, 'default_nr_bandwidth': NR_BANDWIDTH,
'default_nr_tx_gain': NR_TX_GAIN, 'default_nr_tx_gain': NR_TX_GAIN,
'default_nr_rx_gain': NR_RX_GAIN, 'default_nr_rx_gain': NR_RX_GAIN,
'default_nr_ssb_pos_bitmap': "1000",
'min_frequency': 1880.0, 'min_frequency': 1880.0,
'max_frequency': 1920, 'max_frequency': 1920,
...@@ -52,6 +53,7 @@ rf_mode_context_list = [ ...@@ -52,6 +53,7 @@ rf_mode_context_list = [
'default_nr_bandwidth': NR_BANDWIDTH, 'default_nr_bandwidth': NR_BANDWIDTH,
'default_nr_tx_gain': NR_TX_GAIN, 'default_nr_tx_gain': NR_TX_GAIN,
'default_nr_rx_gain': NR_RX_GAIN, 'default_nr_rx_gain': NR_RX_GAIN,
'default_nr_ssb_pos_bitmap': "10000000",
'min_frequency': 2570, 'min_frequency': 2570,
'max_frequency': 2620, 'max_frequency': 2620,
...@@ -71,6 +73,7 @@ rf_mode_context_list = [ ...@@ -71,6 +73,7 @@ rf_mode_context_list = [
'default_nr_bandwidth': NR_BANDWIDTH, 'default_nr_bandwidth': NR_BANDWIDTH,
'default_nr_tx_gain': NR_TX_GAIN, 'default_nr_tx_gain': NR_TX_GAIN,
'default_nr_rx_gain': NR_RX_GAIN, 'default_nr_rx_gain': NR_RX_GAIN,
'default_nr_ssb_pos_bitmap': "10000000",
'min_frequency': 3400, 'min_frequency': 3400,
'max_frequency': 3600, 'max_frequency': 3600,
...@@ -90,6 +93,7 @@ rf_mode_context_list = [ ...@@ -90,6 +93,7 @@ rf_mode_context_list = [
'default_nr_bandwidth': NR_BANDWIDTH, 'default_nr_bandwidth': NR_BANDWIDTH,
'default_nr_tx_gain': NR_TX_GAIN, 'default_nr_tx_gain': NR_TX_GAIN,
'default_nr_rx_gain': NR_RX_GAIN, 'default_nr_rx_gain': NR_RX_GAIN,
'default_nr_ssb_pos_bitmap': "10000000",
'min_frequency': 3600, 'min_frequency': 3600,
'max_frequency': 3800, 'max_frequency': 3800,
......
...@@ -17,6 +17,7 @@ default-nr-dl-freq = 1890.0 ...@@ -17,6 +17,7 @@ default-nr-dl-freq = 1890.0
default-nr-bandwidth = 40 default-nr-bandwidth = 40
default-nr-tx-gain = 70 default-nr-tx-gain = 70
default-nr-rx-gain = 50 default-nr-rx-gain = 50
default-nr-ssb-pos-bitmap = 1000
min-frequency = 1880.0 min-frequency = 1880.0
max-frequency = 1920 max-frequency = 1920
\ No newline at end of file
...@@ -17,6 +17,7 @@ default-nr-dl-freq = 2600.0 ...@@ -17,6 +17,7 @@ default-nr-dl-freq = 2600.0
default-nr-bandwidth = 40 default-nr-bandwidth = 40
default-nr-tx-gain = 70 default-nr-tx-gain = 70
default-nr-rx-gain = 50 default-nr-rx-gain = 50
default-nr-ssb-pos-bitmap = 10000000
min-frequency = 2570 min-frequency = 2570
max-frequency = 2620 max-frequency = 2620
\ No newline at end of file
...@@ -17,6 +17,7 @@ default-nr-dl-freq = 3489.42 ...@@ -17,6 +17,7 @@ default-nr-dl-freq = 3489.42
default-nr-bandwidth = 40 default-nr-bandwidth = 40
default-nr-tx-gain = 70 default-nr-tx-gain = 70
default-nr-rx-gain = 50 default-nr-rx-gain = 50
default-nr-ssb-pos-bitmap = 10000000
min-frequency = 3400 min-frequency = 3400
max-frequency = 3600 max-frequency = 3600
\ No newline at end of file
...@@ -17,6 +17,7 @@ default-nr-dl-freq = 3699.99 ...@@ -17,6 +17,7 @@ default-nr-dl-freq = 3699.99
default-nr-bandwidth = 40 default-nr-bandwidth = 40
default-nr-tx-gain = 70 default-nr-tx-gain = 70
default-nr-rx-gain = 50 default-nr-rx-gain = 50
default-nr-ssb-pos-bitmap = 10000000
min-frequency = 3600 min-frequency = 3600
max-frequency = 3800 max-frequency = 3800
\ No newline at end of file
...@@ -17,6 +17,7 @@ default-nr-dl-freq = {{ default_nr_dl_freq }} ...@@ -17,6 +17,7 @@ default-nr-dl-freq = {{ default_nr_dl_freq }}
default-nr-bandwidth = {{ default_nr_bandwidth }} default-nr-bandwidth = {{ default_nr_bandwidth }}
default-nr-tx-gain = {{ default_nr_tx_gain }} default-nr-tx-gain = {{ default_nr_tx_gain }}
default-nr-rx-gain = {{ default_nr_rx_gain }} default-nr-rx-gain = {{ default_nr_rx_gain }}
default-nr-ssb-pos-bitmap = {{ default_nr_ssb_pos_bitmap }}
min-frequency = {{ min_frequency }} min-frequency = {{ min_frequency }}
max-frequency = {{ max_frequency }} max-frequency = {{ max_frequency }}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment