From fd0f3ad648d984f07ae7eec7b0b6336042b6e2aa Mon Sep 17 00:00:00 2001 From: Tim Rupp Date: Sat, 10 Nov 2018 14:39:10 -0800 Subject: [PATCH] Fixes unit tests for bigip_firewall_policy module (#48490) --- .../network/f5/bigip_firewall_policy.py | 3 ++- .../network/f5/test_bigip_firewall_policy.py | 20 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/lib/ansible/modules/network/f5/bigip_firewall_policy.py b/lib/ansible/modules/network/f5/bigip_firewall_policy.py index 30cb97b441..a294ccd041 100644 --- a/lib/ansible/modules/network/f5/bigip_firewall_policy.py +++ b/lib/ansible/modules/network/f5/bigip_firewall_policy.py @@ -521,8 +521,9 @@ def main(): supports_check_mode=spec.supports_check_mode, ) + client = F5RestClient(**module.params) + try: - client = F5RestClient(**module.params) mm = ModuleManager(module=module, client=client) results = mm.exec_module() cleanup_tokens(client) 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 1bbd96549c..b6c17fa4c8 100644 --- a/test/units/modules/network/f5/test_bigip_firewall_policy.py +++ b/test/units/modules/network/f5/test_bigip_firewall_policy.py @@ -8,16 +8,12 @@ __metaclass__ = type import os import json -import pytest import sys from nose.plugins.skip import SkipTest if sys.version_info < (2, 7): raise SkipTest("F5 Ansible modules require Python >= 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: @@ -25,15 +21,25 @@ try: from library.modules.bigip_firewall_policy import ModuleParameters from library.modules.bigip_firewall_policy import ModuleManager from library.modules.bigip_firewall_policy import ArgumentSpec - from library.module_utils.network.f5.common import F5ModuleError - from test.unit.modules.utils import set_module_args + + # 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: try: from ansible.modules.network.f5.bigip_firewall_policy import ApiParameters from ansible.modules.network.f5.bigip_firewall_policy import ModuleParameters from ansible.modules.network.f5.bigip_firewall_policy import ModuleManager from ansible.modules.network.f5.bigip_firewall_policy import ArgumentSpec - from ansible.module_utils.network.f5.common import F5ModuleError + + # Ansible 2.8 imports + from units.compat import unittest + from units.compat.mock import Mock + from units.compat.mock import patch + from units.modules.utils import set_module_args except ImportError: raise SkipTest("F5 Ansible modules require the f5-sdk Python library")