From 1c373c112f13175bfe70300b3b307dbea38b1bad Mon Sep 17 00:00:00 2001 From: Tim Rupp Date: Fri, 1 Dec 2017 21:02:36 -0800 Subject: [PATCH] Minor fixes for gtm facts (#33476) Removed unused code and fixed upstream changes that broke downstream --- lib/ansible/modules/network/f5/bigip_gtm_facts.py | 1 - test/units/modules/network/f5/test_bigip_gtm_facts.py | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/network/f5/bigip_gtm_facts.py b/lib/ansible/modules/network/f5/bigip_gtm_facts.py index 8551203c903..e4b478badb5 100644 --- a/lib/ansible/modules/network/f5/bigip_gtm_facts.py +++ b/lib/ansible/modules/network/f5/bigip_gtm_facts.py @@ -183,7 +183,6 @@ from ansible.module_utils.f5_utils import AnsibleF5Parameters from ansible.module_utils.f5_utils import HAS_F5SDK from ansible.module_utils.f5_utils import F5ModuleError from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE -from ansible.module_utils.parsing.convert_bool import BOOLEANS_FALSE from ansible.module_utils.six import iteritems from collections import defaultdict from distutils.version import LooseVersion diff --git a/test/units/modules/network/f5/test_bigip_gtm_facts.py b/test/units/modules/network/f5/test_bigip_gtm_facts.py index 05a1c27e9d7..3753fd48589 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_facts.py +++ b/test/units/modules/network/f5/test_bigip_gtm_facts.py @@ -15,10 +15,10 @@ if sys.version_info < (2, 7): raise SkipTest("F5 Ansible modules require Python >= 2.7") from ansible.compat.tests import unittest -from ansible.compat.tests.mock import patch, Mock +from ansible.compat.tests.mock import Mock +from ansible.compat.tests.mock import patch from ansible.module_utils.f5_utils import AnsibleF5Client from ansible.module_utils.six import iteritems -from units.modules.utils import set_module_args try: from library.bigip_gtm_facts import Parameters @@ -37,6 +37,7 @@ try: from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError from f5.bigip.tm.gtm.pool import A from f5.utils.responses.handlers import Stats + from test.unit.modules.utils import set_module_args except ImportError: try: from ansible.modules.network.f5.bigip_gtm_pool import Parameters @@ -55,6 +56,7 @@ except ImportError: from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError from f5.bigip.tm.gtm.pool import A from f5.utils.responses.handlers import Stats + from units.modules.utils import set_module_args except ImportError: raise SkipTest("F5 Ansible modules require the f5-sdk Python library")