diff --git a/software/ors-amarisoft/buildout.hash.cfg b/software/ors-amarisoft/buildout.hash.cfg index cb84bd24dbbd933024f3f444abe47173ca8343b1..db6942ed0d69757d8746a7b2a00c0f945811be9e 100644 --- a/software/ors-amarisoft/buildout.hash.cfg +++ b/software/ors-amarisoft/buildout.hash.cfg @@ -76,7 +76,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a [gnb.jinja2.cfg] filename = config/gnb.jinja2.cfg -md5sum = 2e051b91c39542152bc679ec78cb5926 +md5sum = cbbbdeda9ddaaf5957d91ef31afe6051 [ltelogs.jinja2.sh] filename = ltelogs.jinja2.sh diff --git a/software/ors-amarisoft/config/gnb.jinja2.cfg b/software/ors-amarisoft/config/gnb.jinja2.cfg index 453f0caf4793f92a55ff644281cedf76575c9055..85c53c9fb4f84c0a263e43a7cec41dcc3ecd135d 100644 --- a/software/ors-amarisoft/config/gnb.jinja2.cfg +++ b/software/ors-amarisoft/config/gnb.jinja2.cfg @@ -68,7 +68,7 @@ gtp_addr: "127.0.1.1", {% endif %} - gnb_id_bits: 28, + gnb_id_bits: {{ slapparameter_dict.get('gnb_id_bits', 28) }}, gnb_id: {{ slapparameter_dict.get('gnb_id', '0x12345') }}, nr_support: true, diff --git a/software/ors-amarisoft/instance-gnb-input-schema.json.jinja2 b/software/ors-amarisoft/instance-gnb-input-schema.json.jinja2 index c5a6a3b763f73f2d32c1ac6387fdbcb3b6a4945b..8b948fd13623305d33a6bc66c2aa62e1bc6cf874 100644 --- a/software/ors-amarisoft/instance-gnb-input-schema.json.jinja2 +++ b/software/ors-amarisoft/instance-gnb-input-schema.json.jinja2 @@ -87,6 +87,12 @@ "type": "string", "default": "0x12345" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, "pci": { "title": "Physical Cell ID", "description": "Physical Cell ID", diff --git a/software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json b/software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json index 0c0288b7ac513fd09af18f5aa50242cbbe436caf..baec8f78fb2dd31fa48b1b4e2a29b34d8c0ae14f 100644 --- a/software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json +++ b/software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json @@ -85,6 +85,12 @@ "type": "string", "default": "0x12345" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, "pci": { "title": "Physical Cell ID", "description": "Physical Cell ID", diff --git a/software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json b/software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json index d99a507fab7cc4bbb7de4cb14080038b53d072c9..ac70530017cce5ab52195482e4819ad07e804dc0 100644 --- a/software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json +++ b/software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json @@ -67,6 +67,12 @@ "type": "string", "default": "0x12345" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, "pci": { "title": "Physical Cell ID", "description": "Physical Cell ID", diff --git a/software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json b/software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json index 38bff47459ea9177a738cfd15cbb0e6424c69250..382af4dd2f3136f5a98bc735b2f3da946df8cf81 100644 --- a/software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json +++ b/software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json @@ -85,6 +85,12 @@ "type": "string", "default": "0x12345" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, "pci": { "title": "Physical Cell ID", "description": "Physical Cell ID", diff --git a/software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json b/software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json index f5f2a0bdaf1b8b53fc837e210b77a57accc37f91..47b2f1630665c51e158f70a9c7854e4c727d9310 100644 --- a/software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json +++ b/software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json @@ -67,6 +67,12 @@ "type": "string", "default": "0x12345" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, "pci": { "title": "Physical Cell ID", "description": "Physical Cell ID", diff --git a/software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json b/software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json index 182c30221fbe66d4291456146095a98499200e7c..e397ab17e46e86a2975b1c3d83e162ed964e8c62 100644 --- a/software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json +++ b/software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json @@ -85,6 +85,12 @@ "type": "string", "default": "0x12345" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, "pci": { "title": "Physical Cell ID", "description": "Physical Cell ID", diff --git a/software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json b/software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json index 76b47e22243f434bda9f3fa04b0172e2edae902e..8218a7a45f5189a76d5c4c806dc74756a2a710ed 100644 --- a/software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json +++ b/software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json @@ -67,6 +67,12 @@ "type": "string", "default": "0x12345" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, "pci": { "title": "Physical Cell ID", "description": "Physical Cell ID", diff --git a/software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json b/software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json index 830c0ba151e9f747a92d3c4a7c9da28b8e201d7f..a986213813e8e201b40403f3537bda65ff93f92a 100644 --- a/software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json +++ b/software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json @@ -85,6 +85,12 @@ "type": "string", "default": "0x12345" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, "pci": { "title": "Physical Cell ID", "description": "Physical Cell ID", diff --git a/software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json b/software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json index 873779c6d31c53d74f5dd831e9fbfeac2d9e1302..a1e976442646326d6cfceb8d12b22cbc91ec183d 100644 --- a/software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json +++ b/software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json @@ -67,6 +67,12 @@ "type": "string", "default": "0x12345" }, + "gnb_id_bits": { + "title": "gNB ID bits", + "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", + "type": "number", + "default": 28 + }, "pci": { "title": "Physical Cell ID", "description": "Physical Cell ID", diff --git a/software/ors-amarisoft/test/test.jinja2.py b/software/ors-amarisoft/test/test.jinja2.py index 1d3d8ce225eed9ab0a341c61bf21a1d4ec0b5d28..464e221738bb7e357eb4b170ca752d3c4e86dffa 100644 --- a/software/ors-amarisoft/test/test.jinja2.py +++ b/software/ors-amarisoft/test/test.jinja2.py @@ -66,6 +66,7 @@ param_dict = { 'n_antenna_ul': 2, 'inactivity_timer': 17, 'gnb_id': "0x17", + 'gnb_id_bits': 30, 'ssb_pos_bitmap': "10", 'amf_list': { '10.0.0.1': {'amf_addr': '10.0.0.1'}, @@ -133,6 +134,7 @@ def test_gnb_conf1(self): self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap']) self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci']) self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16)) + self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits']) for p in conf['nr_cell_default']['plmn_list']: for n in "plmn ranac reserved tac".split(): self.assertEqual(p[n], gnb_param_dict1['plmn_list'][p['plmn']][n]) diff --git a/software/ors-amarisoft/test/testTDD1900.py b/software/ors-amarisoft/test/testTDD1900.py index 407444a4eb53ae066ca5c5bd0efef637c9be6f13..06ff29015afa1fec70418efa943d5cb2aba334cf 100644 --- a/software/ors-amarisoft/test/testTDD1900.py +++ b/software/ors-amarisoft/test/testTDD1900.py @@ -66,6 +66,7 @@ param_dict = { 'n_antenna_ul': 2, 'inactivity_timer': 17, 'gnb_id': "0x17", + 'gnb_id_bits': 30, 'ssb_pos_bitmap': "10", 'amf_list': { '10.0.0.1': {'amf_addr': '10.0.0.1'}, @@ -133,6 +134,7 @@ def test_gnb_conf1(self): self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap']) self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci']) self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16)) + self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits']) for p in conf['nr_cell_default']['plmn_list']: for n in "plmn ranac reserved tac".split(): self.assertEqual(p[n], gnb_param_dict1['plmn_list'][p['plmn']][n]) diff --git a/software/ors-amarisoft/test/testTDD2600.py b/software/ors-amarisoft/test/testTDD2600.py index a0d1d6ca3aea39b4fcb4e6754d7d656572f85b90..a831a197b9705851fca41825fd2ba8254b8eeb63 100644 --- a/software/ors-amarisoft/test/testTDD2600.py +++ b/software/ors-amarisoft/test/testTDD2600.py @@ -66,6 +66,7 @@ param_dict = { 'n_antenna_ul': 2, 'inactivity_timer': 17, 'gnb_id': "0x17", + 'gnb_id_bits': 30, 'ssb_pos_bitmap': "10", 'amf_list': { '10.0.0.1': {'amf_addr': '10.0.0.1'}, @@ -133,6 +134,7 @@ def test_gnb_conf1(self): self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap']) self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci']) self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16)) + self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits']) for p in conf['nr_cell_default']['plmn_list']: for n in "plmn ranac reserved tac".split(): self.assertEqual(p[n], gnb_param_dict1['plmn_list'][p['plmn']][n]) diff --git a/software/ors-amarisoft/test/testTDD3500.py b/software/ors-amarisoft/test/testTDD3500.py index 04266908af963e50e660684cc9a5197434523e88..4a35264acefb63604d49ef6ad90130c5b35a4d48 100644 --- a/software/ors-amarisoft/test/testTDD3500.py +++ b/software/ors-amarisoft/test/testTDD3500.py @@ -66,6 +66,7 @@ param_dict = { 'n_antenna_ul': 2, 'inactivity_timer': 17, 'gnb_id': "0x17", + 'gnb_id_bits': 30, 'ssb_pos_bitmap': "10", 'amf_list': { '10.0.0.1': {'amf_addr': '10.0.0.1'}, @@ -133,6 +134,7 @@ def test_gnb_conf1(self): self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap']) self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci']) self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16)) + self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits']) for p in conf['nr_cell_default']['plmn_list']: for n in "plmn ranac reserved tac".split(): self.assertEqual(p[n], gnb_param_dict1['plmn_list'][p['plmn']][n]) diff --git a/software/ors-amarisoft/test/testTDD3700.py b/software/ors-amarisoft/test/testTDD3700.py index 3b8586dbd5d709e7ad3dbed5097f34c0f9330f63..0741f51ff4e243eb54e12def67d226ca7192de60 100644 --- a/software/ors-amarisoft/test/testTDD3700.py +++ b/software/ors-amarisoft/test/testTDD3700.py @@ -66,6 +66,7 @@ param_dict = { 'n_antenna_ul': 2, 'inactivity_timer': 17, 'gnb_id': "0x17", + 'gnb_id_bits': 30, 'ssb_pos_bitmap': "10", 'amf_list': { '10.0.0.1': {'amf_addr': '10.0.0.1'}, @@ -133,6 +134,7 @@ def test_gnb_conf1(self): self.assertEqual(conf['nr_cell_list'][0]['ssb_pos_bitmap'], gnb_param_dict1['ssb_pos_bitmap']) self.assertEqual(conf['nr_cell_default']['n_id_cell'], gnb_param_dict1['pci']) self.assertEqual(conf['gnb_id'], int(gnb_param_dict1['gnb_id'], 16)) + self.assertEqual(conf['gnb_id_bits'], gnb_param_dict1['gnb_id_bits']) for p in conf['nr_cell_default']['plmn_list']: for n in "plmn ranac reserved tac".split(): self.assertEqual(p[n], gnb_param_dict1['plmn_list'][p['plmn']][n])