wip

software/ors-amarisoft/buildout.hash.cfg

@@ -28,7 +28,7 @@ md5sum = c930c28365c685a6066f382c9b5d8893
 
 [lopcomm-rrh-stats.jinja2.py]
 _update_hash_filename_ = lopcomm-rrh-stats.jinja2.py
-md5sum = b35d43ea8f8add56d7649f2862ddffc5
+md5sum = 4c4166617617988c3fd67c9adb6792e9
 
 [lopcomm-rrh-config.jinja2.py]
 _update_hash_filename_ = lopcomm-rrh-config.jinja2.py
@@ -40,7 +40,7 @@ md5sum = a0387f81cbefec87429b119b429148b4
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 895d3b969e2f641e2ab4618a600baa2a
+md5sum = 9b720197ae47592bb2d180bf2b937cab
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg

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

@@ -227,6 +227,7 @@ json-log-output = ${directory:var}/log/lopcomm-rrh-stats.json.log
 cfg-json-log-output = ${directory:var}/log/lopcomm-rrh-config.json.log
 supervision-json-log-output = ${directory:var}/log/lopcomm-rrh-supervision.json.log
 ncsession-json-log-output = ${directory:var}/log/lopcomm-rrh-ncsession.json.log
+software-json-log-output = ${directory:var}/log/lopcomm-rrh-software.json.log
 context =
   section directory directory
   section slap_configuration slap-configuration
@@ -236,6 +237,7 @@ context =
   key cfg_json_log_file :cfg-json-log-output
   key supervision_json_log_file :supervision-json-log-output
   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) }}
   raw python_path {{ buildout_directory}}/bin/pythonwitheggs
   import netaddr netaddr

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

@@ -17,17 +17,20 @@ class LopcommNetconfClient:
         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 }}"
 
         self.logger = logging.getLogger('logger')
         self.json_logger = logging.getLogger('json_logger')
         self.cfg_json_logger = logging.getLogger('cfg_json_logger')
         self.supervision_json_logger = logging.getLogger('supervision_json_logger')
         self.ncsession_json_logger = logging.getLogger('ncsession_json_logger')
+        self.software_json_logger = logging.getLogger('software_json_logger')
         self.logger.setLevel(logging.DEBUG)
         self.json_logger.setLevel(logging.DEBUG)
         self.cfg_json_logger.setLevel(logging.DEBUG)
         self.supervision_json_logger.setLevel(logging.DEBUG)
         self.ncsession_json_logger.setLevel(logging.DEBUG)
+        self.software_json_logger.setLevel(logging.DEBUG)
 
         json_handler = RotatingFileHandler(json_log_file, maxBytes=100000, backupCount=5)
         json_formatter = logging.Formatter('{"time": "%(asctime)s", "log_level": "%(levelname)s", "message": "%(message)s", "data": %(data)s}')
@@ -49,6 +52,11 @@ class LopcommNetconfClient:
         ncsession_json_handler.setFormatter(ncsession_json_formatter)
         self.ncsession_json_logger.addHandler(ncsession_json_handler)
 
+        software_json_handler = RotatingFileHandler(software_json_log_file, maxBytes=100000, backupCount=5)
+        software_json_formatter = logging.Formatter('{"time": "%(asctime)s", "log_level": "%(levelname)s", "message": "%(message)s", "data": %(data)s}')
+        software_json_handler.setFormatter(software_json_formatter)
+        self.software_json_logger.addHandler(software_json_handler)
+
         handler = RotatingFileHandler(log_file, maxBytes=100000, backupCount=5)
         self.logger.addHandler(handler)
         formatter = logging.Formatter("%(asctime)s [%(levelname)s] %(message)s")
@@ -101,6 +109,8 @@ class LopcommNetconfClient:
                 self.supervision_json_logger.info('', extra={'data': 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': data_dict})
+              elif 'install-event' in data_dict['notification'] or 'activation-event' in data_dict['notification']:
+                self.software_json_logger.info('', extra={'data': data_dict})
               else:
                 self.cfg_json_logger.info('', extra={'data': data_dict})