From 9aff21b6fe095408cd75475d0371d88508d26819 Mon Sep 17 00:00:00 2001 From: Joel Diaz Date: Thu, 3 Mar 2016 14:50:25 -0500 Subject: change lib_zabbix's import to new pathing --- roles/lib_zabbix/library/zbx_action.py | 2 +- roles/lib_zabbix/library/zbx_application.py | 2 +- roles/lib_zabbix/library/zbx_discoveryrule.py | 2 +- roles/lib_zabbix/library/zbx_graph.py | 2 +- roles/lib_zabbix/library/zbx_graphprototype.py | 2 +- roles/lib_zabbix/library/zbx_host.py | 2 +- roles/lib_zabbix/library/zbx_hostgroup.py | 2 +- roles/lib_zabbix/library/zbx_httptest.py | 2 +- roles/lib_zabbix/library/zbx_item.py | 2 +- roles/lib_zabbix/library/zbx_itemprototype.py | 2 +- roles/lib_zabbix/library/zbx_itservice.py | 2 +- roles/lib_zabbix/library/zbx_mediatype.py | 2 +- roles/lib_zabbix/library/zbx_template.py | 2 +- roles/lib_zabbix/library/zbx_trigger.py | 2 +- roles/lib_zabbix/library/zbx_triggerprototype.py | 2 +- roles/lib_zabbix/library/zbx_user.py | 2 +- roles/lib_zabbix/library/zbx_user_media.py | 2 +- roles/lib_zabbix/library/zbx_usergroup.py | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) (limited to 'roles') diff --git a/roles/lib_zabbix/library/zbx_action.py b/roles/lib_zabbix/library/zbx_action.py index e7edcde2f..499084942 100644 --- a/roles/lib_zabbix/library/zbx_action.py +++ b/roles/lib_zabbix/library/zbx_action.py @@ -28,7 +28,7 @@ # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection, ZabbixAPIError +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection, ZabbixAPIError CUSTOM_SCRIPT_ACTION = '0' IPMI_ACTION = '1' diff --git a/roles/lib_zabbix/library/zbx_application.py b/roles/lib_zabbix/library/zbx_application.py index 21e3d91f4..472390071 100644 --- a/roles/lib_zabbix/library/zbx_application.py +++ b/roles/lib_zabbix/library/zbx_application.py @@ -28,7 +28,7 @@ Ansible module for application # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_discoveryrule.py b/roles/lib_zabbix/library/zbx_discoveryrule.py index f52f350a5..7c5f98397 100644 --- a/roles/lib_zabbix/library/zbx_discoveryrule.py +++ b/roles/lib_zabbix/library/zbx_discoveryrule.py @@ -25,7 +25,7 @@ Zabbix discovery rule ansible module # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_graph.py b/roles/lib_zabbix/library/zbx_graph.py index 121ec3dee..71f4e1264 100644 --- a/roles/lib_zabbix/library/zbx_graph.py +++ b/roles/lib_zabbix/library/zbx_graph.py @@ -49,7 +49,7 @@ # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_graphprototype.py b/roles/lib_zabbix/library/zbx_graphprototype.py index 8287c1e2d..d63873b00 100644 --- a/roles/lib_zabbix/library/zbx_graphprototype.py +++ b/roles/lib_zabbix/library/zbx_graphprototype.py @@ -49,7 +49,7 @@ # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_host.py b/roles/lib_zabbix/library/zbx_host.py index 560749f07..bbeec49ff 100644 --- a/roles/lib_zabbix/library/zbx_host.py +++ b/roles/lib_zabbix/library/zbx_host.py @@ -25,7 +25,7 @@ Zabbix host ansible module # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_hostgroup.py b/roles/lib_zabbix/library/zbx_hostgroup.py index 7f080af24..6c57d727e 100644 --- a/roles/lib_zabbix/library/zbx_hostgroup.py +++ b/roles/lib_zabbix/library/zbx_hostgroup.py @@ -27,7 +27,7 @@ # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_httptest.py b/roles/lib_zabbix/library/zbx_httptest.py index 6b28117ad..eab45d06e 100644 --- a/roles/lib_zabbix/library/zbx_httptest.py +++ b/roles/lib_zabbix/library/zbx_httptest.py @@ -28,7 +28,7 @@ # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_item.py b/roles/lib_zabbix/library/zbx_item.py index 996c98fae..189485fb7 100644 --- a/roles/lib_zabbix/library/zbx_item.py +++ b/roles/lib_zabbix/library/zbx_item.py @@ -28,7 +28,7 @@ # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_itemprototype.py b/roles/lib_zabbix/library/zbx_itemprototype.py index aca9c8336..eab2a04ae 100644 --- a/roles/lib_zabbix/library/zbx_itemprototype.py +++ b/roles/lib_zabbix/library/zbx_itemprototype.py @@ -25,7 +25,7 @@ Zabbix discovery rule ansible module # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_itservice.py b/roles/lib_zabbix/library/zbx_itservice.py index a5ee97e15..aa37f0a2b 100644 --- a/roles/lib_zabbix/library/zbx_itservice.py +++ b/roles/lib_zabbix/library/zbx_itservice.py @@ -28,7 +28,7 @@ # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_mediatype.py b/roles/lib_zabbix/library/zbx_mediatype.py index 3be232ecf..b8def3ca4 100644 --- a/roles/lib_zabbix/library/zbx_mediatype.py +++ b/roles/lib_zabbix/library/zbx_mediatype.py @@ -28,7 +28,7 @@ # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_template.py b/roles/lib_zabbix/library/zbx_template.py index ff5714bdc..cc713b998 100644 --- a/roles/lib_zabbix/library/zbx_template.py +++ b/roles/lib_zabbix/library/zbx_template.py @@ -28,7 +28,7 @@ Ansible module for template # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_trigger.py b/roles/lib_zabbix/library/zbx_trigger.py index b5faefa70..323defbd9 100644 --- a/roles/lib_zabbix/library/zbx_trigger.py +++ b/roles/lib_zabbix/library/zbx_trigger.py @@ -28,7 +28,7 @@ ansible module for zabbix triggers # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_triggerprototype.py b/roles/lib_zabbix/library/zbx_triggerprototype.py index c1224b268..34a7396a7 100644 --- a/roles/lib_zabbix/library/zbx_triggerprototype.py +++ b/roles/lib_zabbix/library/zbx_triggerprototype.py @@ -28,7 +28,7 @@ ansible module for zabbix triggerprototypes # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_user.py b/roles/lib_zabbix/library/zbx_user.py index 62c85c1bf..d10ffb9ff 100644 --- a/roles/lib_zabbix/library/zbx_user.py +++ b/roles/lib_zabbix/library/zbx_user.py @@ -27,7 +27,7 @@ ansible module for zabbix users # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_user_media.py b/roles/lib_zabbix/library/zbx_user_media.py index 8895c78c3..fc5624346 100644 --- a/roles/lib_zabbix/library/zbx_user_media.py +++ b/roles/lib_zabbix/library/zbx_user_media.py @@ -28,7 +28,7 @@ # pylint: disable=duplicate-code # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 diff --git a/roles/lib_zabbix/library/zbx_usergroup.py b/roles/lib_zabbix/library/zbx_usergroup.py index 3fd44d80c..e30ce6678 100644 --- a/roles/lib_zabbix/library/zbx_usergroup.py +++ b/roles/lib_zabbix/library/zbx_usergroup.py @@ -32,7 +32,7 @@ zabbix ansible module for usergroups # pylint: disable=too-many-branches # pylint: disable=import-error -from openshift_tools.monitoring.zbxapi import ZabbixAPI, ZabbixConnection +from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection def exists(content, key='result'): ''' Check if key exists in content or the size of content[key] > 0 -- cgit v1.2.1