.

software/ors-amarisoft/buildout.hash.cfg

@@ -28,7 +28,7 @@ md5sum = 8b24f6cf584eb096a61750e39e376ad0
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 737c794082be65a4711798dcc9b6044f
+md5sum = b93771f755e684bba5d16f943a9dbf67
 
 [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 = 1b2d7ced1679862b8cb84a37a60b5df7
+md5sum = a141bc3956566692ad86960cf6c98248
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg

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

@@ -28,8 +28,9 @@
 {%-   endmacro    %}
 
 {%-   macro promise(name) %}
-{{ part(name) }}
-<= macro.promise
+{{ part('promise-'+name) }}
+<= monitor-promise-base
+name = {{ name }}.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}
 {%-   endmacro %}
 
@@ -49,7 +50,7 @@ config-testing = {{ slapparameter_dict.get("testing", False) }}
 # {{ ru_ref }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R  ({{ ru.ru_type }})
 {%-     if ru.ru_link_type == 'sdr'  %}
 {%-       for (i, n) in enumerate(ru.sdr_dev_list)  %}
-{{ promise('%s-sdr-busy%s.py' % (ru_ref, '-%d' % (i+1)  if i > 0  else '')) }}
+{{ promise('%s-sdr-busy%s' % (ru_ref, '-%d' % (i+1)  if i > 0  else '')) }}
 promise = check_sdr_busy
 config-sdr = {{ sdr }}
 config-sdr_dev  = {{ n }}
@@ -57,13 +58,13 @@ config-dma_chan = 0
 {%-       endfor  %}
 
 {%-     elif ru.ru_link_type == 'cpri'  %}
-{{ promise('%s-sdr-busy.py' % ru_ref) }}
+{{ promise('%s-sdr-busy' % ru_ref) }}
 promise = check_sdr_busy
 config-sdr = {{ sdr }}
 config-sdr_dev  = {{ ru.cpri_link.sdr_dev }}
 config-dma_chan = {{ ru.cpri_link.sfp_port }}
 
-{{ promise('%s-cpri-lock.py' % ru_ref) }}
+{{ promise('%s-cpri-lock' % ru_ref) }}
 promise = check_cpri_lock
 config-sdr_dev  = {{ ru.cpri_link.sdr_dev }}
 config-sfp_port = {{ ru.cpri_link.sfp_port }}
@@ -74,7 +75,7 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 {%-       do bug('unreachable') %}
 {%-     endif %}
 
-{{ promise('%s-rx-saturated.py' % ru_ref) }}
+{{ promise('%s-rx-saturated' % ru_ref) }}
 promise = check_rx_saturated
 config-rf-rx-chan-list = {{ list(range(ru._rf_chan_rx, ru._rf_chan_rx + ru.n_antenna_ul)) }}
 config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}

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

@@ -6,7 +6,7 @@
 
 {#-  indicate whether we can connect to RU via netconf #}
 
-{{ promise('%s-netconf-socket.py' % ru_ref) }}
+{{ promise('%s-netconf-socket' % ru_ref) }}
 promise = check_socket_listening
 config-host = ${slap-configuration:tap-ipv6-gateway}
 config-port = 830
@@ -40,7 +40,7 @@ output = ${directory:script}/{{ru_ref}}-software.py
 
 # TODO part('%s-software-service' % ru_ref)
 
-{{ promise('%s-firmware.py' % ru_ref) }}
+{{ promise('%s-firmware' % ru_ref) }}
 promise = check_command_execute
 config-command = [ -f ${directory:etc}/{{ru_ref}}.is_firmware_updated ]
 
@@ -124,31 +124,31 @@ mode = 0775
 hash-files =
   ${:command-line}
 
-{{ promise('%s-vswr.py' % ru_ref) }}
+{{ promise('%s-vswr' % ru_ref) }}
 promise = check_lopcomm_vswr
 config-netconf-log = ${ {{- ru_ref}}-stats-template:json-log-output}
 
-{{ promise('%s-pa-current.py' % ru_ref) }}
+{{ promise('%s-pa-current' % ru_ref) }}
 promise = check_lopcomm_pa_current
 config-netconf-log = ${ {{- ru_ref}}-stats-template:json-log-output}
 
-{{ promise('%s-pa-output-power.py' % ru_ref) }}
+{{ promise('%s-pa-output-power' % ru_ref) }}
 promise = check_lopcomm_pa_output_power
 config-netconf-log = ${ {{- ru_ref}}-stats-template:json-log-output}
 
-{{ promise('%s-lof.py' % ru_ref) }}
+{{ promise('%s-lof' % ru_ref) }}
 promise = check_lopcomm_lof
 config-netconf-log = ${ {{- ru_ref}}-stats-template:json-log-output}
 
-{{ promise('%s-rssi.py' % ru_ref) }}
+{{ promise('%s-rssi' % ru_ref) }}
 promise = check_lopcomm_rssi
 config-netconf-log = ${ {{- ru_ref}}-stats-template:json-log-output}
 
-{{ promise('%s-sync.py' % ru_ref) }}
+{{ promise('%s-sync' % ru_ref) }}
 promise = check_lopcomm_sync
 config-netconf-log = ${ {{- ru_ref}}-stats-template:json-log-output}
 
-{{ promise('%s-stats-log.py' % ru_ref) }}
+{{ promise('%s-stats-log' % ru_ref) }}
 promise = check_lopcomm_stats_log
 config-stats-log = ${ {{- ru_ref}}-stats-template:log-output}