More correct fix for status problem (#41045)

Status is not being determined right when monitors are enabled but
the state is up or down. This patch fixes it.
pull/41059/head
Tim Rupp 7 years ago committed by GitHub
parent c65f3fdca6
commit 033adf8cd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -465,7 +465,7 @@ class ApiParameters(Parameters):
def state(self): def state(self):
if self._values['state'] in ['user-up', 'unchecked', 'fqdn-up-no-addr'] and self._values['session'] in ['user-enabled']: if self._values['state'] in ['user-up', 'unchecked', 'fqdn-up-no-addr'] and self._values['session'] in ['user-enabled']:
return 'present' return 'present'
elif self._values['state'] == 'down' and self._values['session'] == 'monitor-enabled': elif self._values['state'] in ['down', 'up'] and self._values['session'] == 'monitor-enabled':
return 'present' return 'present'
elif self._values['state'] in ['user-down'] and self._values['session'] in ['user-disabled']: elif self._values['state'] in ['user-down'] and self._values['session'] in ['user-disabled']:
return 'forced_offline' return 'forced_offline'
@ -522,6 +522,8 @@ class ReportableChanges(Changes):
def state(self): def state(self):
if self._values['state'] in ['user-up', 'unchecked', 'fqdn-up-no-addr'] and self._values['session'] in ['user-enabled']: if self._values['state'] in ['user-up', 'unchecked', 'fqdn-up-no-addr'] and self._values['session'] in ['user-enabled']:
return 'present' return 'present'
elif self._values['state'] in ['down', 'up'] and self._values['session'] == 'monitor-enabled':
return 'present'
elif self._values['state'] in ['user-down'] and self._values['session'] in ['user-disabled']: elif self._values['state'] in ['user-down'] and self._values['session'] in ['user-disabled']:
return 'forced_offline' return 'forced_offline'
else: else:

Loading…
Cancel
Save