software/ors-amarisoft: Add high UL TDD config

software/ors-amarisoft/buildout.hash.cfg

@@ -112,7 +112,7 @@ md5sum = 3b901e8733e6afff8940c6c318da4493
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 923fa61851fbabad6480dbc2e0a2a67d
+md5sum = e4b87bfed4ec244f7fee62b4b925a13f
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg

software/ors-amarisoft/cell/nr/input-schema.json

@@ -24,7 +24,8 @@
       "enum": [
         "5ms 2UL 7DL 4/6 (default)",
         "2.5ms 1UL 3DL 2/10",
-        "5ms 8UL 1DL 2/10 (maximum uplink)"
+        "5ms 8UL 1DL 2/10 (maximum uplink)",
+        "5ms 6UL 3DL 10/2 (high uplink)"
       ],
       "default": "5ms 2UL 7DL 4/6 (default)",
       "options": {

software/ors-amarisoft/config/enb.jinja2.cfg

@@ -539,7 +539,8 @@
 {%-     set tdd_config =
             {'5ms 2UL 7DL 4/6 (default)':         1,
              '2.5ms 1UL 3DL 2/10':                2,
-             '5ms 8UL 1DL 2/10 (maximum uplink)': 3}
+             '5ms 8UL 1DL 2/10 (maximum uplink)': 3,
+             '5ms 6UL 3DL 10/2 (high uplink)':    4}
             [cell.tdd_ul_dl_config]
             if tdd  else None  %}
 {%      if tdd_config == 1 %}
@@ -563,13 +564,23 @@
            },
          },
 {%      elif tdd_config == 3 %}
+         tdd_ul_dl_config: {
+           pattern1: {
+              period: 5, /* in ms */
+              dl_slots: 1,
+              dl_symbols: 10,
+              ul_slots: 8,
+              ul_symbols: 2,
+           },
+         },
+{%      elif tdd_config == 4 %}
          tdd_ul_dl_config: {
            pattern1: {
               period: 5, /* in ms */
               dl_slots: 3,
               dl_symbols: 2,
               ul_slots: 6,
-              ul_symbols: 11,
+              ul_symbols: 10,
            },
          },
 {%      endif %}

software/ors-amarisoft/test/test_ors.py

@@ -95,7 +95,7 @@ param_dict = {
             'tac': 2
         },
     },
-    'xn_peers': {
+    'xn_peertdds': {
         '2001:db8::1': {
             'xn_addr': '2001:db8::1',
         },
@@ -123,7 +123,7 @@ gnb_param_dict2 = {
         '0x171717': {'sd': '0x171717', 'sst': 10},
         '0x181818': {'sd': '0x181818', 'sst': 20},
     },
-    'tdd_ul_dl_config': '2.5ms 1UL 3DL 2/10',
+    'tdd_ul_dl_config': '5ms 6UL 3DL 10/2 (high uplink)',
 }
 enb_param_dict.update(param_dict)
 gnb_param_dict1.update(param_dict)
@@ -217,6 +217,26 @@ def test_gnb_conf2(self):
     self.assertEqual(sd, gnb_param_dict2['nssai'][sd]['sd'], 16)
     self.assertEqual(p['sst'], gnb_param_dict2['nssai'][sd]['sst'])
 
+  tdd_config = conf['nr_cell_list'][0]['tdd_ul_dl_config']['pattern1']
+  self.assertEqual(float(tdd_config['period']), 5)
+  self.assertEqual(int(tdd_config['dl_slots']), 3)
+  self.assertEqual(int(tdd_config['dl_symbols']), 2)
+  self.assertEqual(int(tdd_config['ul_slots']), 6)
+  self.assertEqual(int(tdd_config['ul_symbols']), 10)
+
+def test_gnb_conf(self):
+
+  conf_file = glob.glob(os.path.join(
+    self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
+
+  conf = yamlpp_load(conf_file)
+
+  for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
+    sd = hex(p['sd'])
+    self.assertEqual(sd, gnb_param_dict2['nssai'][sd]['sd'], 16)
+    self.assertEqual(p['sst'], gnb_param_dict2['nssai'][sd]['sst'])
+
+
 def test_mme_conf(self):
 
   conf_file = glob.glob(os.path.join(