.

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

@@ -16,9 +16,6 @@ parts =
   amarisoft-rf-info-service
 # XXX -> ru/lopcomm
 {% if ru == "lopcomm" %}
-  lopcomm-rrh-supervision-service
-  netconf-connection-promise
-  lopcomm-cu-config
   sshd-service
   sshd-add-authorized-key
   sshd-promise
@@ -259,32 +256,6 @@ mode = 0775
 url = {{ amarisoft_rf_info_template }}
 output = ${directory:bin}/amarisoft-rf-info.py
 
-[lopcomm-rrh-supervision-template]
-recipe = slapos.recipe.template:jinja2
-extensions = jinja2.ext.do
-log-output = ${directory:var}/log/lopcomm-rrh-supervision.log
-supervision-reply-json-log-output = ${directory:var}/log/lopcomm-rrh-supervision-reply.json.log
-context =
-  section directory directory
-  section slap_configuration slap-configuration
-  key slapparameter_dict slap-configuration:configuration
-  key log_file :log-output
-  key supervision_reply_json_log_file :supervision-reply-json-log-output
-  raw testing {{ slapparameter_dict.get("testing", False) }}
-  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
-  raw buildout_directory_path {{ buildout_directory }}
-  raw etc_path ${directory:etc}
-  import netaddr netaddr
-mode = 0775
-url = {{ lopcomm_rrh_supervision_template }}
-output = ${directory:bin}/lopcomm-rrh-supervision.py
-
-[netconf-connection-promise]
-<= monitor-promise-base
-promise = check_command_execute
-name = netconf-connection-promise.py
-config-command = [ -f ${directory:etc}/is_netconf_connected ]
-
 [amarisoft-stats-service]
 recipe = slapos.cookbook:wrapper
 command-line = ${amarisoft-stats-template:output}
@@ -301,14 +272,6 @@ mode = 0775
 hash-files =
   ${amarisoft-rf-info-template:output}
 
-[lopcomm-rrh-supervision-service]
-recipe = slapos.cookbook:wrapper
-command-line = ${lopcomm-rrh-supervision-template:output}
-wrapper-path = ${directory:service}/lopcomm-rrh-supervision
-mode = 0775
-hash-files =
-  ${lopcomm-rrh-supervision-template:output}
-
 [user-info]
 recipe = slapos.cookbook:userinfo
 

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

@@ -45,6 +45,43 @@ promise = check_command_execute
 config-command = [ -f ${ {{-ru_ref}}-software-template:is_firmware_updated} ]
 
 
+{#-  monitor state of netconf connection + keep on touching RU watchdog #}
+
+[{{ru_ref}}-supervision-template]
+recipe = slapos.recipe.template:jinja2
+extensions = jinja2.ext.do
+_logbase = ${directory:var}/log/{{ru_ref}}-supervision
+log-output = ${:_logbase}.log
+supervision-reply-json-log-output = ${:_logbase}.json.log
+is_netconf_connected = ${directory:etc}/{{ru_ref}}.is_netconf_connected
+context =
+  section directory directory
+  section slap_configuration slap-configuration
+  key slapparameter_dict slap-configuration:configuration
+  key log_file :log-output
+  key supervision_reply_json_log_file :supervision-reply-json-log-output
+  raw testing {{ slapparameter_dict.get("testing", False) }}
+  raw python_path {{ buildout_directory}}/bin/pythonwitheggs
+  raw buildout_directory_path {{ buildout_directory }}
+  key is_netconf_connected :is_netconf_connected
+  import netaddr netaddr
+mode = 0775
+url = {{ lopcomm_rrh_supervision_template }}
+output = ${directory:bin}/lopcomm-rrh-supervision.py
+
+{{ part('%s--supervision-service' % ru_ref) }}
+recipe = slapos.cookbook:wrapper
+command-line = ${ {{- ru_ref}}-supervision-template:output}
+wrapper-path = ${directory:service}/{{ru_ref}}-supervision
+mode = 0775
+hash-files =
+  ${:command-line}
+
+{{ promise('%s-netconf-connection' % ru_ref) }}
+promise = check_command_execute
+config-command = [ -f ${ {{-ru_ref}}-supervision-template:is_netconf_connected} ]
+
+
 {#-  push config to RU #}
 
 {%   if ru.get("cu_config_link", None) %}