Commit 6e7802b8 authored by Joanne Hugé's avatar Joanne Hugé

ors-amarisoft: add inactivity_timer parameter

parent b87c27f2
......@@ -16,7 +16,7 @@
[template]
filename = instance.cfg
md5sum = e72c0abf26cb451cef9e30d9fbfe9327
md5sum = fe055b993754ca665b8249cbfb9bbc8b
[template-lte-enb-epc]
_update_hash_filename_ = instance-enb-epc.jinja2.cfg
......@@ -24,7 +24,7 @@ md5sum = c9994f2ef03edd7d6773307a6385c47c
[template-lte-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = 7f101e9777fb53e06e9138b3be562a68
md5sum = e3c2063efb76759fc6e7600b2e1e2cfb
[template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg
......@@ -36,7 +36,7 @@ md5sum = b17674f523adce9b0dda942c1493674d
[template-lte-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum = 69faf2e00fd0beb906bf11f40a4e4d91
md5sum = 1fefb9b0bf1ce6a93e8f0cb993c2f63d
[template-lte-mme]
_update_hash_filename_ = instance-mme.jinja2.cfg
......@@ -56,7 +56,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg]
filename = config/enb.jinja2.cfg
md5sum = de256b536ef731f123d9f9a239cdce06
md5sum = 9fd6abb1e69fe59af0dafbb336f24f8d
[sib23.asn]
filename = config/sib23.asn
......@@ -64,7 +64,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
[gnb.jinja2.cfg]
filename = config/gnb.jinja2.cfg
md5sum = 8d0c56aef8446b4f5b41353f1ee775f6
md5sum = 0ad683812818a02ef5010d087ec7138b
[ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh
......
......@@ -205,7 +205,7 @@
cipher_algo_pref: [],
integ_algo_pref: [2, 1],
inactivity_timer: 10000,
inactivity_timer: {{ slapparameter_dict.get('inactivity_timer', slap_configuration['configuration.default_lte_inactivity_timer']) }},
srb_config: [
{
......
......@@ -577,7 +577,7 @@
cipher_algo_pref: [],
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
#define EPS_FALLBACK 0
......
......@@ -108,6 +108,12 @@
"type": "object",
"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": {
"default": false,
"title": "Use IPv4",
......
......@@ -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_tx_gain = {{ default_lte_tx_gain }}
configuration.default_lte_rx_gain = {{ default_lte_rx_gain }}
configuration.default_lte_inactivity_timer = {{ default_lte_inactivity_timer }}
[directory]
recipe = slapos.cookbook:mkdirectory
......
......@@ -150,6 +150,12 @@
"type": "object",
"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": {
"default": false,
"title": "Use IPv4",
......
......@@ -35,6 +35,7 @@ configuration.default_nr_band = {{ default_nr_band }}
configuration.default_nr_dl_freq = {{ default_nr_dl_freq }}
configuration.default_nr_bandwidth = {{ default_nr_bandwidth }}
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_ssb_pos_bitmap = {{ default_nr_ssb_pos_bitmap }}
......
......@@ -106,6 +106,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -88,6 +88,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -148,6 +148,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -130,6 +130,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -106,6 +106,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -88,6 +88,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -148,6 +148,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -130,6 +130,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -106,6 +106,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -88,6 +88,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -148,6 +148,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -130,6 +130,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -106,6 +106,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -88,6 +88,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -148,6 +148,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -130,6 +130,12 @@
"type": "object",
"default": {}
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default":
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
......
......@@ -112,6 +112,7 @@ extra-context =
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_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 max_frequency ${default-params:max-frequency}
......@@ -134,6 +135,7 @@ extra-context =
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_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 max_frequency ${default-params:max-frequency}
......
......@@ -10,6 +10,7 @@ default-lte-band = 39
default-lte-n-rb-dl = 100
default-lte-tx-gain = 78
default-lte-rx-gain = 40
default-lte-inactivity-timer =
default-lte-imsi = 001010123456789
default-lte-k = 00112233445566778899aabbccddeeff
......@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 1000
default-ssb-nr-arfcn = 377790
default-nr-inactivity-timer =
default-nr-imsi = 001010123456789
default-nr-k = 00112233445566778899aabbccddeeff
......
......@@ -10,6 +10,7 @@ default-lte-band = 38
default-lte-n-rb-dl = 100
default-lte-tx-gain = 78
default-lte-rx-gain = 40
default-lte-inactivity-timer =
default-lte-imsi = 001010123456789
default-lte-k = 00112233445566778899aabbccddeeff
......@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000
default-ssb-nr-arfcn = 517930
default-nr-inactivity-timer =
default-nr-imsi = 001010123456789
default-nr-k = 00112233445566778899aabbccddeeff
......
......@@ -10,6 +10,7 @@ default-lte-band = 42
default-lte-n-rb-dl = 100
default-lte-tx-gain = 78
default-lte-rx-gain = 40
default-lte-inactivity-timer =
default-lte-imsi = 001010123456789
default-lte-k = 00112233445566778899aabbccddeeff
......@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000
default-ssb-nr-arfcn = 632544
default-nr-inactivity-timer =
default-nr-imsi = 001010123456789
default-nr-k = 00112233445566778899aabbccddeeff
......
......@@ -10,6 +10,7 @@ default-lte-band = 43
default-lte-n-rb-dl = 100
default-lte-tx-gain = 78
default-lte-rx-gain = 40
default-lte-inactivity-timer =
default-lte-imsi = 001010123456789
default-lte-k = 00112233445566778899aabbccddeeff
......@@ -21,6 +22,7 @@ default-nr-tx-gain = 78
default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000
default-ssb-nr-arfcn = 646656
default-nr-inactivity-timer =
default-nr-imsi = 001010123456789
default-nr-k = 00112233445566778899aabbccddeeff
......
......@@ -10,6 +10,7 @@ default-lte-band = {{ default_lte_band }}
default-lte-n-rb-dl = {{ default_lte_n_rb_dl }}
default-lte-tx-gain = {{ default_lte_tx_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-k = {{ default_lte_k }}
......@@ -21,6 +22,7 @@ default-nr-tx-gain = {{ default_nr_tx_gain }}
default-nr-rx-gain = {{ default_nr_rx_gain }}
default-nr-ssb-pos-bitmap = {{ default_nr_ssb_pos_bitmap }}
default-ssb-nr-arfcn = {{ default_ssb_nr_arfcn }}
default-nr-inactivity-timer = {{ default_nr_inactivity_timer }}
default-nr-imsi = {{ default_nr_imsi }}
default-nr-k = {{ default_nr_k }}
......
......@@ -64,6 +64,7 @@ param_dict = {
'rue_addr': "192.168.99.88",
'n_antenna_dl': 2,
'n_antenna_ul': 2,
'inactivity_timer': 17,
'gnb_id': "0x17",
'ssb_pos_bitmap': "10",
'amf_list': {
......@@ -125,13 +126,14 @@ class TestGNBParameters2(ORSTestCase):
with open(conf_file, 'r') as f:
conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], self.param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], self.param_dict['rx_gain'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], self.param_dict['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], self.param_dict['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], self.param_dict['ssb_pos_bitmap'])
self.assertEqual(conf['nr_cell_default']['n_id_cell'], self.param_dict['pci'])
self.assertEqual(conf['gnb_id'], int(self.param_dict['gnb_id'], 16))
self.assertEqual(conf['tx_gain'], self.gnb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], self.gnb_param_dict['rx_gain'])
self.assertEqual(conf['inactivity_timer'], self.gnb_param_dict['inactivity_timer'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], self.gnb_param_dict['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], self.gnb_param_dict['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], self.gnb_param_dict['ssb_pos_bitmap'])
self.assertEqual(conf['nr_cell_default']['n_id_cell'], self.gnb_param_dict['pci'])
self.assertEqual(conf['gnb_id'], int(self.gnb_param_dict['gnb_id'], 16))
for p in conf['nr_cell_default']['plmn_list']:
for n in "plmn ranac reserved tac".split():
self.assertEqual(p[n], self.gnb_param_dict['plmn_list'][p['plmn']][n])
......@@ -153,6 +155,7 @@ def test_enb_conf(self):
conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
self.assertEqual(conf['inactivity_timer'], enb_param_dict['inactivity_timer'])
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['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
......
......@@ -64,6 +64,7 @@ param_dict = {
'rue_addr': "192.168.99.88",
'n_antenna_dl': 2,
'n_antenna_ul': 2,
'inactivity_timer': 17,
'gnb_id': "0x17",
'ssb_pos_bitmap': "10",
'amf_list': {
......@@ -125,13 +126,14 @@ class TestGNBParameters2(ORSTestCase):
with open(conf_file, 'r') as f:
conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], self.param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], self.param_dict['rx_gain'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], self.param_dict['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], self.param_dict['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], self.param_dict['ssb_pos_bitmap'])
self.assertEqual(conf['nr_cell_default']['n_id_cell'], self.param_dict['pci'])
self.assertEqual(conf['gnb_id'], int(self.param_dict['gnb_id'], 16))
self.assertEqual(conf['tx_gain'], self.gnb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], self.gnb_param_dict['rx_gain'])
self.assertEqual(conf['inactivity_timer'], self.gnb_param_dict['inactivity_timer'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], self.gnb_param_dict['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], self.gnb_param_dict['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], self.gnb_param_dict['ssb_pos_bitmap'])
self.assertEqual(conf['nr_cell_default']['n_id_cell'], self.gnb_param_dict['pci'])
self.assertEqual(conf['gnb_id'], int(self.gnb_param_dict['gnb_id'], 16))
for p in conf['nr_cell_default']['plmn_list']:
for n in "plmn ranac reserved tac".split():
self.assertEqual(p[n], self.gnb_param_dict['plmn_list'][p['plmn']][n])
......@@ -153,6 +155,7 @@ def test_enb_conf(self):
conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
self.assertEqual(conf['inactivity_timer'], enb_param_dict['inactivity_timer'])
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['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
......
......@@ -64,6 +64,7 @@ param_dict = {
'rue_addr': "192.168.99.88",
'n_antenna_dl': 2,
'n_antenna_ul': 2,
'inactivity_timer': 17,
'gnb_id': "0x17",
'ssb_pos_bitmap': "10",
'amf_list': {
......@@ -125,13 +126,14 @@ class TestGNBParameters2(ORSTestCase):
with open(conf_file, 'r') as f:
conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], self.param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], self.param_dict['rx_gain'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], self.param_dict['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], self.param_dict['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], self.param_dict['ssb_pos_bitmap'])
self.assertEqual(conf['nr_cell_default']['n_id_cell'], self.param_dict['pci'])
self.assertEqual(conf['gnb_id'], int(self.param_dict['gnb_id'], 16))
self.assertEqual(conf['tx_gain'], self.gnb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], self.gnb_param_dict['rx_gain'])
self.assertEqual(conf['inactivity_timer'], self.gnb_param_dict['inactivity_timer'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], self.gnb_param_dict['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], self.gnb_param_dict['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], self.gnb_param_dict['ssb_pos_bitmap'])
self.assertEqual(conf['nr_cell_default']['n_id_cell'], self.gnb_param_dict['pci'])
self.assertEqual(conf['gnb_id'], int(self.gnb_param_dict['gnb_id'], 16))
for p in conf['nr_cell_default']['plmn_list']:
for n in "plmn ranac reserved tac".split():
self.assertEqual(p[n], self.gnb_param_dict['plmn_list'][p['plmn']][n])
......@@ -153,6 +155,7 @@ def test_enb_conf(self):
conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
self.assertEqual(conf['inactivity_timer'], enb_param_dict['inactivity_timer'])
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['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
......
......@@ -64,6 +64,7 @@ param_dict = {
'rue_addr': "192.168.99.88",
'n_antenna_dl': 2,
'n_antenna_ul': 2,
'inactivity_timer': 17,
'gnb_id': "0x17",
'ssb_pos_bitmap': "10",
'amf_list': {
......@@ -125,13 +126,14 @@ class TestGNBParameters2(ORSTestCase):
with open(conf_file, 'r') as f:
conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], self.param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], self.param_dict['rx_gain'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], self.param_dict['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], self.param_dict['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], self.param_dict['ssb_pos_bitmap'])
self.assertEqual(conf['nr_cell_default']['n_id_cell'], self.param_dict['pci'])
self.assertEqual(conf['gnb_id'], int(self.param_dict['gnb_id'], 16))
self.assertEqual(conf['tx_gain'], self.gnb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], self.gnb_param_dict['rx_gain'])
self.assertEqual(conf['inactivity_timer'], self.gnb_param_dict['inactivity_timer'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], self.gnb_param_dict['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], self.gnb_param_dict['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], self.gnb_param_dict['ssb_pos_bitmap'])
self.assertEqual(conf['nr_cell_default']['n_id_cell'], self.gnb_param_dict['pci'])
self.assertEqual(conf['gnb_id'], int(self.gnb_param_dict['gnb_id'], 16))
for p in conf['nr_cell_default']['plmn_list']:
for n in "plmn ranac reserved tac".split():
self.assertEqual(p[n], self.gnb_param_dict['plmn_list'][p['plmn']][n])
......@@ -153,6 +155,7 @@ def test_enb_conf(self):
conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
self.assertEqual(conf['inactivity_timer'], enb_param_dict['inactivity_timer'])
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['cell_list'][0]['n_id_cell'], enb_param_dict['pci'])
......
......@@ -64,6 +64,7 @@ param_dict = {
'rue_addr': "192.168.99.88",
'n_antenna_dl': 2,
'n_antenna_ul': 2,
'inactivity_timer': 17,
'gnb_id': "0x17",
'ssb_pos_bitmap': "10",
'amf_list': {
......@@ -125,13 +126,14 @@ class TestGNBParameters2(ORSTestCase):
with open(conf_file, 'r') as f:
conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], self.param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], self.param_dict['rx_gain'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], self.param_dict['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], self.param_dict['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], self.param_dict['ssb_pos_bitmap'])
self.assertEqual(conf['nr_cell_default']['n_id_cell'], self.param_dict['pci'])
self.assertEqual(conf['gnb_id'], int(self.param_dict['gnb_id'], 16))
self.assertEqual(conf['tx_gain'], self.gnb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], self.gnb_param_dict['rx_gain'])
self.assertEqual(conf['inactivity_timer'], self.gnb_param_dict['inactivity_timer'])
self.assertEqual(conf['nr_cell_list'][0]['dl_nr_arfcn'], self.gnb_param_dict['dl_nr_arfcn'])
self.assertEqual(conf['nr_cell_list'][0]['band'], self.gnb_param_dict['nr_band'])
self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], self.gnb_param_dict['ssb_pos_bitmap'])
self.assertEqual(conf['nr_cell_default']['n_id_cell'], self.gnb_param_dict['pci'])
self.assertEqual(conf['gnb_id'], int(self.gnb_param_dict['gnb_id'], 16))
for p in conf['nr_cell_default']['plmn_list']:
for n in "plmn ranac reserved tac".split():
self.assertEqual(p[n], self.gnb_param_dict['plmn_list'][p['plmn']][n])
......@@ -153,6 +155,7 @@ def test_enb_conf(self):
conf = yaml.load(f)
self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
self.assertEqual(conf['inactivity_timer'], enb_param_dict['inactivity_timer'])
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['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