.

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

@@ -587,7 +587,6 @@
 
           subcarrier_spacing: 30,
           ssb_pos_bitmap: {{ cell['ssb_pos_bitmap'] }},
-        },
 
         // XXX peers for HO
 
@@ -603,38 +602,42 @@
         {%- endif -%}
         {%- endif %}
 
-{% if tdd_config == 1 %}
-    tdd_ul_dl_config: {
-      pattern1: {
-        period: 5,
-        dl_slots: 7,
-        dl_symbols: 6,
-        ul_slots: 2,
-        ul_symbols: 4,
-      },
-    },
-{% elif tdd_config == 2 %}
-    tdd_ul_dl_config: {
-      pattern1: {
-        period: 2.5,
-        dl_slots: 3,
-        dl_symbols: 10,
-        ul_slots: 1,
-        ul_symbols: 2,
-      },
-    },
-{% 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,
-      },
-    },
-{% endif %}
+{%-       set tdd = (cell['rf_mode'] == 'tdd') %}
+{%-       set tdd_config = lte.nr_cell_tdd_config(cell) }},   // XXX None if fdd
+
+{%        if tdd_config == 1 %}
+           tdd_ul_dl_config: {
+             pattern1: {
+               period: 5,
+               dl_slots: 7,
+               dl_symbols: 6,
+               ul_slots: 2,
+               ul_symbols: 4,
+             },
+           },
+{%        elif tdd_config == 2 %}
+           tdd_ul_dl_config: {
+             pattern1: {
+               period: 2.5,
+               dl_slots: 3,
+               dl_symbols: 10,
+               ul_slots: 1,
+               ul_symbols: 2,
+             },
+           },
+{%        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,
+             },
+           },
+{%        endif %}
 
+        },
 
 {%-   endif %}
 {%- endfor %}