Commit 6268abe3 authored by Joanne Hugé's avatar Joanne Hugé

ors-amarisoft: add inactivity_timer parameter

parent 0c5a61d0
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = e72c0abf26cb451cef9e30d9fbfe9327 md5sum = fe055b993754ca665b8249cbfb9bbc8b
[template-lte-enb-epc] [template-lte-enb-epc]
_update_hash_filename_ = instance-enb-epc.jinja2.cfg _update_hash_filename_ = instance-enb-epc.jinja2.cfg
...@@ -24,7 +24,7 @@ md5sum = c9994f2ef03edd7d6773307a6385c47c ...@@ -24,7 +24,7 @@ md5sum = c9994f2ef03edd7d6773307a6385c47c
[template-lte-enb] [template-lte-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = 7f101e9777fb53e06e9138b3be562a68 md5sum = e3c2063efb76759fc6e7600b2e1e2cfb
[template-lte-gnb-epc] [template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
...@@ -36,7 +36,7 @@ md5sum = b17674f523adce9b0dda942c1493674d ...@@ -36,7 +36,7 @@ md5sum = b17674f523adce9b0dda942c1493674d
[template-lte-gnb] [template-lte-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum = 69faf2e00fd0beb906bf11f40a4e4d91 md5sum = 1fefb9b0bf1ce6a93e8f0cb993c2f63d
[template-lte-mme] [template-lte-mme]
_update_hash_filename_ = instance-mme.jinja2.cfg _update_hash_filename_ = instance-mme.jinja2.cfg
...@@ -56,7 +56,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149 ...@@ -56,7 +56,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg] [enb.jinja2.cfg]
filename = config/enb.jinja2.cfg filename = config/enb.jinja2.cfg
md5sum = de256b536ef731f123d9f9a239cdce06 md5sum = 9fd6abb1e69fe59af0dafbb336f24f8d
[sib23.asn] [sib23.asn]
filename = config/sib23.asn filename = config/sib23.asn
...@@ -64,7 +64,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a ...@@ -64,7 +64,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
[gnb.jinja2.cfg] [gnb.jinja2.cfg]
filename = config/gnb.jinja2.cfg filename = config/gnb.jinja2.cfg
md5sum = 8d0c56aef8446b4f5b41353f1ee775f6 md5sum = 0ad683812818a02ef5010d087ec7138b
[ltelogs.jinja2.sh] [ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh filename = ltelogs.jinja2.sh
...@@ -88,7 +88,7 @@ md5sum = a904db3ba9518ae0edf0ddcccfa57485 ...@@ -88,7 +88,7 @@ md5sum = a904db3ba9518ae0edf0ddcccfa57485
[sdr-busy-promise] [sdr-busy-promise]
_update_hash_filename_ = promise/check_sdr_busy.py _update_hash_filename_ = promise/check_sdr_busy.py
md5sum = e5853b4fecae68debcb7b32d3c13368c md5sum = a9d7a06c43410e02070b9ddae7b46b38
[interface-up-promise] [interface-up-promise]
_update_hash_filename_ = promise/check_interface_up.py _update_hash_filename_ = promise/check_interface_up.py
......
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
cipher_algo_pref: [], cipher_algo_pref: [],
integ_algo_pref: [2, 1], integ_algo_pref: [2, 1],
inactivity_timer: 10000, inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_lte_inactivity_timer']) }},
srb_config: [ srb_config: [
{ {
......
...@@ -577,7 +577,7 @@ ...@@ -577,7 +577,7 @@
cipher_algo_pref: [], cipher_algo_pref: [],
integ_algo_pref: [2, 1], integ_algo_pref: [2, 1],
inactivity_timer: 10000, inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_nr_inactivity_timer']) }},
#ifndef EPS_FALLBACK #ifndef EPS_FALLBACK
#define EPS_FALLBACK 0 #define EPS_FALLBACK 0
......
...@@ -108,6 +108,12 @@ ...@@ -108,6 +108,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": {{ default_lte_inactivity_timer }}
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -36,6 +36,7 @@ configuration.default_lte_band = {{ default_lte_band }} ...@@ -36,6 +36,7 @@ configuration.default_lte_band = {{ default_lte_band }}
configuration.default_lte_n_rb_dl = {{ default_lte_n_rb_dl }} configuration.default_lte_n_rb_dl = {{ default_lte_n_rb_dl }}
configuration.default_lte_tx_gain = {{ default_lte_tx_gain }} configuration.default_lte_tx_gain = {{ default_lte_tx_gain }}
configuration.default_lte_rx_gain = {{ default_lte_rx_gain }} configuration.default_lte_rx_gain = {{ default_lte_rx_gain }}
configuration.default_lte_inactivity_timer = {{ default_lte_inactivity_timer }}
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
......
...@@ -150,6 +150,12 @@ ...@@ -150,6 +150,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": {{ default_nr_inactivity_timer }}
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -35,6 +35,7 @@ configuration.default_nr_band = {{ default_nr_band }} ...@@ -35,6 +35,7 @@ configuration.default_nr_band = {{ default_nr_band }}
configuration.default_nr_dl_freq = {{ default_nr_dl_freq }} 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_inactivity_timer = {{ default_nr_inactivity_timer }}
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 }} configuration.default_nr_ssb_pos_bitmap = {{ default_nr_ssb_pos_bitmap }}
......
...@@ -106,6 +106,12 @@ ...@@ -106,6 +106,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -88,6 +88,12 @@ ...@@ -88,6 +88,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -148,6 +148,12 @@ ...@@ -148,6 +148,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -130,6 +130,12 @@ ...@@ -130,6 +130,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -106,6 +106,12 @@ ...@@ -106,6 +106,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -88,6 +88,12 @@ ...@@ -88,6 +88,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -148,6 +148,12 @@ ...@@ -148,6 +148,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -130,6 +130,12 @@ ...@@ -130,6 +130,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -106,6 +106,12 @@ ...@@ -106,6 +106,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -88,6 +88,12 @@ ...@@ -88,6 +88,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -148,6 +148,12 @@ ...@@ -148,6 +148,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -130,6 +130,12 @@ ...@@ -130,6 +130,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -106,6 +106,12 @@ ...@@ -106,6 +106,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -88,6 +88,12 @@ ...@@ -88,6 +88,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -148,6 +148,12 @@ ...@@ -148,6 +148,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -130,6 +130,12 @@ ...@@ -130,6 +130,12 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"use_ipv4": { "use_ipv4": {
"default": false, "default": false,
"title": "Use IPv4", "title": "Use IPv4",
......
...@@ -112,6 +112,7 @@ extra-context = ...@@ -112,6 +112,7 @@ extra-context =
raw default_lte_n_rb_dl ${default-params:default-lte-n-rb-dl} raw default_lte_n_rb_dl ${default-params:default-lte-n-rb-dl}
raw default_lte_tx_gain ${default-params:default-lte-tx-gain} raw default_lte_tx_gain ${default-params:default-lte-tx-gain}
raw default_lte_rx_gain ${default-params:default-lte-rx-gain} raw default_lte_rx_gain ${default-params:default-lte-rx-gain}
raw default_lte_inactivity_timer ${default-params:default-lte-inactivity-timer}
raw min_frequency ${default-params:min-frequency} raw min_frequency ${default-params:min-frequency}
raw max_frequency ${default-params:max-frequency} raw max_frequency ${default-params:max-frequency}
...@@ -134,6 +135,7 @@ extra-context = ...@@ -134,6 +135,7 @@ extra-context =
raw default_nr_tx_gain ${default-params:default-nr-tx-gain} raw default_nr_tx_gain ${default-params:default-nr-tx-gain}
raw default_nr_rx_gain ${default-params:default-nr-rx-gain} raw default_nr_rx_gain ${default-params:default-nr-rx-gain}
raw default_nr_ssb_pos_bitmap ${default-params:default-nr-ssb-pos-bitmap} raw default_nr_ssb_pos_bitmap ${default-params:default-nr-ssb-pos-bitmap}
raw default_nr_inactivity_timer ${default-params:default-nr-inactivity-timer}
raw min_frequency ${default-params:min-frequency} raw min_frequency ${default-params:min-frequency}
raw max_frequency ${default-params:max-frequency} raw max_frequency ${default-params:max-frequency}
......
...@@ -9,70 +9,72 @@ global_context = { ...@@ -9,70 +9,72 @@ global_context = {
rf_mode_context_list = [ rf_mode_context_list = [
{ {
'rf_mode' : 'tdd1900', 'rf_mode' : 'tdd1900',
'default_dl_earfcn' : 38350, 'default_dl_earfcn' : 38350,
'default_lte_dl_freq' : 1890.0, 'default_lte_dl_freq' : 1890.0,
'default_lte_band' : 39, 'default_lte_band' : 39,
'default_dl_nr_arfcn' : 378000, 'default_dl_nr_arfcn' : 378000,
'default_nr_band' : 39, 'default_nr_band' : 39,
'default_nr_dl_freq' : 1890.0, 'default_nr_dl_freq' : 1890.0,
'default_nr_ssb_pos_bitmap' : "1000", 'default_nr_ssb_pos_bitmap' : "1000",
'default_ssb_nr_arfcn' : 377790, 'default_ssb_nr_arfcn' : 377790,
'min_frequency' : 1880.0, 'min_frequency' : 1880.0,
'max_frequency' : 1920, 'max_frequency' : 1920,
}, { }, {
'rf_mode' : 'tdd2600', 'rf_mode' : 'tdd2600',
'default_dl_earfcn' : 38050, 'default_dl_earfcn' : 38050,
'default_lte_dl_freq' : 2600.0, 'default_lte_dl_freq' : 2600.0,
'default_lte_band' : 38, 'default_lte_band' : 38,
'default_dl_nr_arfcn' : 520000, 'default_dl_nr_arfcn' : 520000,
'default_nr_band' : 38, 'default_nr_band' : 38,
'default_nr_dl_freq' : 2600.0, 'default_nr_dl_freq' : 2600.0,
'default_nr_ssb_pos_bitmap' : "10000000", 'default_nr_ssb_pos_bitmap' : "10000000",
'default_ssb_nr_arfcn' : 517930, 'default_ssb_nr_arfcn' : 517930,
'min_frequency' : 2570, 'min_frequency' : 2570,
'max_frequency' : 2620, 'max_frequency' : 2620,
}, { }, {
'rf_mode' : 'tdd3500', 'rf_mode' : 'tdd3500',
'default_dl_earfcn' : 42590, 'default_dl_earfcn' : 42590,
'default_lte_dl_freq' : 3500.0, 'default_lte_dl_freq' : 3500.0,
'default_lte_band' : 42, 'default_lte_band' : 42,
'default_dl_nr_arfcn' : 632628, 'default_dl_nr_arfcn' : 632628,
'default_nr_band' : 78, 'default_nr_band' : 78,
'default_nr_dl_freq' : 3489.42, 'default_nr_dl_freq' : 3489.42,
'default_nr_ssb_pos_bitmap' : "10000000", 'default_nr_ssb_pos_bitmap' : "10000000",
'default_ssb_nr_arfcn' : 632544, 'default_ssb_nr_arfcn' : 632544,
'min_frequency' : 3400, 'min_frequency' : 3400,
'max_frequency' : 3600, 'max_frequency' : 3600,
}, { }, {
'rf_mode' : 'tdd3700', 'rf_mode' : 'tdd3700',
'default_dl_earfcn' : 44590, 'default_dl_earfcn' : 44590,
'default_lte_dl_freq' : 3700.0, 'default_lte_dl_freq' : 3700.0,
'default_lte_band' : 43, 'default_lte_band' : 43,
'default_dl_nr_arfcn' : 646666, 'default_dl_nr_arfcn' : 646666,
'default_nr_band' : 78, 'default_nr_band' : 78,
'default_nr_dl_freq' : 3699.99, 'default_nr_dl_freq' : 3699.99,
'default_nr_ssb_pos_bitmap' : "10000000", 'default_nr_ssb_pos_bitmap' : "10000000",
'default_ssb_nr_arfcn' : 646656, 'default_ssb_nr_arfcn' : 646656,
'min_frequency' : 3600, 'min_frequency' : 3600,
'max_frequency' : 3800, 'max_frequency' : 3800,
} }
] ]
for i in range (4): for i in range (4):
rf_mode_context_list[i].update({ rf_mode_context_list[i].update({
'default_lte_n_rb_dl' : 100, 'default_lte_n_rb_dl' : 100,
'default_lte_tx_gain' : 78, 'default_lte_tx_gain' : 78,
'default_lte_rx_gain' : 40, 'default_lte_rx_gain' : 40,
'default_lte_imsi' : "001010123456789", 'default_lte_imsi' : "001010123456789",
'default_lte_k' : "00112233445566778899aabbccddeeff", 'default_lte_k' : "00112233445566778899aabbccddeeff",
'default_nr_bandwidth' : 40, 'default_lte_inactivity_timer' : 10000,
'default_nr_tx_gain' : 78, 'default_nr_bandwidth' : 40,
'default_nr_rx_gain' : 40, 'default_nr_tx_gain' : 78,
'default_nr_imsi' : "001010123456789", 'default_nr_rx_gain' : 40,
'default_nr_k' : "00112233445566778899aabbccddeeff", 'default_nr_imsi' : "001010123456789",
'default_n_antenna_dl' : 2, 'default_nr_k' : "00112233445566778899aabbccddeeff",
'default_n_antenna_ul' : 2, 'default_n_antenna_dl' : 2,
'default_n_antenna_ul' : 2,
'default_nr_inactivity_timer' : 10000,
}) })
with open('software.cfg.json.jinja2', 'r') as f: with open('software.cfg.json.jinja2', 'r') as f:
......
...@@ -10,6 +10,7 @@ default-lte-band = 39 ...@@ -10,6 +10,7 @@ default-lte-band = 39
default-lte-n-rb-dl = 100 default-lte-n-rb-dl = 100
default-lte-tx-gain = 78 default-lte-tx-gain = 78
default-lte-rx-gain = 40 default-lte-rx-gain = 40
default-lte-inactivity-timer = 10000
default-lte-imsi = 001010123456789 default-lte-imsi = 001010123456789
default-lte-k = 00112233445566778899aabbccddeeff default-lte-k = 00112233445566778899aabbccddeeff
...@@ -21,6 +22,7 @@ default-nr-tx-gain = 78 ...@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
default-nr-rx-gain = 40 default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 1000 default-nr-ssb-pos-bitmap = 1000
default-ssb-nr-arfcn = 377790 default-ssb-nr-arfcn = 377790
default-nr-inactivity-timer = 10000
default-nr-imsi = 001010123456789 default-nr-imsi = 001010123456789
default-nr-k = 00112233445566778899aabbccddeeff default-nr-k = 00112233445566778899aabbccddeeff
......
...@@ -10,6 +10,7 @@ default-lte-band = 38 ...@@ -10,6 +10,7 @@ default-lte-band = 38
default-lte-n-rb-dl = 100 default-lte-n-rb-dl = 100
default-lte-tx-gain = 78 default-lte-tx-gain = 78
default-lte-rx-gain = 40 default-lte-rx-gain = 40
default-lte-inactivity-timer = 10000
default-lte-imsi = 001010123456789 default-lte-imsi = 001010123456789
default-lte-k = 00112233445566778899aabbccddeeff default-lte-k = 00112233445566778899aabbccddeeff
...@@ -21,6 +22,7 @@ default-nr-tx-gain = 78 ...@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
default-nr-rx-gain = 40 default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000 default-nr-ssb-pos-bitmap = 10000000
default-ssb-nr-arfcn = 517930 default-ssb-nr-arfcn = 517930
default-nr-inactivity-timer = 10000
default-nr-imsi = 001010123456789 default-nr-imsi = 001010123456789
default-nr-k = 00112233445566778899aabbccddeeff default-nr-k = 00112233445566778899aabbccddeeff
......
...@@ -10,6 +10,7 @@ default-lte-band = 42 ...@@ -10,6 +10,7 @@ default-lte-band = 42
default-lte-n-rb-dl = 100 default-lte-n-rb-dl = 100
default-lte-tx-gain = 78 default-lte-tx-gain = 78
default-lte-rx-gain = 40 default-lte-rx-gain = 40
default-lte-inactivity-timer = 10000
default-lte-imsi = 001010123456789 default-lte-imsi = 001010123456789
default-lte-k = 00112233445566778899aabbccddeeff default-lte-k = 00112233445566778899aabbccddeeff
...@@ -21,6 +22,7 @@ default-nr-tx-gain = 78 ...@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
default-nr-rx-gain = 40 default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000 default-nr-ssb-pos-bitmap = 10000000
default-ssb-nr-arfcn = 632544 default-ssb-nr-arfcn = 632544
default-nr-inactivity-timer = 10000
default-nr-imsi = 001010123456789 default-nr-imsi = 001010123456789
default-nr-k = 00112233445566778899aabbccddeeff default-nr-k = 00112233445566778899aabbccddeeff
......
...@@ -10,6 +10,7 @@ default-lte-band = 43 ...@@ -10,6 +10,7 @@ default-lte-band = 43
default-lte-n-rb-dl = 100 default-lte-n-rb-dl = 100
default-lte-tx-gain = 78 default-lte-tx-gain = 78
default-lte-rx-gain = 40 default-lte-rx-gain = 40
default-lte-inactivity-timer = 10000
default-lte-imsi = 001010123456789 default-lte-imsi = 001010123456789
default-lte-k = 00112233445566778899aabbccddeeff default-lte-k = 00112233445566778899aabbccddeeff
...@@ -21,6 +22,7 @@ default-nr-tx-gain = 78 ...@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
default-nr-rx-gain = 40 default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000 default-nr-ssb-pos-bitmap = 10000000
default-ssb-nr-arfcn = 646656 default-ssb-nr-arfcn = 646656
default-nr-inactivity-timer = 10000
default-nr-imsi = 001010123456789 default-nr-imsi = 001010123456789
default-nr-k = 00112233445566778899aabbccddeeff default-nr-k = 00112233445566778899aabbccddeeff
......
...@@ -10,6 +10,7 @@ default-lte-band = {{ default_lte_band }} ...@@ -10,6 +10,7 @@ default-lte-band = {{ default_lte_band }}
default-lte-n-rb-dl = {{ default_lte_n_rb_dl }} default-lte-n-rb-dl = {{ default_lte_n_rb_dl }}
default-lte-tx-gain = {{ default_lte_tx_gain }} default-lte-tx-gain = {{ default_lte_tx_gain }}
default-lte-rx-gain = {{ default_lte_rx_gain }} default-lte-rx-gain = {{ default_lte_rx_gain }}
default-lte-inactivity-timer = {{ default_lte_inactivity_timer }}
default-lte-imsi = {{ default_lte_imsi }} default-lte-imsi = {{ default_lte_imsi }}
default-lte-k = {{ default_lte_k }} default-lte-k = {{ default_lte_k }}
...@@ -21,6 +22,7 @@ default-nr-tx-gain = {{ default_nr_tx_gain }} ...@@ -21,6 +22,7 @@ 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 }} default-nr-ssb-pos-bitmap = {{ default_nr_ssb_pos_bitmap }}
default-ssb-nr-arfcn = {{ default_ssb_nr_arfcn }} default-ssb-nr-arfcn = {{ default_ssb_nr_arfcn }}
default-nr-inactivity-timer = {{ default_nr_inactivity_timer }}
default-nr-imsi = {{ default_nr_imsi }} default-nr-imsi = {{ default_nr_imsi }}
default-nr-k = {{ default_nr_k }} default-nr-k = {{ default_nr_k }}
......
...@@ -64,6 +64,7 @@ param_dict = { ...@@ -64,6 +64,7 @@ param_dict = {
'rue_addr': "192.168.99.88", 'rue_addr': "192.168.99.88",
'n_antenna_dl': 2, 'n_antenna_dl': 2,
'n_antenna_ul': 2, 'n_antenna_ul': 2,
'inactivity_timer': 17,
'gnb_id': "0x17", 'gnb_id': "0x17",
'ssb_pos_bitmap': "10", 'ssb_pos_bitmap': "10",
'amf_list': { 'amf_list': {
...@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase): ...@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase):
conf = yaml.load(f) conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain']) self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain']) self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn']) self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band']) self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap']) self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
...@@ -155,6 +157,7 @@ def test_enb_conf(self): ...@@ -155,6 +157,7 @@ def test_enb_conf(self):
conf = yaml.load(f) conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain']) self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain']) self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
self.assertEqual(conf['cell_default']['inactivity_timer'], enb_param_dict['inactivity_timer'])
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
......
...@@ -64,6 +64,7 @@ param_dict = { ...@@ -64,6 +64,7 @@ param_dict = {
'rue_addr': "192.168.99.88", 'rue_addr': "192.168.99.88",
'n_antenna_dl': 2, 'n_antenna_dl': 2,
'n_antenna_ul': 2, 'n_antenna_ul': 2,
'inactivity_timer': 17,
'gnb_id': "0x17", 'gnb_id': "0x17",
'ssb_pos_bitmap': "10", 'ssb_pos_bitmap': "10",
'amf_list': { 'amf_list': {
...@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase): ...@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase):
conf = yaml.load(f) conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain']) self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain']) self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn']) self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band']) self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap']) self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
...@@ -155,6 +157,7 @@ def test_enb_conf(self): ...@@ -155,6 +157,7 @@ def test_enb_conf(self):
conf = yaml.load(f) conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain']) self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain']) self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
self.assertEqual(conf['cell_default']['inactivity_timer'], enb_param_dict['inactivity_timer'])
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
......
...@@ -64,6 +64,7 @@ param_dict = { ...@@ -64,6 +64,7 @@ param_dict = {
'rue_addr': "192.168.99.88", 'rue_addr': "192.168.99.88",
'n_antenna_dl': 2, 'n_antenna_dl': 2,
'n_antenna_ul': 2, 'n_antenna_ul': 2,
'inactivity_timer': 17,
'gnb_id': "0x17", 'gnb_id': "0x17",
'ssb_pos_bitmap': "10", 'ssb_pos_bitmap': "10",
'amf_list': { 'amf_list': {
...@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase): ...@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase):
conf = yaml.load(f) conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain']) self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain']) self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn']) self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band']) self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap']) self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
...@@ -155,6 +157,7 @@ def test_enb_conf(self): ...@@ -155,6 +157,7 @@ def test_enb_conf(self):
conf = yaml.load(f) conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain']) self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain']) self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
self.assertEqual(conf['cell_default']['inactivity_timer'], enb_param_dict['inactivity_timer'])
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
......
...@@ -64,6 +64,7 @@ param_dict = { ...@@ -64,6 +64,7 @@ param_dict = {
'rue_addr': "192.168.99.88", 'rue_addr': "192.168.99.88",
'n_antenna_dl': 2, 'n_antenna_dl': 2,
'n_antenna_ul': 2, 'n_antenna_ul': 2,
'inactivity_timer': 17,
'gnb_id': "0x17", 'gnb_id': "0x17",
'ssb_pos_bitmap': "10", 'ssb_pos_bitmap': "10",
'amf_list': { 'amf_list': {
...@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase): ...@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase):
conf = yaml.load(f) conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain']) self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain']) self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn']) self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band']) self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap']) self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
...@@ -155,6 +157,7 @@ def test_enb_conf(self): ...@@ -155,6 +157,7 @@ def test_enb_conf(self):
conf = yaml.load(f) conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain']) self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain']) self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
self.assertEqual(conf['cell_default']['inactivity_timer'], enb_param_dict['inactivity_timer'])
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
......
...@@ -64,6 +64,7 @@ param_dict = { ...@@ -64,6 +64,7 @@ param_dict = {
'rue_addr': "192.168.99.88", 'rue_addr': "192.168.99.88",
'n_antenna_dl': 2, 'n_antenna_dl': 2,
'n_antenna_ul': 2, 'n_antenna_ul': 2,
'inactivity_timer': 17,
'gnb_id': "0x17", 'gnb_id': "0x17",
'ssb_pos_bitmap': "10", 'ssb_pos_bitmap': "10",
'amf_list': { 'amf_list': {
...@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase): ...@@ -110,6 +111,7 @@ class TestGNBParameters1(ORSTestCase):
conf = yaml.load(f) conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain']) self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain']) self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
self.assertEqual(conf['nr_cell_default']['inactivity_timer'], gnb_param_dict1['inactivity_timer'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn']) self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], gnb_param_dict1['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band']) self.assertEqual(conf['nr_cell_list'][0]['band'], gnb_param_dict1['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap']) self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap'])
...@@ -155,6 +157,7 @@ def test_enb_conf(self): ...@@ -155,6 +157,7 @@ def test_enb_conf(self):
conf = yaml.load(f) conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain']) self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain']) self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
self.assertEqual(conf['cell_default']['inactivity_timer'], enb_param_dict['inactivity_timer'])
self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn']) self.assertEqual(conf['cell_list'][0]['dl_earfcn'], enb_param_dict['dl_earfcn'])
self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16)) self.assertEqual(conf['enb_id'], int(enb_param_dict['enb_id'], 16))
self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci']) self.assertEqual(conf['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
......
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