.

software/ors-amarisoft/ru/lopcomm/cu_config.jinja2.xml

@@ -89,15 +89,31 @@
 
             <!-- TX/RX carriers -->
             <!-- XXX error with "TODO" do not support multiple cells over 1 RU -->
+{%- if cell.cell_type == 'lte' %}
+{%-   set dl_arfcn = cell.dl_earfcn %}
+{%-   set dl_freq  = XXX            %}
+{%-   set ul_arfcn = XXX            %}
+{%-   set ul_freq  = XXX            %}
+{%-   set bw       = int(float(cell.bandwidth.removesuffix(' MHz')) * 1E6)   %}
+{%- elif cell.cell_type == 'nr' %}
+{%-   set dl_arfcn = cell.dl_nr_arfcn %}
+{%-   set dl_freq  = nrarfcn.get_frequency(dl_arfcn)  %}
+{%-   set ul_arfcn = XXX            %}
+{%-   set ul_freq  = XXX            %}
+{%-   set bw       = int(cell.bandwidth * 1E6)   %}
+{%- else %}
+{%-   do bug('unreachable') %}
+{%- endif %}
+
 
             <tx-array-carriers>
-              <name>{{ TxCarrier }}</name>
-	           <absolute-frequency-center>{{ slapparameter_dict.get('dl_earfcn', 300) }}</absolute-frequency-center>
+               <name>{{ TxCarrier }}</name>
+	       <absolute-frequency-center>{{ dl_arfcn }}</absolute-frequency-center>
                <center-of-channel-bandwidth>{{ 1000000*slapparameter_dict.get('txa0cc00_center_frequency', 2140) }}</center-of-channel-bandwidth>
-               <channel-bandwidth>{{ {'1.4 MHz': 1400000, '3 MHz': 3000000, '5 MHz': 5000000, '10 MHz': 10000000, '15 MHz': 15000000, '20 MHz': 20000000}.get(slapparameter_dict.get('bandwidth'), '20 MHz') }}</channel-bandwidth>	
+               <channel-bandwidth>{{ bw }}</channel-bandwidth>	
                <active>{{ slapparameter_dict.get('txa0cc00_active', 'INACTIVE') }}</active>
-               <rw-type>LTE</rw-type>
-               <rw-duplex-scheme>FDD</rw-duplex-scheme>
+               <rw-type>{{ cell.cell_type | upper }}</rw-type>
+               <rw-duplex-scheme>{{ cell.rf_mode | upper }}</rw-duplex-scheme>
                <gain>{{ ru.tx_gain }}</gain>
                <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
                <downlink-sfn-offset>0</downlink-sfn-offset>
@@ -106,7 +122,7 @@
                <name>{{ RxCarrier }}</name>
                <absolute-frequency-center>{{ slapparameter_dict.get('rxa0cc00_center_frequency_earfcn', 18300) }}</absolute-frequency-center>	
                <center-of-channel-bandwidth>{{ 1000000*slapparameter_dict.get('rxa0cc00_center_frequency', 1950) }}</center-of-channel-bandwidth>	
-               <channel-bandwidth>{{ {'1.4 MHz': 1400000, '3 MHz': 3000000, '5 MHz': 5000000, '10 MHz': 10000000, '15 MHz': 15000000, '20 MHz': 20000000}.get(slapparameter_dict.get('bandwidth'), '20 MHz') }}</channel-bandwidth>	
+               <channel-bandwidth>{{ bw }}</channel-bandwidth>	
                <active>{{ slapparameter_dict.get('rxa0cc00_active', 'INACTIVE') }}</active>
                <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
                <downlink-sfn-offset>0</downlink-sfn-offset>

software/ors-amarisoft/ru/lopcomm/input-schema.json

@@ -62,24 +62,6 @@
         "INACTIVE"
       ]
     },
-    "txa0cc00_center_frequency": {
-      "title": "DL Center Frequency in MHz (TXA0CC00)",
-      "description": "Center Frequency in MHz (TXA0CC00)",
-      "type": "number",
-      "default": 2140
-    },
-    "rxa0cc00_center_frequency_earfcn": {
-      "title": "Center Frequency EARFCN (RXA0CC00)",
-      "description": "Center Frequency EARFCN (RXA0CC00)",
-      "type": "number",
-      "default": 18300
-    },
-    "rxa0cc00_center_frequency": {
-      "title": "UL Center Frequency in MHz (RXA0CC00)",
-      "description": "Center Frequency in MHz (RXA0CC00)",
-      "type": "number",
-      "default": 1950
-    },
     "user-authorized-key": {
       "title": "User Authorized Key",
       "description": "SSH public key in order to connect to the SSH server of this instance.",