.

software/ors-amarisoft/buildout.hash.cfg

@@ -24,7 +24,7 @@ md5sum = f5c76c3443b75569eb18503dce38e783
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
-md5sum = 2aaea73830039fb5838f029b0c42f8fd
+md5sum = 8b044014aac0217b2ebf1ed8915f0764
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg

software/ors-amarisoft/slaplte.jinja2

@@ -12,7 +12,9 @@
 
 
 {#- defaults provide default values for lte parameters.
-    it should be kept in sync with "default" in json schemas  #}
+    it should be kept in sync with "default" in json schemas
+
+    TODO automatically load defaults from JSON schemas  #}
 {#- XXX opc='milenage' is not meaningful ?  #}
 {#- XXX add inactivity timer to cell schemas #}
 {%- set defaults = {
@@ -20,6 +22,24 @@
         'txrx_active': 'INACTIVE',
       },
 
+      'ru/lopcomm': {
+        'n_antenna_dl': 2,
+        'n_antenna_ul': 2,
+      }
+
+      'ru/sunwave': {
+        'n_antenna_dl': 4,
+        'n_antenna_ul': 4,
+      }
+
+      'ru/cpri_link': {
+        'mapping': 'hw',
+        'mult':     16,
+        'rx_delay':  0,
+        'tx_delay':  0,
+        'tx_dbm':    0,
+      },
+
       'cell/lte': {
         'inactivity_timer': 10000,
       },
@@ -46,14 +66,6 @@
       'peercell/nr': {
       },
 
-      'cpri_link': {
-        'mapping': 'hw',
-        'mult':     16,
-        'rx_delay':  0,
-        'tx_delay':  0,
-        'tx_dbm':    0,
-      },
-
       'ue': {
         'sim_algo': 'milenage',
         'opc':      'milenage',
@@ -172,7 +184,7 @@
 {%-       endfor  %}
 {%-       if _.ru_link_type == 'cpri' %}
 {%-         set link = _.cpri_link  %}
-{%-         for k, v in defaults['cpri_link'].items() %}
+{%-         for k, v in defaults['ru/cpri_link'].items() %}
 {%-           do link.setdefault(k, v)  %}
 {%-         endfor  %}
 {%-       endif %}

software/ors-amarisoft/test/test.py

@@ -226,23 +226,21 @@ class TestENB_CPRI(ENBTestCase):
         cls.requestShared(imain, 'LO3', LO(3))
         cls.requestShared(imain, 'LO4', LO(4))
 
-        def LO_CELL(i, **kw):
+        def LO_CELL(i, ctx):
             cell = {
-                'cell_kind':    'enb',
-                'pci':          i,
-                'cell_id':      '%x' % (0x00 + i),
                 'ru': {
                     'ru_type': 'ru_ref',
                     'ru_ref':   cls.ref('LO%d' % i),
                 }
             }
-            cell.update(kw)
+            cell.update(CENB(i, i, 0x1234))
+            cell.update(ctx)
             cls.requestShared(imain, 'LO%d.CELL' % i, cell)
 
-        LO_CELL(1, TDD | LTE(100) | BW(10))
-        LO_CELL(2, FDD | LTE(500) | BW(20))
-        LO_CELL(3, TDD | NR (100) | BW(10))
-        LO_CELL(4, FDD | NR (500) | BW(10))
+        LO_CELL(1, FDD | LTE(   100)    | BW(10))
+        LO_CELL(2, TDD | LTE( 36100)    | BW(10))
+        LO_CELL(3, FDD | NR (430100, 1) | BW(10))
+        LO_CELL(3, TDD | NR (510100,41) | BW(10))
 
         # XXX + sunwave