diff --git a/plugins/modules/monitoring/monit.py b/plugins/modules/monitoring/monit.py index 7a2f5c673e..3d6dda9944 100644 --- a/plugins/modules/monitoring/monit.py +++ b/plugins/modules/monitoring/monit.py @@ -56,17 +56,16 @@ STATE_COMMAND_MAP = { MIN_VERSION = (5, 21) -ALL_STATUS = [ - 'missing', 'ok', 'not_monitored', 'initializing', 'does_not_exist' -] - class StatusValue(namedtuple("Status", "value, is_pending")): - MISSING = 0 - OK = 1 - NOT_MONITORED = 2 - INITIALIZING = 3 - DOES_NOT_EXIST = 4 + MISSING = 'missing' + OK = 'ok' + NOT_MONITORED = 'not_monitored' + INITIALIZING = 'initializing' + DOES_NOT_EXIST = 'does_not_exist' + ALL_STATUS = [ + MISSING, OK, NOT_MONITORED, INITIALIZING, DOES_NOT_EXIST + ] def __new__(cls, value, is_pending=False): return super(StatusValue, cls).__new__(cls, value, is_pending) @@ -75,7 +74,7 @@ class StatusValue(namedtuple("Status", "value, is_pending")): return StatusValue(self.value, True) def __getattr__(self, item): - if item in ('is_%s' % status for status in ALL_STATUS): + if item in ('is_%s' % status for status in self.ALL_STATUS): return self.value == getattr(self, item[3:].upper()) raise AttributeError(item) diff --git a/tests/unit/plugins/modules/monitoring/test_monit.py b/tests/unit/plugins/modules/monitoring/test_monit.py index a12213eda4..2bbbc233bf 100644 --- a/tests/unit/plugins/modules/monitoring/test_monit.py +++ b/tests/unit/plugins/modules/monitoring/test_monit.py @@ -89,17 +89,17 @@ class MonitTest(unittest.TestCase): self.monit.wait_for_monit_to_stop_pending('stopped') -@pytest.mark.parametrize('status_name', [name for name in monit.ALL_STATUS]) +@pytest.mark.parametrize('status_name', [name for name in monit.StatusValue.ALL_STATUS]) def test_status_value(status_name): value = getattr(monit.StatusValue, status_name.upper()) status = monit.StatusValue(value) assert getattr(status, 'is_%s' % status_name) - assert not all(getattr(status, 'is_%s' % name) for name in monit.ALL_STATUS if name != status_name) + assert not all(getattr(status, 'is_%s' % name) for name in monit.StatusValue.ALL_STATUS if name != status_name) BASIC_OUTPUT_CASES = [ (TEST_OUTPUT % ('processX', name), getattr(monit.Status, name.upper())) - for name in monit.ALL_STATUS + for name in monit.StatusValue.ALL_STATUS ]