software/ors-amarisoft: enb: Push CPRI-related properties to be per-RU

Most were already so, but sdr_number and cpri_mult were not. We need to be able
to use different SDR boards and with different CPRI speed, so make those
parameters to be per-RU as well.

Backward compatibility: no change for ORS; For CPRI-based cases sdr_number and cpri_mult become per-RU.

software/ors-amarisoft/instance-enb-input-schema.json.jinja2

@@ -49,26 +49,6 @@
       "default": "[Configuration 2] 5ms 2UL 6DL (default)"
     },
 {%- endif %}
-{%- if trx == 'cpri' %}
-    "sdr_number": {
-      "title": "SDR Number",
-      "description": "SDR Number",
-      "type": "number",
-      "default": 0
-    },
-    "cpri_mult": {
-      "title": "CPRI Mult",
-      "description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
-      "type": "number",
-      "default": 16,
-      "enum": [
-        4,
-        5,
-        8,
-        16
-      ]
-    },
-{%- endif %}
 {%- if bbu == 'ors' %}
     "dl_earfcn": {
       "title": "DL EARFCN",
@@ -107,6 +87,24 @@
         ".*": {
           "properties": {
 {%- if trx == 'cpri' %}
+            "sdr_number": {
+              "title": "SDR Number",
+              "description": "SDR Number",
+              "type": "number",
+              "default": 0
+            },
+            "cpri_mult": {
+              "title": "CPRI Mult",
+              "description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
+              "type": "number",
+              "default": 16,
+              "enum": [
+                4,
+                5,
+                8,
+                16
+              ]
+            },
             "cpri_rx_delay": {
               "title": "CPRI RX Delay",
               "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",

software/ors-amarisoft/instance-fdd-lopcomm-enb-input-schema.json

@@ -29,6 +29,12 @@
       "type": "number",
       "default": 2
     },
+    "cell_list": {
+      "title": "Cell List",
+      "description": "Cell List",
+      "patternProperties": {
+        ".*": {
+          "properties": {
             "sdr_number": {
               "title": "SDR Number",
               "description": "SDR Number",
@@ -47,12 +53,6 @@
                 16
               ]
             },
-    "cell_list": {
-      "title": "Cell List",
-      "description": "Cell List",
-      "patternProperties": {
-        ".*": {
-          "properties": {
             "cpri_rx_delay": {
               "title": "CPRI RX Delay",
               "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",

software/ors-amarisoft/instance-fdd-lopcomm-gnb-input-schema.json

@@ -21,24 +21,6 @@
       "type": "number",
       "default": 2
     },
-    "sdr_number": {
-      "title": "SDR Number",
-      "description": "SDR Number",
-      "type": "number",
-      "default": 0
-    },
-    "cpri_mult": {
-      "title": "CPRI Mult",
-      "description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
-      "type": "number",
-      "default": 16,
-      "enum": [
-        4,
-        5,
-        8,
-        16
-      ]
-    },
     "dl_nr_arfcn": {
       "title": "DL NR ARFCN",
       "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
@@ -73,6 +55,24 @@
       "patternProperties": {
         ".*": {
           "properties": {
+            "sdr_number": {
+              "title": "SDR Number",
+              "description": "SDR Number",
+              "type": "number",
+              "default": 0
+            },
+            "cpri_mult": {
+              "title": "CPRI Mult",
+              "description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
+              "type": "number",
+              "default": 16,
+              "enum": [
+                4,
+                5,
+                8,
+                16
+              ]
+            },
             "cpri_rx_delay": {
               "title": "CPRI RX Delay",
               "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",

software/ors-amarisoft/instance-gnb-input-schema.json.jinja2

@@ -41,26 +41,6 @@
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },
-{%- endif %}
-{%- if trx == 'cpri' %}
-    "sdr_number": {
-      "title": "SDR Number",
-      "description": "SDR Number",
-      "type": "number",
-      "default": 0
-    },
-    "cpri_mult": {
-      "title": "CPRI Mult",
-      "description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
-      "type": "number",
-      "default": 16,
-      "enum": [
-        4,
-        5,
-        8,
-        16
-      ]
-    },
 {%- endif %}
     "dl_nr_arfcn": {
       "title": "DL NR ARFCN",
@@ -98,6 +78,24 @@
         ".*": {
           "properties": {
 {%- if trx == 'cpri' %}
+            "sdr_number": {
+              "title": "SDR Number",
+              "description": "SDR Number",
+              "type": "number",
+              "default": 0
+            },
+            "cpri_mult": {
+              "title": "CPRI Mult",
+              "description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
+              "type": "number",
+              "default": 16,
+              "enum": [
+                4,
+                5,
+                8,
+                16
+              ]
+            },
             "cpri_rx_delay": {
               "title": "CPRI RX Delay",
               "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",

software/ors-amarisoft/instance-tdd-m2ru-enb-input-schema.json

@@ -39,6 +39,12 @@
       ],
       "default": "[Configuration 2] 5ms 2UL 6DL (default)"
     },
+    "cell_list": {
+      "title": "Cell List",
+      "description": "Cell List",
+      "patternProperties": {
+        ".*": {
+          "properties": {
             "sdr_number": {
               "title": "SDR Number",
               "description": "SDR Number",
@@ -57,12 +63,6 @@
                 16
               ]
             },
-    "cell_list": {
-      "title": "Cell List",
-      "description": "Cell List",
-      "patternProperties": {
-        ".*": {
-          "properties": {
             "cpri_rx_delay": {
               "title": "CPRI RX Delay",
               "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",

software/ors-amarisoft/instance-tdd-m2ru-gnb-input-schema.json

@@ -32,24 +32,6 @@
       ],
       "default": "5ms 2UL 7DL 4/6 (default)"
     },
-    "sdr_number": {
-      "title": "SDR Number",
-      "description": "SDR Number",
-      "type": "number",
-      "default": 0
-    },
-    "cpri_mult": {
-      "title": "CPRI Mult",
-      "description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
-      "type": "number",
-      "default": 16,
-      "enum": [
-        4,
-        5,
-        8,
-        16
-      ]
-    },
     "dl_nr_arfcn": {
       "title": "DL NR ARFCN",
       "description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
@@ -84,6 +66,24 @@
       "patternProperties": {
         ".*": {
           "properties": {
+            "sdr_number": {
+              "title": "SDR Number",
+              "description": "SDR Number",
+              "type": "number",
+              "default": 0
+            },
+            "cpri_mult": {
+              "title": "CPRI Mult",
+              "description": "Select the CPRI line bit rate in terms of multiple of option 1 (614.4 Mbps). E.g set 4 for option 3, 8 for option 5 and 16 for option 7.",
+              "type": "number",
+              "default": 16,
+              "enum": [
+                4,
+                5,
+                8,
+                16
+              ]
+            },
             "cpri_rx_delay": {
               "title": "CPRI RX Delay",
               "description": "Delays between TX and RX position in CPRI frame. This should be set to the value of (T2a + T3a - Toffset) provided by the RRH specification.",

software/ors-amarisoft/slaplte.jinja2

@@ -16,6 +16,7 @@
         'n_antenna_ul': int(default_n_antenna_ul),
       },
       'ru/cpri_link': {
+        'mult':     16,
         'rx_delay':  0,
         'tx_delay':  0,
         'tx_dbm':    0,
@@ -117,9 +118,8 @@
                         'rx_gain': 0,
           })  %}
 {%-       set link = {
-                'sdr_dev':  slapparameter_dict.get('sdr_number', 0),
+                'sdr_dev':  cell.get('sdr_number', 0),
                 'sfp_port': cell.get('cpri_port_number', i),
-                'mult':     slapparameter_dict.get('cpri_mult', 16),
           }  %}
 {%-       macro link_set(name)  %}
 {%-         set cname = 'cpri_'+name  %}
@@ -127,6 +127,7 @@
 {%-           do link.update({name: cell[cname]}) %}
 {%-         endif %}
 {%-       endmacro  %}
+{%-       do link_set('mult') %}
 {%-       do link_set('rx_delay') %}
 {%-       do link_set('tx_delay') %}
 {%-       do link_set('tx_dbm') %}