.

software/ors-amarisoft/buildout.hash.cfg

@@ -28,7 +28,7 @@ md5sum = c30fa5e9843212f94ae595d8394ac6b8
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 68965d542b31ac67d91aba6b3ad1f471
+md5sum = 69bd174aaf604029f06e7f32791c35f6
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -36,7 +36,7 @@ md5sum = e27ebe0ff200a3e4492412f164ca9b73
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = 066dbfbabdafa40b5bd71cd8251e772c
+md5sum = 3a83b8c04a04e07ebd9d0d3847c62726
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg

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

@@ -366,11 +366,11 @@ extra-context =
     json iru_dict {{ rulib.iru_dict | tojson }}
     json icell_dict {{ rulib.icell_dict | tojson }}
     import json_module json
-    import earfcn_module xlte.earfcn
 import-list =
     rawfile amari_lte.jinja2 {{ amari_lte_template }}
     rawfile amari_slap.jinja2 {{ amari_slap_template }}
 
+
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised

software/ors-amarisoft/ru/libinstance.jinja2.cfg

@@ -41,6 +41,7 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 {#-   import RU drivers                           #}
 {%-   set J              = slaplte.J              %}
 {%-   set jref_of_shared = slaplte.jref_of_shared %}
+{%-   set jcell_ru_ref   = slaplte.jcell_ru_ref   %}
 {%-   import 'ru_sdr_libinstance.jinja2.cfg'      as rudrv_sdr      with context %}
 {%-   import 'ru_lopcomm_libinstance.jinja2.cfg'  as rudrv_lopcomm  with context %}
 {%-   import 'ru_sunwave_libinstance.jinja2.cfg'  as rudrv_sunwave  with context %}

software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg

@@ -3,12 +3,15 @@
 {%- macro buildout_iru(iru, icell_list)  %}
 {%-  set ru_ref = J(jref_of_shared(iru))  %}
 {%-  set ru     = iru['_']  %}
+{%-  do assert(False, ru_ref) %}
 
+{#
 {%-  if len(icell_list) != 1  %}
 {%-    do error('ru/lopcomm supports only 1 cell  %}
 {%-  endif %}
 {%-  set icell = icell_list[0]  %}
-{%-  set cell = icell['_']  %}
+{%-  set cell  = icell._  %}
+#}
 
 {#-  indicate whether RU is listening for netconf #}
 
@@ -80,7 +83,6 @@ context =
   import netaddr netaddr
 mode = 0775
 url = {{ ru_lopcomm_software_template }}
-# XXX -> directory:service ?
 output = ${directory:script}/{{ru_ref}}-software.py
 
 {{ promise('%s-firmware' % ru_ref) }}
@@ -127,7 +129,6 @@ context =
   import netaddr netaddr
 mode = 0775
 url = {{ ru_lopcomm_config_template }}
-# XXX -> directory:service ?
 output = ${directory:script}/{{ru_ref}}-config.py
 
 {{ promise('%s-config-log' % ru_ref) }}

software/ors-amarisoft/ru/sdr/libinstance.jinja2.cfg

 {#- Package ru/sdr/libinstance provides instance code for handling SDR Radio Units. #}
 
-{%- macro buildout_iru(iru)  %}
+{%- macro buildout_iru(iru, icell_list)  %}
 {#-  nothing SDR-specific #}
 {%- endmacro  %}

software/ors-amarisoft/ru/sunwave/libinstance.jinja2.cfg

+{#- Package ru/sunwave/libinstance provides instance code for handling SunWave Radio Units. #}
+
+{%- macro buildout_iru(iru, icell_list)  %}
+{#-  nothing SunWave-specific #}
+{%- endmacro  %}