ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-26 06:31:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Avoid extending a class if it does not exists (#19059)

Browse source
This commit is contained in:
Fabio Alessandro Locati 2016-12-09 22:31:07 +00:00 • committed by John R Barker
commit 3b509b1095
3 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/monitoring/zabbix_host.py
View file

@ -168,11 +168,6 @@ import copy
try:
from zabbix_api import ZabbixAPI, ZabbixAPISubClass
HAS_ZABBIX_API = True
except ImportError:
HAS_ZABBIX_API = False
# Extend the ZabbixAPI
# Since the zabbix-api python module too old (version 1.0, no higher version so far),
# it does not support the 'hostinterface' api calls,
@ -184,6 +179,9 @@ class ZabbixAPIExtends(ZabbixAPI):
ZabbixAPI.__init__(self, server, timeout=timeout, user=user, passwd=passwd)
self.hostinterface = ZabbixAPISubClass(self, dict({"prefix": "hostinterface"}, **kwargs))
HAS_ZABBIX_API = True
except ImportError:
HAS_ZABBIX_API = False
class Host(object):
def __init__(self, module, zbx):

9
lib/ansible/modules/monitoring/zabbix_hostmacro.py
View file

@ -107,17 +107,16 @@ import copy
try:
from zabbix_api import ZabbixAPI, ZabbixAPISubClass
HAS_ZABBIX_API = True
except ImportError:
HAS_ZABBIX_API = False
# Extend the ZabbixAPI
# Since the zabbix-api python module too old (version 1.0, no higher version so far).
class ZabbixAPIExtends(ZabbixAPI):
def __init__(self, server, timeout, user, passwd, **kwargs):
ZabbixAPI.__init__(self, server, timeout=timeout, user=user, passwd=passwd)
HAS_ZABBIX_API = True
except ImportError:
HAS_ZABBIX_API = False
class HostMacro(object):
def __init__(self, module, zbx):

7
lib/ansible/modules/monitoring/zabbix_screen.py
View file

@ -147,10 +147,6 @@ try:
from zabbix_api import ZabbixAPI, ZabbixAPISubClass
from zabbix_api import ZabbixAPIException
from zabbix_api import Already_Exists
HAS_ZABBIX_API = True
except ImportError:
HAS_ZABBIX_API = False
# Extend the ZabbixAPI
# Since the zabbix-api python module too old (version 1.0, and there's no higher version so far), it doesn't support the 'screenitem' api call,
@ -162,6 +158,9 @@ class ZabbixAPIExtends(ZabbixAPI):
ZabbixAPI.__init__(self, server, timeout=timeout, user=user, passwd=passwd)
self.screenitem = ZabbixAPISubClass(self, dict({"prefix": "screenitem"}, **kwargs))
HAS_ZABBIX_API = True
except ImportError:
HAS_ZABBIX_API = False
class Screen(object):
def __init__(self, module, zbx):