use class constants for monitorclass and reporterclass

Author: smoors

lib/vsc/utils/nagios.py

@@ -279,7 +279,6 @@ def report_and_exit(self):
         (timestamp, ((nagios_exit_code, nagios_exit_string), nagios_message)) = nagios_cache.load('nagios')
         self.print_report_and_exit(timestamp, nagios_exit_code, nagios_exit_string, nagios_message)
 
-
     def print_report_and_exit(self, timestamp, nagios_exit_code, nagios_exit_string, nagios_message):
         """Print the nagios report (if the data is not too old) and exit"""
         if self.threshold <= 0 or time.time() - timestamp < self.threshold:
@@ -435,14 +434,10 @@ class SimpleNagios(NagiosResult):
     USE_HEADER = True
     RESERVED_WORDS = set(['message', 'ok', 'warning', 'critical', 'unknown',
                          '_exit', '_cache', '_cache_user', '_final', '_final_state', '_report', '_threshold'])
+    REPORTERCLASS = NagiosReporter
 
     def __init__(self, **kwargs):
         """Initialise message and perfdata"""
-        self._init(**kwargs)
-
-    def _init(self, reporterclass=NagiosReporter, **kwargs):
-        """The real init method"""
-
         self.__dict__ = {}
         self.message = None  # the message
 
@@ -462,10 +457,10 @@ def _init(self, reporterclass=NagiosReporter, **kwargs):
         if self._cache:
             # make a NagiosReporter instance that can be used for caching
             if self._cache_user:
-                cache = reporterclass('no header', self._cache, self._threshold, nagios_username=self._cache_user,
+                cache = self.REPORTERCLASS('no header', self._cache, self._threshold, nagios_username=self._cache_user,
                                        world_readable=self._world_readable)
             else:
-                cache = reporterclass('no header', self._cache, self._threshold, world_readable=self._world_readable)
+                cache = self.REPORTERCLASS('no header', self._cache, self._threshold, world_readable=self._world_readable)
             if self._report_and_exit:
                 cache.report_and_exit()
             else:

lib/vsc/utils/script_tools.py

@@ -114,14 +114,13 @@ class ExtendedSimpleOption(SimpleOption):
 
     The prologue should be called at the start of the script; the epilogue at the end.
     """
+    MONITORCLASS = SimpleNagios
 
-    def __init__(self, options, run_prologue=True, excepthook=None, monitorclass=SimpleNagios, **kwargs):
+    def __init__(self, options, run_prologue=True, excepthook=None, **kwargs):
         """Initialise.
 
         If run_prologue is True (default), we immediately execute the prologue.
 
-        - monitorclass: the class to use for interaction with the monitoring software
-
         Note that if taking a lock is requested (default), and the lock cannot be
         acquire for some reason, the program will exit,
         """
@@ -131,7 +130,6 @@ def __init__(self, options, run_prologue=True, excepthook=None, monitorclass=Sim
 
         self.nagios_reporter = None
         self.lockfile = None
-        self.monitorclass = monitorclass
 
         if run_prologue:
             self.prologue()
@@ -148,13 +146,13 @@ def prologue(self):
 
         See _merge_options for the format.
 
-        - if nagios_report is set, creates a monitorclass instance and prints the report.
+        - if nagios_report is set, creates a SimpleNagios instance and prints the report.
         - if ha is set, checks if running on the correct host, set the appropriate nagios message and bail if not.
         - if locking_filename is set, take a lock. If the lock fails, bork and set the nagios exit accordingly.
         """
 
         # bail if nagios report is requested
-        self.nagios_reporter = self.monitorclass(_cache=self.options.nagios_check_filename,
+        self.nagios_reporter = self.MONITORCLASS(_cache=self.options.nagios_check_filename,
                                                  _report_and_exit=self.options.nagios_report,
                                                  _threshold=self.options.nagios_check_interval_threshold,
                                                  _cache_user=self.options.nagios_user,

lib/vsc/utils/zabbix.py

@@ -36,19 +36,7 @@
 import sys
 
 from vsc.utils.nagios import SimpleNagios, NagiosReporter
-
-
-class SimpleZabbix(SimpleNagios):
-    """Class to allow easy interaction with Zabbix related code"""
-
-    def __init__(self, **kwargs):
-        """Initialise message and perfdata"""
-        super(SimpleZabbix, self)._init(reporterclass=ZabbixReporter, **kwargs)
-
-    def __str__(self):
-        """__str__ determines how the data is written to the cache"""
-        processed_dict = {key: value for (key, value) in self.__dict__.items() if not key.startswith('_')}
-        return json.dumps(processed_dict)
+from vsc.utils.script_tools import ExtendedSimpleOption
 
 
 class ZabbixReporter(NagiosReporter):
@@ -60,3 +48,16 @@ def print_report_and_exit(self, timestamp, nagios_exit_code, nagios_exit_string,
         self.log.info("Zabbix check cache file %s contents delivered: %s", self.filename, nagios_message)
         sys.exit(nagios_exit_code)
 
+
+class SimpleZabbix(SimpleNagios):
+    """Class to allow easy interaction with Zabbix related code"""
+    REPORTERCLASS = ZabbixReporter
+
+    def __str__(self):
+        """__str__ determines how the data is written to the cache"""
+        processed_dict = {key: value for (key, value) in self.__dict__.items() if not key.startswith('_')}
+        return json.dumps(processed_dict)
+
+
+class ExtendedSimpleOptionZabbix(ExtendedSimpleOption):
+    MONITORCLASS = SimpleZabbix