diff options
Diffstat (limited to 'test/units')
17 files changed, 189 insertions, 225 deletions
diff --git a/test/units/modules/network/f5/test_bigip_gtm_monitor_bigip.py b/test/units/modules/network/f5/test_bigip_gtm_monitor_bigip.py index a49d952fae..f65aeadb41 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_monitor_bigip.py +++ b/test/units/modules/network/f5/test_bigip_gtm_monitor_bigip.py @@ -29,20 +29,18 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_gtm_monitor_bigip import ApiParameters - from ansible.modules.network.f5.bigip_gtm_monitor_bigip import ModuleParameters - from ansible.modules.network.f5.bigip_gtm_monitor_bigip import ModuleManager - from ansible.modules.network.f5.bigip_gtm_monitor_bigip import ArgumentSpec - - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch - - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") + from ansible.modules.network.f5.bigip_gtm_monitor_bigip import ApiParameters + from ansible.modules.network.f5.bigip_gtm_monitor_bigip import ModuleParameters + from ansible.modules.network.f5.bigip_gtm_monitor_bigip import ModuleManager + from ansible.modules.network.f5.bigip_gtm_monitor_bigip import ArgumentSpec + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch + + from units.modules.utils import set_module_args + fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_gtm_monitor_external.py b/test/units/modules/network/f5/test_bigip_gtm_monitor_external.py index bae095b732..208d256bed 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_monitor_external.py +++ b/test/units/modules/network/f5/test_bigip_gtm_monitor_external.py @@ -29,20 +29,18 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_gtm_monitor_external import ApiParameters - from ansible.modules.network.f5.bigip_gtm_monitor_external import ModuleParameters - from ansible.modules.network.f5.bigip_gtm_monitor_external import ModuleManager - from ansible.modules.network.f5.bigip_gtm_monitor_external import ArgumentSpec - - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch - - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") + from ansible.modules.network.f5.bigip_gtm_monitor_external import ApiParameters + from ansible.modules.network.f5.bigip_gtm_monitor_external import ModuleParameters + from ansible.modules.network.f5.bigip_gtm_monitor_external import ModuleManager + from ansible.modules.network.f5.bigip_gtm_monitor_external import ArgumentSpec + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch + + from units.modules.utils import set_module_args + fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_gtm_monitor_firepass.py b/test/units/modules/network/f5/test_bigip_gtm_monitor_firepass.py index ac3dfeedf1..950c448f85 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_monitor_firepass.py +++ b/test/units/modules/network/f5/test_bigip_gtm_monitor_firepass.py @@ -29,20 +29,18 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_gtm_monitor_firepass import ApiParameters - from ansible.modules.network.f5.bigip_gtm_monitor_firepass import ModuleParameters - from ansible.modules.network.f5.bigip_gtm_monitor_firepass import ModuleManager - from ansible.modules.network.f5.bigip_gtm_monitor_firepass import ArgumentSpec - - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch - - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") + from ansible.modules.network.f5.bigip_gtm_monitor_firepass import ApiParameters + from ansible.modules.network.f5.bigip_gtm_monitor_firepass import ModuleParameters + from ansible.modules.network.f5.bigip_gtm_monitor_firepass import ModuleManager + from ansible.modules.network.f5.bigip_gtm_monitor_firepass import ArgumentSpec + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch + + from units.modules.utils import set_module_args + fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_gtm_monitor_http.py b/test/units/modules/network/f5/test_bigip_gtm_monitor_http.py index c759169e7c..371fd216b5 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_monitor_http.py +++ b/test/units/modules/network/f5/test_bigip_gtm_monitor_http.py @@ -29,20 +29,18 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_gtm_monitor_http import ApiParameters - from ansible.modules.network.f5.bigip_gtm_monitor_http import ModuleParameters - from ansible.modules.network.f5.bigip_gtm_monitor_http import ModuleManager - from ansible.modules.network.f5.bigip_gtm_monitor_http import ArgumentSpec - - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch - - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") + from ansible.modules.network.f5.bigip_gtm_monitor_http import ApiParameters + from ansible.modules.network.f5.bigip_gtm_monitor_http import ModuleParameters + from ansible.modules.network.f5.bigip_gtm_monitor_http import ModuleManager + from ansible.modules.network.f5.bigip_gtm_monitor_http import ArgumentSpec + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch + + from units.modules.utils import set_module_args + fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_gtm_monitor_https.py b/test/units/modules/network/f5/test_bigip_gtm_monitor_https.py index 7ea1f442e7..25f28e0ebe 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_monitor_https.py +++ b/test/units/modules/network/f5/test_bigip_gtm_monitor_https.py @@ -29,20 +29,18 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_gtm_monitor_https import ApiParameters - from ansible.modules.network.f5.bigip_gtm_monitor_https import ModuleParameters - from ansible.modules.network.f5.bigip_gtm_monitor_https import ModuleManager - from ansible.modules.network.f5.bigip_gtm_monitor_https import ArgumentSpec - - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch - - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") + from ansible.modules.network.f5.bigip_gtm_monitor_https import ApiParameters + from ansible.modules.network.f5.bigip_gtm_monitor_https import ModuleParameters + from ansible.modules.network.f5.bigip_gtm_monitor_https import ModuleManager + from ansible.modules.network.f5.bigip_gtm_monitor_https import ArgumentSpec + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch + + from units.modules.utils import set_module_args + fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_gtm_monitor_tcp.py b/test/units/modules/network/f5/test_bigip_gtm_monitor_tcp.py index 59a3be7c6b..d1674cd88a 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_monitor_tcp.py +++ b/test/units/modules/network/f5/test_bigip_gtm_monitor_tcp.py @@ -29,20 +29,18 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_gtm_monitor_tcp import ApiParameters - from ansible.modules.network.f5.bigip_gtm_monitor_tcp import ModuleParameters - from ansible.modules.network.f5.bigip_gtm_monitor_tcp import ModuleManager - from ansible.modules.network.f5.bigip_gtm_monitor_tcp import ArgumentSpec - - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch - - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") + from ansible.modules.network.f5.bigip_gtm_monitor_tcp import ApiParameters + from ansible.modules.network.f5.bigip_gtm_monitor_tcp import ModuleParameters + from ansible.modules.network.f5.bigip_gtm_monitor_tcp import ModuleManager + from ansible.modules.network.f5.bigip_gtm_monitor_tcp import ArgumentSpec + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch + + from units.modules.utils import set_module_args + fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_gtm_monitor_tcp_half_open.py b/test/units/modules/network/f5/test_bigip_gtm_monitor_tcp_half_open.py index ee728f43c4..4dd2f246e7 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_monitor_tcp_half_open.py +++ b/test/units/modules/network/f5/test_bigip_gtm_monitor_tcp_half_open.py @@ -29,20 +29,18 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_gtm_monitor_tcp_half_open import ApiParameters - from ansible.modules.network.f5.bigip_gtm_monitor_tcp_half_open import ModuleParameters - from ansible.modules.network.f5.bigip_gtm_monitor_tcp_half_open import ModuleManager - from ansible.modules.network.f5.bigip_gtm_monitor_tcp_half_open import ArgumentSpec - - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch - - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") + from ansible.modules.network.f5.bigip_gtm_monitor_tcp_half_open import ApiParameters + from ansible.modules.network.f5.bigip_gtm_monitor_tcp_half_open import ModuleParameters + from ansible.modules.network.f5.bigip_gtm_monitor_tcp_half_open import ModuleManager + from ansible.modules.network.f5.bigip_gtm_monitor_tcp_half_open import ArgumentSpec + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch + + from units.modules.utils import set_module_args + fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_monitor_dns.py b/test/units/modules/network/f5/test_bigip_monitor_dns.py index 45837fce53..2ead54e40b 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_dns.py +++ b/test/units/modules/network/f5/test_bigip_monitor_dns.py @@ -29,20 +29,18 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_monitor_dns import ApiParameters - from ansible.modules.network.f5.bigip_monitor_dns import ModuleParameters - from ansible.modules.network.f5.bigip_monitor_dns import ModuleManager - from ansible.modules.network.f5.bigip_monitor_dns import ArgumentSpec - - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch - - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") + from ansible.modules.network.f5.bigip_monitor_dns import ApiParameters + from ansible.modules.network.f5.bigip_monitor_dns import ModuleParameters + from ansible.modules.network.f5.bigip_monitor_dns import ModuleManager + from ansible.modules.network.f5.bigip_monitor_dns import ArgumentSpec + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch + + from units.modules.utils import set_module_args + fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_monitor_external.py b/test/units/modules/network/f5/test_bigip_monitor_external.py index 64286148aa..fb7d3027a5 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_external.py +++ b/test/units/modules/network/f5/test_bigip_monitor_external.py @@ -29,20 +29,18 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_monitor_external import ApiParameters - from ansible.modules.network.f5.bigip_monitor_external import ModuleParameters - from ansible.modules.network.f5.bigip_monitor_external import ModuleManager - from ansible.modules.network.f5.bigip_monitor_external import ArgumentSpec + from ansible.modules.network.f5.bigip_monitor_external import ApiParameters + from ansible.modules.network.f5.bigip_monitor_external import ModuleParameters + from ansible.modules.network.f5.bigip_monitor_external import ModuleManager + from ansible.modules.network.f5.bigip_monitor_external import ArgumentSpec + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch + from units.modules.utils import set_module_args - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} @@ -89,8 +87,6 @@ class TestParameters(unittest.TestCase): assert p.timeout == 30 -@patch('ansible.module_utils.f5_utils.AnsibleF5Client._get_mgmt_root', - return_value=True) class TestManager(unittest.TestCase): def setUp(self): diff --git a/test/units/modules/network/f5/test_bigip_monitor_http.py b/test/units/modules/network/f5/test_bigip_monitor_http.py index 0be84a6c8e..8654b621bb 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_http.py +++ b/test/units/modules/network/f5/test_bigip_monitor_http.py @@ -31,21 +31,19 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_monitor_http import Parameters - from ansible.modules.network.f5.bigip_monitor_http import ModuleManager - from ansible.modules.network.f5.bigip_monitor_http import ArgumentSpec + from ansible.modules.network.f5.bigip_monitor_http import Parameters + from ansible.modules.network.f5.bigip_monitor_http import ModuleManager + from ansible.modules.network.f5.bigip_monitor_http import ArgumentSpec + + from ansible.module_utils.network.f5.common import F5ModuleError - from ansible.module_utils.network.f5.common import F5ModuleError + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch + from units.modules.utils import set_module_args - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_monitor_https.py b/test/units/modules/network/f5/test_bigip_monitor_https.py index 463951fdda..5f16e69ffa 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_https.py +++ b/test/units/modules/network/f5/test_bigip_monitor_https.py @@ -31,21 +31,19 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_monitor_https import Parameters - from ansible.modules.network.f5.bigip_monitor_https import ModuleManager - from ansible.modules.network.f5.bigip_monitor_https import ArgumentSpec + from ansible.modules.network.f5.bigip_monitor_https import Parameters + from ansible.modules.network.f5.bigip_monitor_https import ModuleManager + from ansible.modules.network.f5.bigip_monitor_https import ArgumentSpec + + from ansible.module_utils.network.f5.common import F5ModuleError - from ansible.module_utils.network.f5.common import F5ModuleError + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch + from units.modules.utils import set_module_args - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_monitor_ldap.py b/test/units/modules/network/f5/test_bigip_monitor_ldap.py index c6732d6a12..6c41d0e867 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_ldap.py +++ b/test/units/modules/network/f5/test_bigip_monitor_ldap.py @@ -29,20 +29,18 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_monitor_ldap import ApiParameters - from ansible.modules.network.f5.bigip_monitor_ldap import ModuleParameters - from ansible.modules.network.f5.bigip_monitor_ldap import ModuleManager - from ansible.modules.network.f5.bigip_monitor_ldap import ArgumentSpec - - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch - - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") + from ansible.modules.network.f5.bigip_monitor_ldap import ApiParameters + from ansible.modules.network.f5.bigip_monitor_ldap import ModuleParameters + from ansible.modules.network.f5.bigip_monitor_ldap import ModuleManager + from ansible.modules.network.f5.bigip_monitor_ldap import ArgumentSpec + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch + + from units.modules.utils import set_module_args + fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_monitor_snmp_dca.py b/test/units/modules/network/f5/test_bigip_monitor_snmp_dca.py index 05a1973486..1df0891b10 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_snmp_dca.py +++ b/test/units/modules/network/f5/test_bigip_monitor_snmp_dca.py @@ -28,19 +28,17 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_monitor_snmp_dca import Parameters - from ansible.modules.network.f5.bigip_monitor_snmp_dca import ModuleManager - from ansible.modules.network.f5.bigip_monitor_snmp_dca import ArgumentSpec - - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch - - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") + from ansible.modules.network.f5.bigip_monitor_snmp_dca import Parameters + from ansible.modules.network.f5.bigip_monitor_snmp_dca import ModuleManager + from ansible.modules.network.f5.bigip_monitor_snmp_dca import ArgumentSpec + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch + + from units.modules.utils import set_module_args + fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_monitor_tcp.py b/test/units/modules/network/f5/test_bigip_monitor_tcp.py index 4396f50bdc..d21d954333 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_tcp.py +++ b/test/units/modules/network/f5/test_bigip_monitor_tcp.py @@ -31,21 +31,19 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_monitor_tcp import Parameters - from ansible.modules.network.f5.bigip_monitor_tcp import ModuleManager - from ansible.modules.network.f5.bigip_monitor_tcp import ArgumentSpec + from ansible.modules.network.f5.bigip_monitor_tcp import Parameters + from ansible.modules.network.f5.bigip_monitor_tcp import ModuleManager + from ansible.modules.network.f5.bigip_monitor_tcp import ArgumentSpec + + from ansible.module_utils.network.f5.common import F5ModuleError - from ansible.module_utils.network.f5.common import F5ModuleError + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch + from units.modules.utils import set_module_args - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_monitor_tcp_echo.py b/test/units/modules/network/f5/test_bigip_monitor_tcp_echo.py index 6e56dceb93..ec68beee9a 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_tcp_echo.py +++ b/test/units/modules/network/f5/test_bigip_monitor_tcp_echo.py @@ -31,21 +31,19 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_monitor_tcp_echo import Parameters - from ansible.modules.network.f5.bigip_monitor_tcp_echo import ModuleManager - from ansible.modules.network.f5.bigip_monitor_tcp_echo import ArgumentSpec + from ansible.modules.network.f5.bigip_monitor_tcp_echo import Parameters + from ansible.modules.network.f5.bigip_monitor_tcp_echo import ModuleManager + from ansible.modules.network.f5.bigip_monitor_tcp_echo import ArgumentSpec + + from ansible.module_utils.network.f5.common import F5ModuleError - from ansible.module_utils.network.f5.common import F5ModuleError + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch + from units.modules.utils import set_module_args - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_monitor_tcp_half_open.py b/test/units/modules/network/f5/test_bigip_monitor_tcp_half_open.py index fb661cf81c..6b2e022779 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_tcp_half_open.py +++ b/test/units/modules/network/f5/test_bigip_monitor_tcp_half_open.py @@ -31,21 +31,19 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_monitor_tcp_half_open import Parameters - from ansible.modules.network.f5.bigip_monitor_tcp_half_open import ModuleManager - from ansible.modules.network.f5.bigip_monitor_tcp_half_open import ArgumentSpec + from ansible.modules.network.f5.bigip_monitor_tcp_half_open import Parameters + from ansible.modules.network.f5.bigip_monitor_tcp_half_open import ModuleManager + from ansible.modules.network.f5.bigip_monitor_tcp_half_open import ArgumentSpec + + from ansible.module_utils.network.f5.common import F5ModuleError - from ansible.module_utils.network.f5.common import F5ModuleError + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch + from units.modules.utils import set_module_args - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} diff --git a/test/units/modules/network/f5/test_bigip_monitor_udp.py b/test/units/modules/network/f5/test_bigip_monitor_udp.py index 559b984d5a..4c7fe3b4d7 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_udp.py +++ b/test/units/modules/network/f5/test_bigip_monitor_udp.py @@ -31,21 +31,19 @@ try: from test.units.modules.utils import set_module_args except ImportError: - try: - from ansible.modules.network.f5.bigip_monitor_udp import Parameters - from ansible.modules.network.f5.bigip_monitor_udp import ModuleManager - from ansible.modules.network.f5.bigip_monitor_udp import ArgumentSpec + from ansible.modules.network.f5.bigip_monitor_udp import Parameters + from ansible.modules.network.f5.bigip_monitor_udp import ModuleManager + from ansible.modules.network.f5.bigip_monitor_udp import ArgumentSpec + + from ansible.module_utils.network.f5.common import F5ModuleError - from ansible.module_utils.network.f5.common import F5ModuleError + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch - # Ansible 2.8 imports - from units.compat import unittest - from units.compat.mock import Mock - from units.compat.mock import patch + from units.modules.utils import set_module_args - from units.modules.utils import set_module_args - except ImportError: - raise SkipTest("F5 Ansible modules require the f5-sdk Python library") fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') fixture_data = {} |