software/ors-amarisoft: add gnb_id_bits parameter

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

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,

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",

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",

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",

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",

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",

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",

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",

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",

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",

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])

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])

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])

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])

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])