.

software/ors-amarisoft/buildout.hash.cfg

@@ -28,11 +28,11 @@ md5sum = 8b24f6cf584eb096a61750e39e376ad0
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 9826420b6a1db78e6bbea8a8e32cc0a4
+md5sum = b71776599bf20493ed6914a7f017822e
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
-md5sum = 18e46642ac11e507b61085992b0d4a4e
+md5sum = bbf7d0ed5f1c7078008bd05eb0ecb0a8
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
@@ -72,7 +72,7 @@ md5sum = e22257ef526b0acc10a8203daa41028b
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = f8f2088ba35b6aff607f33eca15fb4f8
+md5sum = 4ffaa8fc7d0da868bae706027e6e0128
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg

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

@@ -591,13 +591,6 @@ 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 -> ru/lopcomm
-[check-lopcomm-vswr.py]
-<= macro.promise
-promise = check_lopcomm_vswr
-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 -> ru/lopcomm
 [check-lopcomm-rssi.py]

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

@@ -33,6 +33,9 @@
 config-testing = {{ slapparameter_dict.get("testing", False) }}
 {%-   endmacro %}
 
+{#-   import RU drivers                           #}
+{%-   set J              = slaplte.J              %}
+{%-   set jref_of_shared = slaplte.jref_of_shared %}
 {%-   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/sdr/libinstance.jinja2.cfg

 {%- macro buildout_iru(iru)  %}
+{%-  set ru_ref = J(jref_of_shared(iru))  %}
+{%-  set ru     = iru['_']  %}
+
+{{ promise('%s-check-vswr.py' % ru_ref) }}
+promise = check_lopcomm_vswr
+config-netconf-log = ${lopcomm-rrh-stats-template:json-log-output}
+config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
+
 {%- endmacro  %}