software/ors-amarisoft: remove redundant netconf supervision subsciption

The Netconf subscriptions were added twice, causing the RU to reboot
because there was no supervision check on the redundant subscription.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,11 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = b4f7cf9de06af21a0c4c00d8be5edce7
-
-[slaplte.jinja2]
-_update_hash_filename_ = slaplte.jinja2
-md5sum = c31dffa87765d93327f18ffd89ce36ca
+md5sum = df4d6e24453b649cc20564d7fcc38e4b
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -40,7 +36,7 @@ md5sum = c20b620111a4dc4bc2bcae57c2007cbe
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = 02a7a12b933544b4287599afed0fc68d
+md5sum = a150743e78f9ecafc40b715f2aa80295
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
@@ -48,11 +44,11 @@ md5sum = 0450e9fa50844e4d6e51d608625c57f6
 
 [ru_lopcomm_ncclient_common.py]
 _update_hash_filename_ = ru/lopcomm/ncclient_common.py
-md5sum = b3504313d232c2505a8c252ae9109c62
+md5sum = 8dbe6a48fc0fca4f0cbd0c746be1aeda
 
 [ru_lopcomm_stats.jinja2.py]
 _update_hash_filename_ = ru/lopcomm/stats.jinja2.py
-md5sum = 3a5a3c5588e1698ee81e983bb08e70d7
+md5sum = b7ec0025a92e0947e4ac6abc4b06bf19
 
 [ru_lopcomm_config.jinja2.py]
 _update_hash_filename_ = ru/lopcomm/config.jinja2.py
@@ -70,10 +66,6 @@ md5sum = 9741fbc99aaf768e9cc3ab48925dfee5
 _update_hash_filename_ = ru/lopcomm/software.jinja2.py
 md5sum = 2b08bb666c5f3ab287cdddbfdb4c9249
 
-[ru_lopcomm_supervision.jinja2.py]
-_update_hash_filename_ = ru/lopcomm/supervision.jinja2.py
-md5sum = 437cc45f132d6c74647a716c6a1920e1
-
 [ru_tapsplit]
 _update_hash_filename_ = ru/tapsplit
 md5sum = 2b8b57c5771b2a2203c0e7767e629e55

software/ors-amarisoft/instance.cfg

@@ -284,7 +284,6 @@ extra-context =
     raw ru_lopcomm_stats_template   ${ru_lopcomm_stats.jinja2.py:target}
     raw ru_lopcomm_config_template   ${ru_lopcomm_config.jinja2.py:target}
     raw ru_lopcomm_software_template   ${ru_lopcomm_software.jinja2.py:target}
-    raw ru_lopcomm_supervision_template   ${ru_lopcomm_supervision.jinja2.py:target}
     raw ru_lopcomm_reset_info_template   ${ru_lopcomm_reset-info.jinja2.py:target}
     raw ru_lopcomm_reset_template   ${ru_lopcomm_reset.jinja2.py:target}
     raw ru_lopcomm_CreateProcessingEle_template   ${ru_lopcomm_CreateProcessingEle.jinja2.xml:target}

software/ors-amarisoft/ru/lopcomm/buildout.cfg

@@ -22,9 +22,6 @@ parts +=
 [ru_lopcomm_software.jinja2.py]
 <= download-base
 
-[ru_lopcomm_supervision.jinja2.py]
-<= download-base
-
 [ru_lopcomm_ncclient_common.py]
 <= download-base
 destination = ${buildout:directory}/ncclient_common.py

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

@@ -9,43 +9,9 @@ promise = check_socket_listening
 config-host = ${vtap.{{cell._tap}}:gateway}
 config-port = 830
 
-
-{#-  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}-reply.json.log
-is_netconf_connected = ${directory:etc}/{{ru_ref}}.is_netconf_connected
-context =
-  section directory directory
-  section vtap vtap.{{ cell._tap }}
-  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 = {{ ru_lopcomm_supervision_template }}
-output = ${directory:bin}/{{ru_ref}}-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} ]
-
+config-command = [ -f ${ {{-ru_ref}}-stats-template:is_netconf_connected} ]
 
 {#-  push firmware to RU #}
 
@@ -133,6 +99,8 @@ cfg-json-log-output = ${:_logbase}-config.json.log
 supervision-json-log-output = ${:_logbase}-supervision.json.log
 ncsession-json-log-output = ${:_logbase}-ncsession.json.log
 software-json-log-output = ${:_logbase}-software.json.log
+supervision-reply-json-log-output = ${:_logbase}-supervision-reply.json.log
+is_netconf_connected = ${directory:etc}/{{ru_ref}}.is_netconf_connected
 context =
   section directory directory
   section vtap vtap.{{ cell._tap }}
@@ -141,6 +109,8 @@ context =
   key json_log_file :json-log-output
   key cfg_json_log_file :cfg-json-log-output
   key supervision_json_log_file :supervision-json-log-output
+  key supervision_reply_json_log_file :supervision-reply-json-log-output
+  key is_netconf_connected :is_netconf_connected
   key ncsession_json_log_file :ncsession-json-log-output
   key software_json_log_file :software-json-log-output
   raw testing {{ slapparameter_dict.get("testing", False) }}

software/ors-amarisoft/ru/lopcomm/ncclient_common.py

@@ -199,6 +199,23 @@ class LopcommNetconfClient:
             "running_slot_name_build_version": running_slot_name_build_version
         }
 
+    def supervision_reset(self, interval=60, margin=10):
+      self.logger.info("NETCONF server supervision replying...")
+      supervision_watchdog_rpc_xml = f"""
+          <supervision-watchdog-reset xmlns="urn:o-ran:supervision:1.0">
+              <supervision-notification-interval>{interval}</supervision-notification-interval>
+              <guard-timer-overhead>{margin}</guard-timer-overhead>
+          </supervision-watchdog-reset>
+      """
+      supervision_watchdog_reply_xml = self.custom_rpc_request(supervision_watchdog_rpc_xml)
+      replied = False
+      if supervision_watchdog_reply_xml:
+        replied = True
+        self.logger.info("NETCONF server supervision replied")
+        supervision_watchdog_data = xmltodict.parse(supervision_watchdog_reply_xml)
+        self.supervision_reply_json_logger.info('', extra={'data': json.dumps(supervision_watchdog_data)})
+      return replied
+
     def close(self):
         # Close not compatible between ncclient and netconf server
         #self.conn.close()

software/ors-amarisoft/ru/lopcomm/stats.jinja2.py

 #!{{ python_path }}
 import time
 import sys
+import os
+import threading
+
 sys.path.append({{ repr(buildout_directory_path) }})
 from ncclient_common import LopcommNetconfClient
 
+# Shared variable to indicate error occurred
+error_occurred = False
+lock = threading.Lock()
+
+def get_notification_continuously(nc):
+    global error_occurred
+    try:
+        while not error_occurred:
+            nc.get_notification()
+            pass
+    except Exception as e:
+        with lock:
+            error_occurred = True
+            nc.logger.error(f'Error in get_notification_continuously: {e}')
+
+# supervision watchdog keeps on
+def run_supervision_reset_continuously(nc):
+    global error_occurred
+    netconf_check_file = '{{ is_netconf_connected }}'
+    interval = 60
+    margin   = 10
+    try:
+        while not error_occurred:
+            t0 = time.time()
+            replied = nc.supervision_reset(interval, margin)
+            if replied:
+                with open(netconf_check_file, "w") as f:
+                    f.write('')
+            elif os.path.exists(netconf_check_file):
+                os.remove(netconf_check_file)
+
+            t1 = time.time()
+            time.sleep(interval - (t1 - t0))
+    except Exception as e:
+        with lock:
+            error_occurred = True
+            nc.logger.error(f'Error in run_supervision_reset_continuously: {e}')
+
 if __name__ == '__main__':
-  nc = LopcommNetconfClient(
-    log_file="{{ log_file }}",
-    json_log_file="{{ json_log_file }}",
-    cfg_json_log_file="{{ cfg_json_log_file }}",
-    supervision_json_log_file="{{ supervision_json_log_file }}",
-    ncsession_json_log_file="{{ ncsession_json_log_file }}",
-    software_json_log_file="{{ software_json_log_file }}"
+    nc = LopcommNetconfClient(
+        log_file="{{ log_file }}",
+        json_log_file="{{ json_log_file }}",
+        cfg_json_log_file="{{ cfg_json_log_file }}",
+        supervision_json_log_file="{{ supervision_json_log_file }}",
+        ncsession_json_log_file="{{ ncsession_json_log_file }}",
+        software_json_log_file="{{ software_json_log_file }}",
+        supervision_reply_json_log_file="{{ supervision_reply_json_log_file }}"
     )
-  while True:
+    threads = []
+
     try:
         nc.connect("{{ netaddr.IPAddress(vtap.gateway) }}", 830, "oranuser", "oranpassword")
         nc.subscribe()
-        while True:
-          nc.get_notification()
+
+        notification_thread = threading.Thread(target=get_notification_continuously, args=(nc,))
+        supervision_thread = threading.Thread(target=run_supervision_reset_continuously, args=(nc,))
+
+        threads.append(notification_thread)
+        threads.append(supervision_thread)
+
+        for thread in threads:
+            thread.start()
+
+        for thread in threads:
+            thread.join()
+
     except Exception as e:
         nc.logger.debug('Got exception, waiting 10 seconds before reconnecting...')
         nc.logger.debug(e)