software/ors-amarisoft: fix ncclient waiting notification forever

The Ncclient does not have a timeout for taking notifications, causing it to wait indefinitely. This can result in the connection being lost while the waiting process is still ongoing.

software/ors-amarisoft/buildout.hash.cfg

@@ -48,7 +48,7 @@ md5sum = 0450e9fa50844e4d6e51d608625c57f6
 
 [ru_lopcomm_ncclient_common.py]
 _update_hash_filename_ = ru/lopcomm/ncclient_common.py
-md5sum = 6f8d0592cc4b0b695cea5a0c25aafc4e
+md5sum = b3504313d232c2505a8c252ae9109c62
 
 [ru_lopcomm_stats.jinja2.py]
 _update_hash_filename_ = ru/lopcomm/stats.jinja2.py

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

@@ -103,24 +103,24 @@ class LopcommNetconfClient:
         sub = self.conn.create_subscription()
         self.logger.info('Subscription to %s successful' % (self.address,))
     def get_notification(self):
-        result = None
-        while result == None:
-            self.logger.debug('Waiting for notification from %s...' % (self.address,))
-            result = self.conn.take_notification(block=True)
-            if result:
-              self.logger.debug('Got new notification from %s...' % (self.address,))
-              result_in_xml = result._raw
-              data_dict = xmltodict.parse(result_in_xml)
-              if 'alarm-notif' in data_dict['notification']:
-                self.json_logger.info('', extra={'data': json.dumps(data_dict)})
-              elif 'supervision-notification' in data_dict['notification']:
-                self.supervision_json_logger.info('', extra={'data': json.dumps(data_dict)})
-              elif 'netconf-session-start' in data_dict['notification'] or 'netconf-session-end' in data_dict['notification']:
-                self.ncsession_json_logger.info('', extra={'data': json.dumps(data_dict)})
-              elif any(event in data_dict['notification'] for event in ['install-event', 'activation-event', 'download-event']):
-                  self.software_json_logger.info('', extra={'data': json.dumps(data_dict)})
-              else:
-                self.cfg_json_logger.info('', extra={'data': json.dumps(data_dict)})
+        self.logger.debug('Waiting for notification from %s...' % (self.address,))
+        result = self.conn.take_notification(block=True, timeout=120)
+        if result:
+          self.logger.debug('Got new notification from %s...' % (self.address,))
+          result_in_xml = result._raw
+          data_dict = xmltodict.parse(result_in_xml)
+          if 'alarm-notif' in data_dict['notification']:
+            self.json_logger.info('', extra={'data': json.dumps(data_dict)})
+          elif 'supervision-notification' in data_dict['notification']:
+            self.supervision_json_logger.info('', extra={'data': json.dumps(data_dict)})
+          elif 'netconf-session-start' in data_dict['notification'] or 'netconf-session-end' in data_dict['notification']:
+            self.ncsession_json_logger.info('', extra={'data': json.dumps(data_dict)})
+          elif any(event in data_dict['notification'] for event in ['install-event', 'activation-event', 'download-event']):
+              self.software_json_logger.info('', extra={'data': json.dumps(data_dict)})
+          else:
+            self.cfg_json_logger.info('', extra={'data': json.dumps(data_dict)})
+        else:
+            raise TimeoutError
     def edit_config(self, config_files):
         for config_file in config_files:
             with open(config_file) as f: