software/ors-amarisoft: Move rf_config code from enb.jinja2.cfg -> to slaplte.jinja2

To handle multiple radio units we will need to rework this code significantly.
Move this to a dedicated routine as a preparatory step. The code moves out of
enb.cfg because later it will be also used in UEsim to configure simulator
radio units as well.

No non-whitespace changes in rendered enb.cfg and gnb.cfg .

/cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus

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

@@ -106,94 +106,9 @@
     ,file.rotate=1G,file.path=/dev/null",
   log_filename: "{{ directory['log'] }}/enb.log",
 
-{% if ru.ru_type == "lopcomm" %}
-  rf_driver: {
-{%- if slapparameter_dict.get('disable_sdr', False) %}
-      name: "dummy",
-{%- else %}
-      name: "sdr",
-{%- endif %}
-        args: "dev0=
-        {%- for i, k in enumerate(cell_list) %}
-        {%- set cpri_port = cell_list[k].cpri_port_number %}
-        {%- if i != 0 -%}
-        ,
-        {%- endif -%}
-          /dev/sdr{{ slapparameter_dict.get('sdr_number', 0) }}@{{ cpri_port }}
-        {%- endfor -%}
-        ",
-      cpri_mapping: "hw",
-      {%- set cpri_mult = slapparameter_dict.get('cpri_mult', 16) %}
-      cpri_mult: "
-        {%- for i, k in enumerate(cell_list) %}
-        {%- if i != 0 -%}
-        ,
-        {%- endif -%}
-          {{ cpri_mult }}
-        {%- endfor -%}
-        ",
-      cpri_rx_delay: "
-        {%- for i, k in enumerate(cell_list) %}
-        {%- if i != 0 -%}
-        ,
-        {%- endif -%}
-          {{ cell_list[k].get('cpri_rx_delay', 0) }}
-        {%- endfor -%}
-        ",
-      cpri_tx_delay: "
-        {%- for i, k in enumerate(cell_list) %}
-        {%- if i != 0 -%}
-        ,
-        {%- endif -%}
-          {{ cell_list[k].get('cpri_tx_delay', 0) }}
-        {%- endfor -%}
-        ",
-      cpri_tx_dbm: "
-        {%- for i, k in enumerate(cell_list) %}
-        {%- if i != 0 -%}
-        ,
-        {%- endif -%}
-          {{ cell_list[k].get('cpri_tx_dbm', 0) }}
-        {%- endfor -%}
-        ",
-      ifname: "{{ cell_list.values() | map(attribute='_tap') | join(',') }}",
-  },
-  tx_gain: 0,
-  rx_gain: 0,
-{% elif ru.ru_type == "m2ru" %}
-  rf_driver: {
-{%- if slapparameter_dict.get('disable_sdr', False) %}
-      name: "dummy",
-{%- else %}
-      name: "sdr",
-{%- endif %}
-      args: "dev0=/dev/sdr0@0",
-      cpri_mapping: "bf1",
-      cpri_mult: 16,
-      cpri_rx_delay: 11.0,
-      cpri_tx_delay: 0,
-      ifname: "cpri0",
-      cpri_tx_dbm: 42.0,
-  },
-  tx_gain: 0,
-  rx_gain: 0,
-{% elif ors %}
-  rf_driver: {
-{%- if slapparameter_dict.get('disable_sdr', False) %}
-      name: "dummy",
-{%- else %}
-      name: "sdr",
-{%- endif %}
-      args: "dev0=/dev/sdr0",
-{% if slapparameter_dict.get('gps_sync', False) %}
-      sync: "gps",
-{% endif %}
-      rx_antenna:"tx_rx",
-      tdd_tx_mod: 1,
-  },
-  tx_gain: {{ tx_gain }},
-  rx_gain: {{ rx_gain }},
-{% endif %}
+{# instantiate radio units #}
+{{ slaplte.ru_config(ru, cell_list, slapparameter_dict) }}
+
   {%- if slapparameter_dict.get('websocket_password', '') %}
   com_addr: "[{{ gtp_addr_v6 }}]:{{ slap_configuration['configuration.com_ws_port'] }}",
   com_auth: {

software/ors-amarisoft/slaplte.jinja2

 {#- Package slaplte provides helpers for configuring Amarisoft LTE services in SlapOS.
 
     - load_cell initializes cell registry.
+    - ru_config emits RF driver configuration for specified Radio Units.
 
     The following utilities are also provided:
 
@@ -68,5 +69,99 @@
 {%-     endif %}
 {%-     do cell.update({'_tap': ru_tap})  %}
 {%-   endfor  %}
+{%- endmacro  %}
+
+
+{#- ---- building configuration ---- #}
 
+{#- ru_config emits RF driver configuration for specified Radio Units. #}
+{%- macro ru_config(ru, cell_list, slapparameter_dict) %}
+{% if ru.ru_type == "lopcomm" %}
+  rf_driver: {
+{%- if slapparameter_dict.get('disable_sdr', False) %}
+      name: "dummy",
+{%- else %}
+      name: "sdr",
+{%- endif %}
+        args: "dev0=
+        {%- for i, k in enumerate(cell_list) %}
+        {%- set cpri_port = cell_list[k].cpri_port_number %}
+        {%- if i != 0 -%}
+        ,
+        {%- endif -%}
+          /dev/sdr{{ slapparameter_dict.get('sdr_number', 0) }}@{{ cpri_port }}
+        {%- endfor -%}
+        ",
+      cpri_mapping: "hw",
+      {%- set cpri_mult = slapparameter_dict.get('cpri_mult', 16) %}
+      cpri_mult: "
+        {%- for i, k in enumerate(cell_list) %}
+        {%- if i != 0 -%}
+        ,
+        {%- endif -%}
+          {{ cpri_mult }}
+        {%- endfor -%}
+        ",
+      cpri_rx_delay: "
+        {%- for i, k in enumerate(cell_list) %}
+        {%- if i != 0 -%}
+        ,
+        {%- endif -%}
+          {{ cell_list[k].get('cpri_rx_delay', 0) }}
+        {%- endfor -%}
+        ",
+      cpri_tx_delay: "
+        {%- for i, k in enumerate(cell_list) %}
+        {%- if i != 0 -%}
+        ,
+        {%- endif -%}
+          {{ cell_list[k].get('cpri_tx_delay', 0) }}
+        {%- endfor -%}
+        ",
+      cpri_tx_dbm: "
+        {%- for i, k in enumerate(cell_list) %}
+        {%- if i != 0 -%}
+        ,
+        {%- endif -%}
+          {{ cell_list[k].get('cpri_tx_dbm', 0) }}
+        {%- endfor -%}
+        ",
+      ifname: "{{ cell_list.values() | map(attribute='_tap') | join(',') }}",
+  },
+  tx_gain: 0,
+  rx_gain: 0,
+{% elif ru.ru_type == "m2ru" %}
+  rf_driver: {
+{%- if slapparameter_dict.get('disable_sdr', False) %}
+      name: "dummy",
+{%- else %}
+      name: "sdr",
+{%- endif %}
+      args: "dev0=/dev/sdr0@0",
+      cpri_mapping: "bf1",
+      cpri_mult: 16,
+      cpri_rx_delay: 11.0,
+      cpri_tx_delay: 0,
+      ifname: "cpri0",
+      cpri_tx_dbm: 42.0,
+  },
+  tx_gain: 0,
+  rx_gain: 0,
+{% elif ors %}
+  rf_driver: {
+{%- if slapparameter_dict.get('disable_sdr', False) %}
+      name: "dummy",
+{%- else %}
+      name: "sdr",
+{%- endif %}
+      args: "dev0=/dev/sdr0",
+{% if slapparameter_dict.get('gps_sync', False) %}
+      sync: "gps",
+{% endif %}
+      rx_antenna:"tx_rx",
+      tdd_tx_mod: 1,
+  },
+  tx_gain: {{ tx_gain }},
+  rx_gain: {{ rx_gain }},
+{% endif %}
 {%- endmacro  %}