.

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

-# XXX <-> rrh_lopcomm
+# XXX <-> ru_lopcomm
 {% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
 dhcp-leasefile={{ directory['etc'] }}/dnsmasq.leases
 port=5354

software/ors-amarisoft/config/enb.cfg

@@ -6,10 +6,10 @@
   rf_driver: {
       name: "sdr",    
 
-      args: "dev0=/dev/sdr3,dev1=/dev/sdr4,dev2=/dev/sdr2@0,dev3=/dev/sdr2@1",
+      args: "dev0=/dev/sdr0,dev1=/dev/sdr1,dev2=/dev/sdr2@0,dev3=/dev/sdr2@1",
       rx_antenna:"tx_rx",
       tdd_tx_mod: 1,
-      cpri_mapping:  ",,bf1,bf1",
+      cpri_mapping:  ",,standard,standard",
       cpri_mult:     ",,8,8",
       cpri_rx_delay: ",,10,10",
       cpri_tx_delay: ",,11,11",
@@ -37,7 +37,7 @@
 
   enb_id: 0x1A2D0,
 
-  # LTE cells
+  // LTE cells
   cell_list: [
 
         // CELL1_a
@@ -84,6 +84,8 @@
           pucch_dedicated: {
             n1_pucch_sr_count: 11,
             cqi_pucch_n_rb: 1,
+            n1_pucch_an_cs_count: 8,  
+            n3_pucch_an_n_rb: 3,      
             tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
           },
           m_ri: 8,
@@ -642,6 +644,8 @@
           pucch_dedicated: {
             n1_pucch_sr_count: 11,
             cqi_pucch_n_rb: 1,
+            n1_pucch_an_cs_count: 8,  
+            n3_pucch_an_n_rb: 3,      
             tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
           },
           m_ri: 8,
@@ -1198,6 +1202,8 @@
           pucch_dedicated: {
             n1_pucch_sr_count: 11,
             cqi_pucch_n_rb: 1,
+            n1_pucch_an_cs_count: 8,  
+            n3_pucch_an_n_rb: 3,      
           },
           m_ri: 8,
           transmission_mode: 3,
@@ -1752,6 +1758,8 @@
           pucch_dedicated: {
             n1_pucch_sr_count: 11,
             cqi_pucch_n_rb: 1,
+            n1_pucch_an_cs_count: 8,  
+            n3_pucch_an_n_rb: 3,      
           },
           m_ri: 8,
           transmission_mode: 3,
@@ -2282,7 +2290,7 @@
     si_window_length: 40,
     sib_sched_list: [
       {
-        filename: "sib",
+        filename: "sib2_3.asn",
         si_periodicity: 16,
       },
     ],
@@ -2326,7 +2334,7 @@
     cipher_algo_pref: [],
     integ_algo_pref: [2, 1],
 
-    # XXX -> cell ?
+    // XXX -> cell ?
     inactivity_timer: 10000,
 
     srb_config: [
@@ -2345,5 +2353,5 @@
     ],
   },
 
-  # NR cells (TODO)
+  // NR cells (TODO)
 }
\ No newline at end of file

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

@@ -7,7 +7,7 @@ parts =
   xamari-xlog-service
   amarisoft-stats-service
   amarisoft-rf-info-service
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 {% if slapparameter_dict.get('rrh', '') == "Lopcomm ORAN" %}
   lopcomm-rrh-stats-service
   lopcomm-rrh-config-template
@@ -24,7 +24,7 @@ parts =
 {% if slapparameter_dict.get("dnsmasq", None) %}
   dnsmasq-service
 {% endif %}
-# XXX -> trx_sdr
+# XXX -> trx_sdr	XXX applies to both SDR and CPRI
   check-sdr-busy.py
 
   check-baseband-latency.py
@@ -69,7 +69,7 @@ configuration.ims_ws_port = 9003
 configuration.ims_addr = 127.0.0.1
 configuration.ims_bind = 127.0.0.2
 configuration.enb_addr = 127.0.1.1
-# XXX -> rrh ?
+# XXX -> ru ?
 configuration.default_lte_bandwidth = {{ default_lte_bandwidth }}
 configuration.default_lte_inactivity_timer = {{ default_lte_inactivity_timer }}
 configuration.default_n_antenna_dl = {{ default_n_antenna_dl }}
@@ -105,7 +105,7 @@ version = {{ slapparameter_dict.get("enb_config_version") }}
 offline = false
 {% endif %}
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 {% if slapparameter_dict.get("cu_config_link", None) %}
 [cu-config-dl]
 recipe = slapos.recipe.build:download
@@ -205,7 +205,7 @@ mode = 0775
 url = {{ amarisoft_stats_template }}
 output = ${directory:bin}/amarisoft-stats.py
 
-# XXX wrt rrh ?
+# XXX wrt ru ?
 [amarisoft-rf-info-template]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do
@@ -221,7 +221,7 @@ mode = 0775
 url = {{ amarisoft_rf_info_template }}
 output = ${directory:bin}/amarisoft-rf-info.py
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [lopcomm-rrh-stats-template]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do
@@ -246,7 +246,7 @@ mode = 0775
 url = {{ lopcomm_rrh_stats_template }}
 output = ${directory:bin}/lopcomm-rrh-stats.py
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [lopcomm-cu-config]
 <= config-base
 {% if slapparameter_dict.get("cu_config_link", None) %}
@@ -256,7 +256,7 @@ url = {{ cu_config_template }}
 {% endif %}
 output = ${directory:etc}/cu_config.xml
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [lopcomm-rrh-config-template]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do
@@ -291,7 +291,7 @@ mode = 0775
 hash-files =
   ${amarisoft-rf-info-template:output}
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [lopcomm-rrh-stats-service]
 recipe = slapos.cookbook:wrapper
 command-line = ${lopcomm-rrh-stats-template:output}
@@ -386,7 +386,7 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [check-lopcomm-vswr.py]
 <= macro.promise
 promise = check_lopcomm_vswr
@@ -394,7 +394,7 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [check-lopcomm-rssi.py]
 <= macro.promise
 promise = check_lopcomm_rssi
@@ -402,7 +402,7 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [check-lopcomm-pa-current.py]
 <= macro.promise
 promise = check_lopcomm_pa_current
@@ -410,7 +410,7 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [check-lopcomm-sync.py]
 <= macro.promise
 promise = check_lopcomm_sync
@@ -418,7 +418,7 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [check-lopcomm-lof.py]
 <= macro.promise
 promise = check_lopcomm_lof
@@ -426,7 +426,7 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [check-lopcomm-stats-log.py]
 <= macro.promise
 promise = check_lopcomm_stats_log
@@ -434,7 +434,7 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 config-stats-log = ${lopcomm-rrh-stats-template:log-output}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [check-lopcomm-config-log.py]
 <= macro.promise
 promise = check_lopcomm_config_log

software/ors-amarisoft/slapos-render-config.py

@@ -55,7 +55,7 @@ RU2_a = {
         'sdr_dev':  2,
         'sfp_port': 0,
         'mult':     8,
-        'mapping':  'bf1',
+        'mapping':  'standard',
         'rx_delay': 10,
         'tx_delay': 11,
         'tx_dbm':   50

software/ors-amarisoft/software-base.cfg

@@ -95,7 +95,7 @@ url     = ${:_profile_base_location_}/${:_buildout_section_name_}
 recipe  = slapos.recipe.build:download
 url     = ${:_profile_base_location_}/config/${:_buildout_section_name_}
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [copy-netconf-to-instance]
 recipe  = slapos.recipe.build:download
 url     = ${:_profile_base_location_}/netconf/${:_buildout_section_name_}
@@ -155,7 +155,7 @@ filename = ue-lte.jinja2.cfg
 <= copy-config-to-instance
 filename = ue-nr.jinja2.cfg
 
-# XXX -> rrh_lopcomm
+# XXX -> ru/lopcomm
 [CreateProcessingEle.jinja2.xml]
 <= copy-netconf-to-instance
 filename = CreateProcessingEle.jinja2.xml