From 3929dc00a1dda3278d011a394565a9bfb7fb1c03 Mon Sep 17 00:00:00 2001 From: Andrey Klychkov Date: Mon, 12 Aug 2019 14:35:39 +0300 Subject: [PATCH] unittests: remove unused imports (#60404) --- .../modules/network/f5/test_bigip_apm_acl.py | 2 -- .../f5/test_bigip_apm_network_access.py | 2 -- .../network/f5/test_bigip_apm_policy_fetch.py | 2 -- .../f5/test_bigip_apm_policy_import.py | 2 -- .../network/f5/test_bigip_asm_policy_fetch.py | 2 -- .../f5/test_bigip_asm_policy_import.py | 2 -- .../f5/test_bigip_asm_policy_manage.py | 4 ---- ...test_bigip_asm_policy_server_technology.py | 2 -- .../f5/test_bigip_asm_policy_signature_set.py | 2 -- .../network/f5/test_bigip_cli_script.py | 2 -- .../modules/network/f5/test_bigip_config.py | 2 -- .../network/f5/test_bigip_data_group.py | 2 -- .../network/f5/test_bigip_device_auth.py | 2 -- .../network/f5/test_bigip_device_auth_ldap.py | 4 ---- .../f5/test_bigip_device_certificate.py | 4 ---- .../f5/test_bigip_device_connectivity.py | 2 -- .../network/f5/test_bigip_device_dns.py | 2 -- .../network/f5/test_bigip_device_group.py | 2 -- .../f5/test_bigip_device_group_member.py | 2 -- .../network/f5/test_bigip_device_ha_group.py | 2 -- .../network/f5/test_bigip_device_info.py | 2 -- .../network/f5/test_bigip_device_license.py | 2 -- .../network/f5/test_bigip_device_ntp.py | 2 -- .../network/f5/test_bigip_device_sshd.py | 2 -- .../network/f5/test_bigip_device_syslog.py | 2 -- .../f5/test_bigip_device_traffic_group.py | 2 -- .../network/f5/test_bigip_device_trust.py | 2 -- .../f5/test_bigip_dns_cache_resolver.py | 2 -- .../network/f5/test_bigip_dns_nameserver.py | 2 -- .../network/f5/test_bigip_dns_resolver.py | 2 -- .../modules/network/f5/test_bigip_dns_zone.py | 2 -- .../network/f5/test_bigip_file_copy.py | 2 -- .../f5/test_bigip_firewall_address_list.py | 2 -- .../f5/test_bigip_firewall_dos_profile.py | 4 ---- .../f5/test_bigip_firewall_dos_vector.py | 4 ---- .../f5/test_bigip_firewall_global_rules.py | 2 -- .../f5/test_bigip_firewall_log_profile.py | 2 -- ...test_bigip_firewall_log_profile_network.py | 2 -- .../network/f5/test_bigip_firewall_policy.py | 2 -- .../network/f5/test_bigip_firewall_rule.py | 4 ---- .../f5/test_bigip_firewall_rule_list.py | 4 ---- .../f5/test_bigip_firewall_schedule.py | 2 -- .../network/f5/test_bigip_gtm_facts.py | 21 ------------------- .../network/f5/test_bigip_gtm_global.py | 2 -- .../f5/test_bigip_gtm_monitor_external.py | 2 -- .../f5/test_bigip_gtm_topology_record.py | 2 -- .../f5/test_bigip_gtm_topology_region.py | 2 -- .../modules/network/f5/test_bigip_hostname.py | 2 -- .../network/f5/test_bigip_iapp_service.py | 2 -- .../network/f5/test_bigip_iapp_template.py | 2 -- .../modules/network/f5/test_bigip_ike_peer.py | 2 -- .../network/f5/test_bigip_imish_config.py | 6 ------ .../network/f5/test_bigip_ipsec_policy.py | 2 -- .../network/f5/test_bigip_log_destination.py | 8 ------- .../network/f5/test_bigip_log_publisher.py | 2 -- .../network/f5/test_bigip_management_route.py | 2 -- .../f5/test_bigip_message_routing_peer.py | 2 -- .../f5/test_bigip_message_routing_protocol.py | 2 -- .../f5/test_bigip_message_routing_route.py | 2 -- .../f5/test_bigip_message_routing_router.py | 2 -- ..._bigip_message_routing_transport_config.py | 2 -- .../network/f5/test_bigip_monitor_dns.py | 2 -- .../network/f5/test_bigip_monitor_external.py | 4 ---- .../f5/test_bigip_monitor_gateway_icmp.py | 2 -- .../network/f5/test_bigip_monitor_http.py | 2 -- .../network/f5/test_bigip_monitor_https.py | 2 -- .../network/f5/test_bigip_monitor_ldap.py | 4 ---- .../network/f5/test_bigip_monitor_snmp_dca.py | 2 -- .../network/f5/test_bigip_monitor_tcp.py | 2 -- .../network/f5/test_bigip_monitor_tcp_echo.py | 2 -- .../f5/test_bigip_monitor_tcp_half_open.py | 2 -- .../network/f5/test_bigip_monitor_udp.py | 2 -- .../modules/network/f5/test_bigip_node.py | 4 ---- .../network/f5/test_bigip_partition.py | 2 -- .../modules/network/f5/test_bigip_policy.py | 4 ---- .../network/f5/test_bigip_policy_rule.py | 4 ---- .../modules/network/f5/test_bigip_pool.py | 2 -- .../network/f5/test_bigip_pool_member.py | 2 -- .../f5/test_bigip_profile_analytics.py | 2 -- .../f5/test_bigip_profile_client_ssl.py | 2 -- .../network/f5/test_bigip_profile_dns.py | 2 -- .../network/f5/test_bigip_profile_fastl4.py | 2 -- .../network/f5/test_bigip_profile_http.py | 2 -- .../network/f5/test_bigip_profile_http2.py | 2 -- .../f5/test_bigip_profile_http_compression.py | 2 -- .../f5/test_bigip_profile_oneconnect.py | 2 -- .../test_bigip_profile_persistence_cookie.py | 2 -- ...test_bigip_profile_persistence_src_addr.py | 2 -- .../f5/test_bigip_profile_server_ssl.py | 2 -- .../network/f5/test_bigip_profile_tcp.py | 2 -- .../network/f5/test_bigip_profile_udp.py | 2 -- .../network/f5/test_bigip_remote_role.py | 2 -- .../network/f5/test_bigip_remote_syslog.py | 4 ---- .../network/f5/test_bigip_remote_user.py | 2 -- .../network/f5/test_bigip_routedomain.py | 2 -- .../f5/test_bigip_security_address_list.py | 5 ----- .../f5/test_bigip_security_port_list.py | 5 ----- .../modules/network/f5/test_bigip_selfip.py | 2 -- .../modules/network/f5/test_bigip_smtp.py | 2 -- .../network/f5/test_bigip_snat_pool.py | 2 -- .../network/f5/test_bigip_snat_translation.py | 2 -- .../modules/network/f5/test_bigip_snmp.py | 2 -- .../network/f5/test_bigip_snmp_community.py | 2 -- .../network/f5/test_bigip_software_image.py | 2 -- .../network/f5/test_bigip_software_install.py | 2 -- .../network/f5/test_bigip_software_update.py | 2 -- .../network/f5/test_bigip_ssl_certificate.py | 2 -- .../modules/network/f5/test_bigip_ssl_key.py | 2 -- .../f5/test_bigip_sys_daemon_log_tmm.py | 2 -- .../modules/network/f5/test_bigip_sys_db.py | 2 -- .../network/f5/test_bigip_sys_global.py | 2 -- .../network/f5/test_bigip_timer_policy.py | 2 -- .../network/f5/test_bigip_traffic_selector.py | 2 -- .../modules/network/f5/test_bigip_trunk.py | 2 -- .../modules/network/f5/test_bigip_tunnel.py | 2 -- .../network/f5/test_bigip_ucs_fetch.py | 2 -- .../modules/network/f5/test_bigip_user.py | 2 -- .../network/f5/test_bigip_virtual_address.py | 2 -- .../modules/network/f5/test_bigip_vlan.py | 2 -- 119 files changed, 299 deletions(-) diff --git a/test/units/modules/network/f5/test_bigip_apm_acl.py b/test/units/modules/network/f5/test_bigip_apm_acl.py index 5556dcfb3fe..157438c258a 100644 --- a/test/units/modules/network/f5/test_bigip_apm_acl.py +++ b/test/units/modules/network/f5/test_bigip_apm_acl.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_apm_network_access.py b/test/units/modules/network/f5/test_bigip_apm_network_access.py index 94e52450da0..eafd99cbb72 100644 --- a/test/units/modules/network/f5/test_bigip_apm_network_access.py +++ b/test/units/modules/network/f5/test_bigip_apm_network_access.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_apm_policy_fetch.py b/test/units/modules/network/f5/test_bigip_apm_policy_fetch.py index b6aa5c18268..070b1e9b2bf 100644 --- a/test/units/modules/network/f5/test_bigip_apm_policy_fetch.py +++ b/test/units/modules/network/f5/test_bigip_apm_policy_fetch.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_apm_policy_fetch import ApiParameters from library.modules.bigip_apm_policy_fetch import ModuleParameters from library.modules.bigip_apm_policy_fetch import ModuleManager from library.modules.bigip_apm_policy_fetch import ArgumentSpec @@ -29,7 +28,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_apm_policy_fetch import ApiParameters from ansible.modules.network.f5.bigip_apm_policy_fetch import ModuleParameters from ansible.modules.network.f5.bigip_apm_policy_fetch import ModuleManager from ansible.modules.network.f5.bigip_apm_policy_fetch import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigip_apm_policy_import.py b/test/units/modules/network/f5/test_bigip_apm_policy_import.py index 276b907e59b..356a765cd8f 100644 --- a/test/units/modules/network/f5/test_bigip_apm_policy_import.py +++ b/test/units/modules/network/f5/test_bigip_apm_policy_import.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_apm_policy_import import ApiParameters from library.modules.bigip_apm_policy_import import ModuleParameters from library.modules.bigip_apm_policy_import import ModuleManager from library.modules.bigip_apm_policy_import import ArgumentSpec @@ -29,7 +28,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_apm_policy_import import ApiParameters from ansible.modules.network.f5.bigip_apm_policy_import import ModuleParameters from ansible.modules.network.f5.bigip_apm_policy_import import ModuleManager from ansible.modules.network.f5.bigip_apm_policy_import import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigip_asm_policy_fetch.py b/test/units/modules/network/f5/test_bigip_asm_policy_fetch.py index a6910fe61b6..2c40ffcd982 100644 --- a/test/units/modules/network/f5/test_bigip_asm_policy_fetch.py +++ b/test/units/modules/network/f5/test_bigip_asm_policy_fetch.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_asm_policy_fetch import ApiParameters from library.modules.bigip_asm_policy_fetch import ModuleParameters from library.modules.bigip_asm_policy_fetch import ModuleManager from library.modules.bigip_asm_policy_fetch import ArgumentSpec @@ -29,7 +28,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_asm_policy_fetch import ApiParameters from ansible.modules.network.f5.bigip_asm_policy_fetch import ModuleParameters from ansible.modules.network.f5.bigip_asm_policy_fetch import ModuleManager from ansible.modules.network.f5.bigip_asm_policy_fetch import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigip_asm_policy_import.py b/test/units/modules/network/f5/test_bigip_asm_policy_import.py index 467be967575..5de1dcf1105 100644 --- a/test/units/modules/network/f5/test_bigip_asm_policy_import.py +++ b/test/units/modules/network/f5/test_bigip_asm_policy_import.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_asm_policy_import import ApiParameters from library.modules.bigip_asm_policy_import import ModuleParameters from library.modules.bigip_asm_policy_import import ModuleManager from library.modules.bigip_asm_policy_import import ArgumentSpec @@ -29,7 +28,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_asm_policy_import import ApiParameters from ansible.modules.network.f5.bigip_asm_policy_import import ModuleParameters from ansible.modules.network.f5.bigip_asm_policy_import import ModuleManager from ansible.modules.network.f5.bigip_asm_policy_import import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigip_asm_policy_manage.py b/test/units/modules/network/f5/test_bigip_asm_policy_manage.py index 0d5fc5f0011..6379b6600db 100644 --- a/test/units/modules/network/f5/test_bigip_asm_policy_manage.py +++ b/test/units/modules/network/f5/test_bigip_asm_policy_manage.py @@ -18,10 +18,8 @@ from ansible.module_utils.basic import AnsibleModule try: from library.modules.bigip_asm_policy_manage import V1Parameters - from library.modules.bigip_asm_policy_manage import V2Parameters from library.modules.bigip_asm_policy_manage import ModuleManager from library.modules.bigip_asm_policy_manage import V1Manager - from library.modules.bigip_asm_policy_manage import V2Manager from library.modules.bigip_asm_policy_manage import ArgumentSpec from library.module_utils.network.f5.common import F5ModuleError @@ -34,10 +32,8 @@ try: from test.units.modules.utils import set_module_args except ImportError: from ansible.modules.network.f5.bigip_asm_policy_manage import V1Parameters - from ansible.modules.network.f5.bigip_asm_policy_manage import V2Parameters from ansible.modules.network.f5.bigip_asm_policy_manage import ModuleManager from ansible.modules.network.f5.bigip_asm_policy_manage import V1Manager - from ansible.modules.network.f5.bigip_asm_policy_manage import V2Manager from ansible.modules.network.f5.bigip_asm_policy_manage import ArgumentSpec from ansible.module_utils.network.f5.common import F5ModuleError diff --git a/test/units/modules/network/f5/test_bigip_asm_policy_server_technology.py b/test/units/modules/network/f5/test_bigip_asm_policy_server_technology.py index 74c3e0d832d..60c0530821b 100644 --- a/test/units/modules/network/f5/test_bigip_asm_policy_server_technology.py +++ b/test/units/modules/network/f5/test_bigip_asm_policy_server_technology.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_asm_policy_server_technology import ApiParameters from library.modules.bigip_asm_policy_server_technology import ModuleParameters from library.modules.bigip_asm_policy_server_technology import ModuleManager from library.modules.bigip_asm_policy_server_technology import ArgumentSpec @@ -29,7 +28,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_asm_policy_server_technology import ApiParameters from ansible.modules.network.f5.bigip_asm_policy_server_technology import ModuleParameters from ansible.modules.network.f5.bigip_asm_policy_server_technology import ModuleManager from ansible.modules.network.f5.bigip_asm_policy_server_technology import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigip_asm_policy_signature_set.py b/test/units/modules/network/f5/test_bigip_asm_policy_signature_set.py index f9d97796806..7c23a5c17f8 100644 --- a/test/units/modules/network/f5/test_bigip_asm_policy_signature_set.py +++ b/test/units/modules/network/f5/test_bigip_asm_policy_signature_set.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_asm_policy_signature_set import ApiParameters from library.modules.bigip_asm_policy_signature_set import ModuleParameters from library.modules.bigip_asm_policy_signature_set import ModuleManager from library.modules.bigip_asm_policy_signature_set import ArgumentSpec @@ -29,7 +28,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_asm_policy_signature_set import ApiParameters from ansible.modules.network.f5.bigip_asm_policy_signature_set import ModuleParameters from ansible.modules.network.f5.bigip_asm_policy_signature_set import ModuleManager from ansible.modules.network.f5.bigip_asm_policy_signature_set import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigip_cli_script.py b/test/units/modules/network/f5/test_bigip_cli_script.py index 2e94e44e97b..382b0fc61e3 100644 --- a/test/units/modules/network/f5/test_bigip_cli_script.py +++ b/test/units/modules/network/f5/test_bigip_cli_script.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_config.py b/test/units/modules/network/f5/test_bigip_config.py index 1d68eee6ed6..9c616c11ab6 100644 --- a/test/units/modules/network/f5/test_bigip_config.py +++ b/test/units/modules/network/f5/test_bigip_config.py @@ -24,7 +24,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -35,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_data_group.py b/test/units/modules/network/f5/test_bigip_data_group.py index 46d5c996039..fda1a71b7ff 100644 --- a/test/units/modules/network/f5/test_bigip_data_group.py +++ b/test/units/modules/network/f5/test_bigip_data_group.py @@ -28,7 +28,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -43,7 +42,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_device_auth.py b/test/units/modules/network/f5/test_bigip_device_auth.py index af26e46837c..cddce386377 100644 --- a/test/units/modules/network/f5/test_bigip_device_auth.py +++ b/test/units/modules/network/f5/test_bigip_device_auth.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_device_auth_ldap.py b/test/units/modules/network/f5/test_bigip_device_auth_ldap.py index 3b611a901cc..014a2076fd9 100644 --- a/test/units/modules/network/f5/test_bigip_device_auth_ldap.py +++ b/test/units/modules/network/f5/test_bigip_device_auth_ldap.py @@ -18,26 +18,22 @@ from ansible.module_utils.basic import AnsibleModule try: from library.modules.bigip_device_auth_ldap import ApiParameters - from library.modules.bigip_device_auth_ldap import ModuleParameters from library.modules.bigip_device_auth_ldap import ModuleManager from library.modules.bigip_device_auth_ldap import ArgumentSpec # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: from ansible.modules.network.f5.bigip_device_auth_ldap import ApiParameters - from ansible.modules.network.f5.bigip_device_auth_ldap import ModuleParameters from ansible.modules.network.f5.bigip_device_auth_ldap import ModuleManager from ansible.modules.network.f5.bigip_device_auth_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 diff --git a/test/units/modules/network/f5/test_bigip_device_certificate.py b/test/units/modules/network/f5/test_bigip_device_certificate.py index 338591137a5..cb8d87dafcf 100644 --- a/test/units/modules/network/f5/test_bigip_device_certificate.py +++ b/test/units/modules/network/f5/test_bigip_device_certificate.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_device_certificate import ApiParameters from library.modules.bigip_device_certificate import ModuleParameters from library.modules.bigip_device_certificate import ModuleManager from library.modules.bigip_device_certificate import ArgumentSpec @@ -25,11 +24,9 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_device_certificate import ApiParameters from ansible.modules.network.f5.bigip_device_certificate import ModuleParameters from ansible.modules.network.f5.bigip_device_certificate import ModuleManager from ansible.modules.network.f5.bigip_device_certificate import ArgumentSpec @@ -37,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_device_connectivity.py b/test/units/modules/network/f5/test_bigip_device_connectivity.py index d0398badbd4..178f8615f06 100644 --- a/test/units/modules/network/f5/test_bigip_device_connectivity.py +++ b/test/units/modules/network/f5/test_bigip_device_connectivity.py @@ -27,7 +27,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -41,7 +40,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_device_dns.py b/test/units/modules/network/f5/test_bigip_device_dns.py index 8d8afecd9b0..d0d1f182dd9 100644 --- a/test/units/modules/network/f5/test_bigip_device_dns.py +++ b/test/units/modules/network/f5/test_bigip_device_dns.py @@ -24,7 +24,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -35,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_device_group.py b/test/units/modules/network/f5/test_bigip_device_group.py index d7501004fd6..fbf4be059da 100644 --- a/test/units/modules/network/f5/test_bigip_device_group.py +++ b/test/units/modules/network/f5/test_bigip_device_group.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_device_group_member.py b/test/units/modules/network/f5/test_bigip_device_group_member.py index 65836db5b3f..31e506b8c57 100644 --- a/test/units/modules/network/f5/test_bigip_device_group_member.py +++ b/test/units/modules/network/f5/test_bigip_device_group_member.py @@ -24,7 +24,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -35,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_device_ha_group.py b/test/units/modules/network/f5/test_bigip_device_ha_group.py index 942194856f9..37b50d2d0a2 100644 --- a/test/units/modules/network/f5/test_bigip_device_ha_group.py +++ b/test/units/modules/network/f5/test_bigip_device_ha_group.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_device_ha_group import ApiParameters from library.modules.bigip_device_ha_group import ModuleParameters from library.modules.bigip_device_ha_group import ModuleManager from library.modules.bigip_device_ha_group import ArgumentSpec @@ -29,7 +28,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_device_ha_group import ApiParameters from ansible.modules.network.f5.bigip_device_ha_group import ModuleParameters from ansible.modules.network.f5.bigip_device_ha_group import ModuleManager from ansible.modules.network.f5.bigip_device_ha_group import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigip_device_info.py b/test/units/modules/network/f5/test_bigip_device_info.py index 6b349ba2800..2291c02a2ab 100644 --- a/test/units/modules/network/f5/test_bigip_device_info.py +++ b/test/units/modules/network/f5/test_bigip_device_info.py @@ -20,7 +20,6 @@ from ansible.module_utils.six import iteritems try: from library.modules.bigip_device_info import Parameters from library.modules.bigip_device_info import VirtualAddressesFactManager - from library.modules.bigip_device_info import VirtualAddressesParameters from library.modules.bigip_device_info import ArgumentSpec from library.modules.bigip_device_info import ModuleManager @@ -33,7 +32,6 @@ try: except ImportError: from ansible.modules.network.f5.bigip_device_info import Parameters from ansible.modules.network.f5.bigip_device_info import VirtualAddressesFactManager - from ansible.modules.network.f5.bigip_device_info import VirtualAddressesParameters from ansible.modules.network.f5.bigip_device_info import ArgumentSpec from ansible.modules.network.f5.bigip_device_info import ModuleManager diff --git a/test/units/modules/network/f5/test_bigip_device_license.py b/test/units/modules/network/f5/test_bigip_device_license.py index 30edcd0dc89..e3846862b33 100644 --- a/test/units/modules/network/f5/test_bigip_device_license.py +++ b/test/units/modules/network/f5/test_bigip_device_license.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_device_license import ApiParameters from library.modules.bigip_device_license import ModuleParameters from library.modules.bigip_device_license import ModuleManager from library.modules.bigip_device_license import ArgumentSpec @@ -29,7 +28,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_device_license import ApiParameters from ansible.modules.network.f5.bigip_device_license import ModuleParameters from ansible.modules.network.f5.bigip_device_license import ModuleManager from ansible.modules.network.f5.bigip_device_license import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigip_device_ntp.py b/test/units/modules/network/f5/test_bigip_device_ntp.py index 6cc4b9d29ff..209af006c0a 100644 --- a/test/units/modules/network/f5/test_bigip_device_ntp.py +++ b/test/units/modules/network/f5/test_bigip_device_ntp.py @@ -24,7 +24,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -35,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_device_sshd.py b/test/units/modules/network/f5/test_bigip_device_sshd.py index 82ea5fa08d5..03ad4036ee4 100644 --- a/test/units/modules/network/f5/test_bigip_device_sshd.py +++ b/test/units/modules/network/f5/test_bigip_device_sshd.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_device_syslog.py b/test/units/modules/network/f5/test_bigip_device_syslog.py index 6ff08294c51..cde3babbb9f 100644 --- a/test/units/modules/network/f5/test_bigip_device_syslog.py +++ b/test/units/modules/network/f5/test_bigip_device_syslog.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_device_traffic_group.py b/test/units/modules/network/f5/test_bigip_device_traffic_group.py index 9d4cf12e5e4..3454e1d770b 100644 --- a/test/units/modules/network/f5/test_bigip_device_traffic_group.py +++ b/test/units/modules/network/f5/test_bigip_device_traffic_group.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_device_trust.py b/test/units/modules/network/f5/test_bigip_device_trust.py index 56c4e7a40d6..6c7f325b012 100644 --- a/test/units/modules/network/f5/test_bigip_device_trust.py +++ b/test/units/modules/network/f5/test_bigip_device_trust.py @@ -24,7 +24,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -35,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_dns_cache_resolver.py b/test/units/modules/network/f5/test_bigip_dns_cache_resolver.py index cc79ceb0c9f..924e2c6a920 100644 --- a/test/units/modules/network/f5/test_bigip_dns_cache_resolver.py +++ b/test/units/modules/network/f5/test_bigip_dns_cache_resolver.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_dns_nameserver.py b/test/units/modules/network/f5/test_bigip_dns_nameserver.py index b4627a8e0a6..5d7adeb2c2e 100644 --- a/test/units/modules/network/f5/test_bigip_dns_nameserver.py +++ b/test/units/modules/network/f5/test_bigip_dns_nameserver.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_dns_resolver.py b/test/units/modules/network/f5/test_bigip_dns_resolver.py index bdb370169cc..568f6432e8d 100644 --- a/test/units/modules/network/f5/test_bigip_dns_resolver.py +++ b/test/units/modules/network/f5/test_bigip_dns_resolver.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_dns_zone.py b/test/units/modules/network/f5/test_bigip_dns_zone.py index a3958a62fcf..38d6193ee74 100644 --- a/test/units/modules/network/f5/test_bigip_dns_zone.py +++ b/test/units/modules/network/f5/test_bigip_dns_zone.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_file_copy.py b/test/units/modules/network/f5/test_bigip_file_copy.py index f6ce1987ccc..c52886065e8 100644 --- a/test/units/modules/network/f5/test_bigip_file_copy.py +++ b/test/units/modules/network/f5/test_bigip_file_copy.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_firewall_address_list.py b/test/units/modules/network/f5/test_bigip_firewall_address_list.py index d07812f67e6..17457a240bf 100644 --- a/test/units/modules/network/f5/test_bigip_firewall_address_list.py +++ b/test/units/modules/network/f5/test_bigip_firewall_address_list.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_firewall_dos_profile.py b/test/units/modules/network/f5/test_bigip_firewall_dos_profile.py index 7b268f6abec..8f0bdd69147 100644 --- a/test/units/modules/network/f5/test_bigip_firewall_dos_profile.py +++ b/test/units/modules/network/f5/test_bigip_firewall_dos_profile.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_firewall_dos_profile import ApiParameters from library.modules.bigip_firewall_dos_profile import ModuleParameters from library.modules.bigip_firewall_dos_profile import ModuleManager from library.modules.bigip_firewall_dos_profile import ArgumentSpec @@ -25,11 +24,9 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_firewall_dos_profile import ApiParameters from ansible.modules.network.f5.bigip_firewall_dos_profile import ModuleParameters from ansible.modules.network.f5.bigip_firewall_dos_profile import ModuleManager from ansible.modules.network.f5.bigip_firewall_dos_profile import ArgumentSpec @@ -37,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_firewall_dos_vector.py b/test/units/modules/network/f5/test_bigip_firewall_dos_vector.py index 0260ee54af9..dbcad842d60 100644 --- a/test/units/modules/network/f5/test_bigip_firewall_dos_vector.py +++ b/test/units/modules/network/f5/test_bigip_firewall_dos_vector.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_firewall_dos_vector import ApiParameters from library.modules.bigip_firewall_dos_vector import ModuleParameters from library.modules.bigip_firewall_dos_vector import ModuleManager from library.modules.bigip_firewall_dos_vector import ArgumentSpec @@ -26,11 +25,9 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_firewall_dos_vector import ApiParameters from ansible.modules.network.f5.bigip_firewall_dos_vector import ModuleParameters from ansible.modules.network.f5.bigip_firewall_dos_vector import ModuleManager from ansible.modules.network.f5.bigip_firewall_dos_vector import ArgumentSpec @@ -39,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_firewall_global_rules.py b/test/units/modules/network/f5/test_bigip_firewall_global_rules.py index 192ff637544..be3442a2250 100644 --- a/test/units/modules/network/f5/test_bigip_firewall_global_rules.py +++ b/test/units/modules/network/f5/test_bigip_firewall_global_rules.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_firewall_log_profile.py b/test/units/modules/network/f5/test_bigip_firewall_log_profile.py index 0c2a5edac42..2c4743140c8 100644 --- a/test/units/modules/network/f5/test_bigip_firewall_log_profile.py +++ b/test/units/modules/network/f5/test_bigip_firewall_log_profile.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_firewall_log_profile_network.py b/test/units/modules/network/f5/test_bigip_firewall_log_profile_network.py index e3ca557b232..a17fc05fba9 100644 --- a/test/units/modules/network/f5/test_bigip_firewall_log_profile_network.py +++ b/test/units/modules/network/f5/test_bigip_firewall_log_profile_network.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_firewall_policy.py b/test/units/modules/network/f5/test_bigip_firewall_policy.py index 6599b30738a..a5742bc81f3 100644 --- a/test/units/modules/network/f5/test_bigip_firewall_policy.py +++ b/test/units/modules/network/f5/test_bigip_firewall_policy.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_firewall_rule.py b/test/units/modules/network/f5/test_bigip_firewall_rule.py index 7cf6e1be378..39d45ab1781 100644 --- a/test/units/modules/network/f5/test_bigip_firewall_rule.py +++ b/test/units/modules/network/f5/test_bigip_firewall_rule.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_firewall_rule import ApiParameters from library.modules.bigip_firewall_rule import ModuleParameters from library.modules.bigip_firewall_rule import ModuleManager from library.modules.bigip_firewall_rule import ArgumentSpec @@ -25,11 +24,9 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_firewall_rule import ApiParameters from ansible.modules.network.f5.bigip_firewall_rule import ModuleParameters from ansible.modules.network.f5.bigip_firewall_rule import ModuleManager from ansible.modules.network.f5.bigip_firewall_rule import ArgumentSpec @@ -37,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_firewall_rule_list.py b/test/units/modules/network/f5/test_bigip_firewall_rule_list.py index c6eb482c950..4c6b2d9a34d 100644 --- a/test/units/modules/network/f5/test_bigip_firewall_rule_list.py +++ b/test/units/modules/network/f5/test_bigip_firewall_rule_list.py @@ -18,26 +18,22 @@ from ansible.module_utils.basic import AnsibleModule try: from library.modules.bigip_firewall_rule_list import ModuleParameters - from library.modules.bigip_firewall_rule_list import ApiParameters from library.modules.bigip_firewall_rule_list import ModuleManager from library.modules.bigip_firewall_rule_list import ArgumentSpec # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: from ansible.modules.network.f5.bigip_firewall_rule_list import ModuleParameters - from ansible.modules.network.f5.bigip_firewall_rule_list import ApiParameters from ansible.modules.network.f5.bigip_firewall_rule_list import ModuleManager from ansible.modules.network.f5.bigip_firewall_rule_list 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 diff --git a/test/units/modules/network/f5/test_bigip_firewall_schedule.py b/test/units/modules/network/f5/test_bigip_firewall_schedule.py index 8d185eece8b..35ff7ab5080 100644 --- a/test/units/modules/network/f5/test_bigip_firewall_schedule.py +++ b/test/units/modules/network/f5/test_bigip_firewall_schedule.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 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 8472bec4ab0..b76bef6c51e 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_facts.py +++ b/test/units/modules/network/f5/test_bigip_gtm_facts.py @@ -19,46 +19,25 @@ if sys.version_info < (2, 7): from units.compat import unittest from units.compat.mock import Mock -from units.compat.mock import patch from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems try: from library.modules.bigip_gtm_facts import Parameters - from library.modules.bigip_gtm_facts import ServerParameters - from library.modules.bigip_gtm_facts import PoolParameters - from library.modules.bigip_gtm_facts import WideIpParameters from library.modules.bigip_gtm_facts import ModuleManager - from library.modules.bigip_gtm_facts import ServerFactManager from library.modules.bigip_gtm_facts import PoolFactManager from library.modules.bigip_gtm_facts import TypedPoolFactManager - from library.modules.bigip_gtm_facts import UntypedPoolFactManager - from library.modules.bigip_gtm_facts import WideIpFactManager - from library.modules.bigip_gtm_facts import TypedWideIpFactManager - from library.modules.bigip_gtm_facts import UntypedWideIpFactManager from library.modules.bigip_gtm_facts import ArgumentSpec - from library.module_utils.network.f5.common import F5ModuleError - from library.module_utils.network.f5.common 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 - from ansible.modules.network.f5.bigip_gtm_pool import ServerParameters - from ansible.modules.network.f5.bigip_gtm_pool import PoolParameters - from ansible.modules.network.f5.bigip_gtm_pool import WideIpParameters from ansible.modules.network.f5.bigip_gtm_pool import ModuleManager - from ansible.modules.network.f5.bigip_gtm_pool import ServerFactManager from ansible.modules.network.f5.bigip_gtm_pool import PoolFactManager from ansible.modules.network.f5.bigip_gtm_pool import TypedPoolFactManager - from ansible.modules.network.f5.bigip_gtm_pool import UntypedPoolFactManager - from ansible.modules.network.f5.bigip_gtm_pool import WideIpFactManager - from ansible.modules.network.f5.bigip_gtm_pool import TypedWideIpFactManager - from ansible.modules.network.f5.bigip_gtm_pool import UntypedWideIpFactManager from ansible.modules.network.f5.bigip_gtm_pool import ArgumentSpec - from ansible.module_utils.network.f5.common import F5ModuleError - from ansible.module_utils.network.f5.common 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 diff --git a/test/units/modules/network/f5/test_bigip_gtm_global.py b/test/units/modules/network/f5/test_bigip_gtm_global.py index 06ec0ed6f3e..e80347e364c 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_global.py +++ b/test/units/modules/network/f5/test_bigip_gtm_global.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 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 e1247c9403e..bc647057f67 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 @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_gtm_monitor_external import ApiParameters from library.modules.bigip_gtm_monitor_external import ModuleParameters from library.modules.bigip_gtm_monitor_external import ModuleManager from library.modules.bigip_gtm_monitor_external import ArgumentSpec @@ -29,7 +28,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - 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 diff --git a/test/units/modules/network/f5/test_bigip_gtm_topology_record.py b/test/units/modules/network/f5/test_bigip_gtm_topology_record.py index 80019325b9a..68f5199ca91 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_topology_record.py +++ b/test/units/modules/network/f5/test_bigip_gtm_topology_record.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_gtm_topology_region.py b/test/units/modules/network/f5/test_bigip_gtm_topology_region.py index 592941cf6a4..629604db849 100644 --- a/test/units/modules/network/f5/test_bigip_gtm_topology_region.py +++ b/test/units/modules/network/f5/test_bigip_gtm_topology_region.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_hostname.py b/test/units/modules/network/f5/test_bigip_hostname.py index e56ef0e9143..c625e738844 100644 --- a/test/units/modules/network/f5/test_bigip_hostname.py +++ b/test/units/modules/network/f5/test_bigip_hostname.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_iapp_service.py b/test/units/modules/network/f5/test_bigip_iapp_service.py index 980abc7f7f1..4b46c7a981f 100644 --- a/test/units/modules/network/f5/test_bigip_iapp_service.py +++ b/test/units/modules/network/f5/test_bigip_iapp_service.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_iapp_template.py b/test/units/modules/network/f5/test_bigip_iapp_template.py index 71c39a6862b..cf86e412242 100644 --- a/test/units/modules/network/f5/test_bigip_iapp_template.py +++ b/test/units/modules/network/f5/test_bigip_iapp_template.py @@ -24,7 +24,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -35,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_ike_peer.py b/test/units/modules/network/f5/test_bigip_ike_peer.py index 0779abb8fc8..4edc5e6298c 100644 --- a/test/units/modules/network/f5/test_bigip_ike_peer.py +++ b/test/units/modules/network/f5/test_bigip_ike_peer.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_imish_config.py b/test/units/modules/network/f5/test_bigip_imish_config.py index fd65d4fd4ed..92197fb0375 100644 --- a/test/units/modules/network/f5/test_bigip_imish_config.py +++ b/test/units/modules/network/f5/test_bigip_imish_config.py @@ -17,27 +17,21 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_imish_config import ApiParameters - from library.modules.bigip_imish_config import ModuleParameters from library.modules.bigip_imish_config import ModuleManager from library.modules.bigip_imish_config import ArgumentSpec # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_imish_config import ApiParameters - from ansible.modules.network.f5.bigip_imish_config import ModuleParameters from ansible.modules.network.f5.bigip_imish_config import ModuleManager from ansible.modules.network.f5.bigip_imish_config 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 diff --git a/test/units/modules/network/f5/test_bigip_ipsec_policy.py b/test/units/modules/network/f5/test_bigip_ipsec_policy.py index ffa3afd040b..4fc769f0826 100644 --- a/test/units/modules/network/f5/test_bigip_ipsec_policy.py +++ b/test/units/modules/network/f5/test_bigip_ipsec_policy.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_log_destination.py b/test/units/modules/network/f5/test_bigip_log_destination.py index 52d334def85..5a02fde620c 100644 --- a/test/units/modules/network/f5/test_bigip_log_destination.py +++ b/test/units/modules/network/f5/test_bigip_log_destination.py @@ -18,34 +18,26 @@ from ansible.module_utils.basic import AnsibleModule try: from library.modules.bigip_log_destination import V1ApiParameters - from library.modules.bigip_log_destination import V2ApiParameters from library.modules.bigip_log_destination import V1ModuleParameters - from library.modules.bigip_log_destination import V2ModuleParameters from library.modules.bigip_log_destination import ModuleManager from library.modules.bigip_log_destination import V1Manager - from library.modules.bigip_log_destination import V2Manager from library.modules.bigip_log_destination import ArgumentSpec # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: from ansible.modules.network.f5.bigip_log_destination import V1ApiParameters - from ansible.modules.network.f5.bigip_log_destination import V2ApiParameters from ansible.modules.network.f5.bigip_log_destination import V1ModuleParameters - from ansible.modules.network.f5.bigip_log_destination import V2ModuleParameters from ansible.modules.network.f5.bigip_log_destination import ModuleManager from ansible.modules.network.f5.bigip_log_destination import V1Manager - from ansible.modules.network.f5.bigip_log_destination import V2Manager from ansible.modules.network.f5.bigip_log_destination 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 diff --git a/test/units/modules/network/f5/test_bigip_log_publisher.py b/test/units/modules/network/f5/test_bigip_log_publisher.py index 04b9c595785..c45e31b79d2 100644 --- a/test/units/modules/network/f5/test_bigip_log_publisher.py +++ b/test/units/modules/network/f5/test_bigip_log_publisher.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_management_route.py b/test/units/modules/network/f5/test_bigip_management_route.py index 8180d99b366..a3d6501710c 100644 --- a/test/units/modules/network/f5/test_bigip_management_route.py +++ b/test/units/modules/network/f5/test_bigip_management_route.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_message_routing_peer.py b/test/units/modules/network/f5/test_bigip_message_routing_peer.py index ebf6cf0a206..9c67fdbb9a7 100644 --- a/test/units/modules/network/f5/test_bigip_message_routing_peer.py +++ b/test/units/modules/network/f5/test_bigip_message_routing_peer.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_message_routing_protocol.py b/test/units/modules/network/f5/test_bigip_message_routing_protocol.py index 6ba3dffd57f..0a59d5e9def 100644 --- a/test/units/modules/network/f5/test_bigip_message_routing_protocol.py +++ b/test/units/modules/network/f5/test_bigip_message_routing_protocol.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_message_routing_route.py b/test/units/modules/network/f5/test_bigip_message_routing_route.py index 6649b5cd6d5..db68ae1edfc 100644 --- a/test/units/modules/network/f5/test_bigip_message_routing_route.py +++ b/test/units/modules/network/f5/test_bigip_message_routing_route.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_message_routing_router.py b/test/units/modules/network/f5/test_bigip_message_routing_router.py index 91c1cecf68a..6bd5525a263 100644 --- a/test/units/modules/network/f5/test_bigip_message_routing_router.py +++ b/test/units/modules/network/f5/test_bigip_message_routing_router.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_message_routing_transport_config.py b/test/units/modules/network/f5/test_bigip_message_routing_transport_config.py index eeaff8ca496..d532005d7e7 100644 --- a/test/units/modules/network/f5/test_bigip_message_routing_transport_config.py +++ b/test/units/modules/network/f5/test_bigip_message_routing_transport_config.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 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 dee7c70385b..ad473e5540f 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_dns.py +++ b/test/units/modules/network/f5/test_bigip_monitor_dns.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 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 91e02cd7667..3f290363210 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_external.py +++ b/test/units/modules/network/f5/test_bigip_monitor_external.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_monitor_external import ApiParameters from library.modules.bigip_monitor_external import ModuleParameters from library.modules.bigip_monitor_external import ModuleManager from library.modules.bigip_monitor_external import ArgumentSpec @@ -25,11 +24,9 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: - 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 @@ -37,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_monitor_gateway_icmp.py b/test/units/modules/network/f5/test_bigip_monitor_gateway_icmp.py index 2e3576e4d4e..f327bfc80fa 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_gateway_icmp.py +++ b/test/units/modules/network/f5/test_bigip_monitor_gateway_icmp.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 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 93d57e25728..0c9a66005c4 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_http.py +++ b/test/units/modules/network/f5/test_bigip_monitor_http.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 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 700806f803f..214bec50f57 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_https.py +++ b/test/units/modules/network/f5/test_bigip_monitor_https.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 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 bac072ab215..a81fd34d960 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_ldap.py +++ b/test/units/modules/network/f5/test_bigip_monitor_ldap.py @@ -18,26 +18,22 @@ from ansible.module_utils.basic import AnsibleModule try: from library.modules.bigip_monitor_ldap import ApiParameters - from library.modules.bigip_monitor_ldap import ModuleParameters from library.modules.bigip_monitor_ldap import ModuleManager from library.modules.bigip_monitor_ldap import ArgumentSpec # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: 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 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 080334277d4..8c45bddbb73 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 @@ -24,7 +24,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -35,7 +34,6 @@ except ImportError: # 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 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 56ee56a8e15..de64d3ef423 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_tcp.py +++ b/test/units/modules/network/f5/test_bigip_monitor_tcp.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 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 528b2cd792e..a33a1c495b5 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 @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 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 286962ccc42..b009ddbca5b 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 @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 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 159b74b45bd..71eb245f370 100644 --- a/test/units/modules/network/f5/test_bigip_monitor_udp.py +++ b/test/units/modules/network/f5/test_bigip_monitor_udp.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_node.py b/test/units/modules/network/f5/test_bigip_node.py index 90cb4253760..4592471e8f9 100644 --- a/test/units/modules/network/f5/test_bigip_node.py +++ b/test/units/modules/network/f5/test_bigip_node.py @@ -18,7 +18,6 @@ from ansible.module_utils.basic import AnsibleModule try: from library.modules.bigip_node import Parameters - from library.modules.bigip_node import ModuleParameters from library.modules.bigip_node import ApiParameters from library.modules.bigip_node import ModuleManager from library.modules.bigip_node import ArgumentSpec @@ -26,12 +25,10 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: from ansible.modules.network.f5.bigip_node import Parameters - from ansible.modules.network.f5.bigip_node import ModuleParameters from ansible.modules.network.f5.bigip_node import ApiParameters from ansible.modules.network.f5.bigip_node import ModuleManager from ansible.modules.network.f5.bigip_node import ArgumentSpec @@ -39,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_partition.py b/test/units/modules/network/f5/test_bigip_partition.py index 8446f7728b7..b12f87ae1ea 100644 --- a/test/units/modules/network/f5/test_bigip_partition.py +++ b/test/units/modules/network/f5/test_bigip_partition.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_policy.py b/test/units/modules/network/f5/test_bigip_policy.py index 39650e19905..e59b2facf9c 100644 --- a/test/units/modules/network/f5/test_bigip_policy.py +++ b/test/units/modules/network/f5/test_bigip_policy.py @@ -20,26 +20,22 @@ try: from library.modules.bigip_policy import Parameters from library.modules.bigip_policy import ModuleManager from library.modules.bigip_policy import SimpleManager - from library.modules.bigip_policy import ComplexManager from library.modules.bigip_policy import ArgumentSpec # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: from ansible.modules.network.f5.bigip_policy import Parameters from ansible.modules.network.f5.bigip_policy import ModuleManager from ansible.modules.network.f5.bigip_policy import SimpleManager - from ansible.modules.network.f5.bigip_policy import ComplexManager from ansible.modules.network.f5.bigip_policy 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 diff --git a/test/units/modules/network/f5/test_bigip_policy_rule.py b/test/units/modules/network/f5/test_bigip_policy_rule.py index 13869392df2..70ef8dc2352 100644 --- a/test/units/modules/network/f5/test_bigip_policy_rule.py +++ b/test/units/modules/network/f5/test_bigip_policy_rule.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_policy_rule import Parameters from library.modules.bigip_policy_rule import ModuleParameters from library.modules.bigip_policy_rule import ApiParameters from library.modules.bigip_policy_rule import ModuleManager @@ -26,11 +25,9 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_policy_rule import Parameters from ansible.modules.network.f5.bigip_policy_rule import ModuleParameters from ansible.modules.network.f5.bigip_policy_rule import ApiParameters from ansible.modules.network.f5.bigip_policy_rule import ModuleManager @@ -39,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_pool.py b/test/units/modules/network/f5/test_bigip_pool.py index d902b118b4b..de74f24cd55 100644 --- a/test/units/modules/network/f5/test_bigip_pool.py +++ b/test/units/modules/network/f5/test_bigip_pool.py @@ -27,7 +27,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -41,7 +40,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_pool_member.py b/test/units/modules/network/f5/test_bigip_pool_member.py index 9bc030ddd7b..acc4984e0de 100644 --- a/test/units/modules/network/f5/test_bigip_pool_member.py +++ b/test/units/modules/network/f5/test_bigip_pool_member.py @@ -26,7 +26,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -39,7 +38,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_analytics.py b/test/units/modules/network/f5/test_bigip_profile_analytics.py index ad158f8fb2f..0e81c75e648 100644 --- a/test/units/modules/network/f5/test_bigip_profile_analytics.py +++ b/test/units/modules/network/f5/test_bigip_profile_analytics.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_client_ssl.py b/test/units/modules/network/f5/test_bigip_profile_client_ssl.py index d633237faf9..18c1f270021 100644 --- a/test/units/modules/network/f5/test_bigip_profile_client_ssl.py +++ b/test/units/modules/network/f5/test_bigip_profile_client_ssl.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_dns.py b/test/units/modules/network/f5/test_bigip_profile_dns.py index b87a8e8b1fd..4932002fa46 100644 --- a/test/units/modules/network/f5/test_bigip_profile_dns.py +++ b/test/units/modules/network/f5/test_bigip_profile_dns.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_fastl4.py b/test/units/modules/network/f5/test_bigip_profile_fastl4.py index 32b184713d6..8425053d918 100644 --- a/test/units/modules/network/f5/test_bigip_profile_fastl4.py +++ b/test/units/modules/network/f5/test_bigip_profile_fastl4.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_http.py b/test/units/modules/network/f5/test_bigip_profile_http.py index 1a625dbd867..a913172dc25 100644 --- a/test/units/modules/network/f5/test_bigip_profile_http.py +++ b/test/units/modules/network/f5/test_bigip_profile_http.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_http2.py b/test/units/modules/network/f5/test_bigip_profile_http2.py index 9ecf87ea002..6ae6ea63322 100644 --- a/test/units/modules/network/f5/test_bigip_profile_http2.py +++ b/test/units/modules/network/f5/test_bigip_profile_http2.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_http_compression.py b/test/units/modules/network/f5/test_bigip_profile_http_compression.py index 8f2a3dc12ee..f3d2da3ed71 100644 --- a/test/units/modules/network/f5/test_bigip_profile_http_compression.py +++ b/test/units/modules/network/f5/test_bigip_profile_http_compression.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_oneconnect.py b/test/units/modules/network/f5/test_bigip_profile_oneconnect.py index 0294c51cc10..50574593501 100644 --- a/test/units/modules/network/f5/test_bigip_profile_oneconnect.py +++ b/test/units/modules/network/f5/test_bigip_profile_oneconnect.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_persistence_cookie.py b/test/units/modules/network/f5/test_bigip_profile_persistence_cookie.py index 26dc06c8196..2bdecf1ff67 100644 --- a/test/units/modules/network/f5/test_bigip_profile_persistence_cookie.py +++ b/test/units/modules/network/f5/test_bigip_profile_persistence_cookie.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_persistence_src_addr.py b/test/units/modules/network/f5/test_bigip_profile_persistence_src_addr.py index cd383af2b59..c8a2683f748 100644 --- a/test/units/modules/network/f5/test_bigip_profile_persistence_src_addr.py +++ b/test/units/modules/network/f5/test_bigip_profile_persistence_src_addr.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_server_ssl.py b/test/units/modules/network/f5/test_bigip_profile_server_ssl.py index 029072f80cf..9a516344737 100644 --- a/test/units/modules/network/f5/test_bigip_profile_server_ssl.py +++ b/test/units/modules/network/f5/test_bigip_profile_server_ssl.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_tcp.py b/test/units/modules/network/f5/test_bigip_profile_tcp.py index ec942272206..a99fdb3312a 100644 --- a/test/units/modules/network/f5/test_bigip_profile_tcp.py +++ b/test/units/modules/network/f5/test_bigip_profile_tcp.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_profile_udp.py b/test/units/modules/network/f5/test_bigip_profile_udp.py index d98b5196596..0cdb30f3dc5 100644 --- a/test/units/modules/network/f5/test_bigip_profile_udp.py +++ b/test/units/modules/network/f5/test_bigip_profile_udp.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_remote_role.py b/test/units/modules/network/f5/test_bigip_remote_role.py index cd9c2f5db4e..0967e9bcf23 100644 --- a/test/units/modules/network/f5/test_bigip_remote_role.py +++ b/test/units/modules/network/f5/test_bigip_remote_role.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_remote_syslog.py b/test/units/modules/network/f5/test_bigip_remote_syslog.py index 0d87f0a8092..9cf81bde450 100644 --- a/test/units/modules/network/f5/test_bigip_remote_syslog.py +++ b/test/units/modules/network/f5/test_bigip_remote_syslog.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_remote_syslog import ApiParameters from library.modules.bigip_remote_syslog import ModuleParameters from library.modules.bigip_remote_syslog import ModuleManager from library.modules.bigip_remote_syslog import ArgumentSpec @@ -27,11 +26,9 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_remote_syslog import ApiParameters from ansible.modules.network.f5.bigip_remote_syslog import ModuleParameters from ansible.modules.network.f5.bigip_remote_syslog import ModuleManager from ansible.modules.network.f5.bigip_remote_syslog import ArgumentSpec @@ -41,7 +38,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_remote_user.py b/test/units/modules/network/f5/test_bigip_remote_user.py index a31d696f22d..89ccbfe36e2 100644 --- a/test/units/modules/network/f5/test_bigip_remote_user.py +++ b/test/units/modules/network/f5/test_bigip_remote_user.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_routedomain.py b/test/units/modules/network/f5/test_bigip_routedomain.py index 9110efdca8a..7805152baeb 100644 --- a/test/units/modules/network/f5/test_bigip_routedomain.py +++ b/test/units/modules/network/f5/test_bigip_routedomain.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_security_address_list.py b/test/units/modules/network/f5/test_bigip_security_address_list.py index fb1ee497f4b..dd8a48feeab 100644 --- a/test/units/modules/network/f5/test_bigip_security_address_list.py +++ b/test/units/modules/network/f5/test_bigip_security_address_list.py @@ -18,7 +18,6 @@ if sys.version_info < (2, 7): from units.compat import unittest from units.compat.mock import Mock -from units.compat.mock import patch from ansible.module_utils.basic import AnsibleModule try: @@ -26,8 +25,6 @@ try: from library.modules.bigip_security_address_list import ModuleParameters from library.modules.bigip_security_address_list import ModuleManager from library.modules.bigip_security_address_list import ArgumentSpec - from library.module_utils.network.f5.common import F5ModuleError - from library.module_utils.network.f5.common import iControlUnexpectedHTTPError from test.unit.modules.utils import set_module_args except ImportError: try: @@ -35,8 +32,6 @@ except ImportError: from ansible.modules.network.f5.bigip_security_address_list import ModuleParameters from ansible.modules.network.f5.bigip_security_address_list import ModuleManager from ansible.modules.network.f5.bigip_security_address_list import ArgumentSpec - from ansible.module_utils.network.f5.common import F5ModuleError - from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError from units.modules.utils import set_module_args except ImportError: pytestmark.append(pytest.mark.skip("F5 Ansible modules require the f5-sdk Python library")) diff --git a/test/units/modules/network/f5/test_bigip_security_port_list.py b/test/units/modules/network/f5/test_bigip_security_port_list.py index aa41f7825db..33283de97cc 100644 --- a/test/units/modules/network/f5/test_bigip_security_port_list.py +++ b/test/units/modules/network/f5/test_bigip_security_port_list.py @@ -18,7 +18,6 @@ if sys.version_info < (2, 7): from units.compat import unittest from units.compat.mock import Mock -from units.compat.mock import patch from ansible.module_utils.basic import AnsibleModule try: @@ -26,8 +25,6 @@ try: from library.modules.bigip_security_port_list import ModuleParameters from library.modules.bigip_security_port_list import ModuleManager from library.modules.bigip_security_port_list import ArgumentSpec - from library.module_utils.network.f5.common import F5ModuleError - from library.module_utils.network.f5.common import iControlUnexpectedHTTPError from test.unit.modules.utils import set_module_args except ImportError: try: @@ -35,8 +32,6 @@ except ImportError: from ansible.modules.network.f5.bigip_security_port_list import ModuleParameters from ansible.modules.network.f5.bigip_security_port_list import ModuleManager from ansible.modules.network.f5.bigip_security_port_list import ArgumentSpec - from ansible.module_utils.network.f5.common import F5ModuleError - from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError from units.modules.utils import set_module_args except ImportError: pytestmark.append(pytest.mark.skip("F5 Ansible modules require the f5-sdk Python library")) diff --git a/test/units/modules/network/f5/test_bigip_selfip.py b/test/units/modules/network/f5/test_bigip_selfip.py index 026197c92d5..0e5c3a946ae 100644 --- a/test/units/modules/network/f5/test_bigip_selfip.py +++ b/test/units/modules/network/f5/test_bigip_selfip.py @@ -27,7 +27,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -41,7 +40,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_smtp.py b/test/units/modules/network/f5/test_bigip_smtp.py index 0bbcd6f85f0..8203a092c7b 100644 --- a/test/units/modules/network/f5/test_bigip_smtp.py +++ b/test/units/modules/network/f5/test_bigip_smtp.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_snat_pool.py b/test/units/modules/network/f5/test_bigip_snat_pool.py index 2980beca8ec..83ab106a482 100644 --- a/test/units/modules/network/f5/test_bigip_snat_pool.py +++ b/test/units/modules/network/f5/test_bigip_snat_pool.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_snat_translation.py b/test/units/modules/network/f5/test_bigip_snat_translation.py index 5c2e71defdf..6571711dfa1 100644 --- a/test/units/modules/network/f5/test_bigip_snat_translation.py +++ b/test/units/modules/network/f5/test_bigip_snat_translation.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_snmp.py b/test/units/modules/network/f5/test_bigip_snmp.py index 6b2da453336..52ca2898e7d 100644 --- a/test/units/modules/network/f5/test_bigip_snmp.py +++ b/test/units/modules/network/f5/test_bigip_snmp.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_snmp_community.py b/test/units/modules/network/f5/test_bigip_snmp_community.py index 153ee2dc392..da18b893fb9 100644 --- a/test/units/modules/network/f5/test_bigip_snmp_community.py +++ b/test/units/modules/network/f5/test_bigip_snmp_community.py @@ -29,7 +29,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -45,7 +44,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_software_image.py b/test/units/modules/network/f5/test_bigip_software_image.py index e446b445f16..4fa46a7593e 100644 --- a/test/units/modules/network/f5/test_bigip_software_image.py +++ b/test/units/modules/network/f5/test_bigip_software_image.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_software_install.py b/test/units/modules/network/f5/test_bigip_software_install.py index 4031e7584f5..9f85eae6f3a 100644 --- a/test/units/modules/network/f5/test_bigip_software_install.py +++ b/test/units/modules/network/f5/test_bigip_software_install.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_software_update.py b/test/units/modules/network/f5/test_bigip_software_update.py index 18bb8e4c1b5..f178744f285 100644 --- a/test/units/modules/network/f5/test_bigip_software_update.py +++ b/test/units/modules/network/f5/test_bigip_software_update.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_ssl_certificate.py b/test/units/modules/network/f5/test_bigip_ssl_certificate.py index ba31ef22c55..bb5562d736c 100644 --- a/test/units/modules/network/f5/test_bigip_ssl_certificate.py +++ b/test/units/modules/network/f5/test_bigip_ssl_certificate.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_ssl_key.py b/test/units/modules/network/f5/test_bigip_ssl_key.py index 07db999b1a8..0af4c9e2c28 100644 --- a/test/units/modules/network/f5/test_bigip_ssl_key.py +++ b/test/units/modules/network/f5/test_bigip_ssl_key.py @@ -24,7 +24,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -35,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_sys_daemon_log_tmm.py b/test/units/modules/network/f5/test_bigip_sys_daemon_log_tmm.py index 316a7f2e5e4..2c7e5330b1c 100644 --- a/test/units/modules/network/f5/test_bigip_sys_daemon_log_tmm.py +++ b/test/units/modules/network/f5/test_bigip_sys_daemon_log_tmm.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_sys_db.py b/test/units/modules/network/f5/test_bigip_sys_db.py index 1969105e6d5..94d12fa0000 100644 --- a/test/units/modules/network/f5/test_bigip_sys_db.py +++ b/test/units/modules/network/f5/test_bigip_sys_db.py @@ -24,7 +24,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -35,7 +34,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_sys_global.py b/test/units/modules/network/f5/test_bigip_sys_global.py index 0c8a4109898..78920c191d8 100644 --- a/test/units/modules/network/f5/test_bigip_sys_global.py +++ b/test/units/modules/network/f5/test_bigip_sys_global.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_timer_policy.py b/test/units/modules/network/f5/test_bigip_timer_policy.py index 6d70800989b..58526385efc 100644 --- a/test/units/modules/network/f5/test_bigip_timer_policy.py +++ b/test/units/modules/network/f5/test_bigip_timer_policy.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_traffic_selector.py b/test/units/modules/network/f5/test_bigip_traffic_selector.py index e897ae1f4cb..63ac7b3a88b 100644 --- a/test/units/modules/network/f5/test_bigip_traffic_selector.py +++ b/test/units/modules/network/f5/test_bigip_traffic_selector.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_trunk.py b/test/units/modules/network/f5/test_bigip_trunk.py index b1f30707037..e3f285283ec 100644 --- a/test/units/modules/network/f5/test_bigip_trunk.py +++ b/test/units/modules/network/f5/test_bigip_trunk.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_tunnel.py b/test/units/modules/network/f5/test_bigip_tunnel.py index 6eecb909165..cee03912596 100644 --- a/test/units/modules/network/f5/test_bigip_tunnel.py +++ b/test/units/modules/network/f5/test_bigip_tunnel.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_ucs_fetch.py b/test/units/modules/network/f5/test_bigip_ucs_fetch.py index 057242f0399..1582b7705da 100644 --- a/test/units/modules/network/f5/test_bigip_ucs_fetch.py +++ b/test/units/modules/network/f5/test_bigip_ucs_fetch.py @@ -20,7 +20,6 @@ try: from library.modules.bigip_ucs_fetch import Parameters from library.modules.bigip_ucs_fetch import ModuleManager from library.modules.bigip_ucs_fetch import V1Manager - from library.modules.bigip_ucs_fetch import V2Manager from library.modules.bigip_ucs_fetch import ArgumentSpec # In Ansible 2.8, Ansible changed import paths. @@ -33,7 +32,6 @@ except ImportError: from ansible.modules.network.f5.bigip_ucs_fetch import Parameters from ansible.modules.network.f5.bigip_ucs_fetch import ModuleManager from ansible.modules.network.f5.bigip_ucs_fetch import V1Manager - from ansible.modules.network.f5.bigip_ucs_fetch import V2Manager from ansible.modules.network.f5.bigip_ucs_fetch import ArgumentSpec # Ansible 2.8 imports diff --git a/test/units/modules/network/f5/test_bigip_user.py b/test/units/modules/network/f5/test_bigip_user.py index 2e532d3f212..3065b6c136b 100644 --- a/test/units/modules/network/f5/test_bigip_user.py +++ b/test/units/modules/network/f5/test_bigip_user.py @@ -28,7 +28,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -43,7 +42,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_virtual_address.py b/test/units/modules/network/f5/test_bigip_virtual_address.py index c8b59ba61ac..c7e55182591 100644 --- a/test/units/modules/network/f5/test_bigip_virtual_address.py +++ b/test/units/modules/network/f5/test_bigip_virtual_address.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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 diff --git a/test/units/modules/network/f5/test_bigip_vlan.py b/test/units/modules/network/f5/test_bigip_vlan.py index a0beccb564c..89e421e2f7f 100644 --- a/test/units/modules/network/f5/test_bigip_vlan.py +++ b/test/units/modules/network/f5/test_bigip_vlan.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # 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