From b7a937cb0d6514f70631a104a7b427f9b4d4b4f1 Mon Sep 17 00:00:00 2001 From: Tim Rupp Date: Sat, 27 Oct 2018 19:30:34 -0700 Subject: [PATCH] Updates bigiq_utility_license_assignment for ansible 2.8 (#47719) --- .../test_bigiq_utility_license_assignment.py | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/test/units/modules/network/f5/test_bigiq_utility_license_assignment.py b/test/units/modules/network/f5/test_bigiq_utility_license_assignment.py index a0d396279b8..05bc35782ac 100644 --- a/test/units/modules/network/f5/test_bigiq_utility_license_assignment.py +++ b/test/units/modules/network/f5/test_bigiq_utility_license_assignment.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,17 +21,25 @@ try: from library.modules.bigiq_utility_license_assignment import ModuleParameters from library.modules.bigiq_utility_license_assignment import ModuleManager from library.modules.bigiq_utility_license_assignment 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 + + # 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.bigiq_utility_license_assignment import ApiParameters from ansible.modules.network.f5.bigiq_utility_license_assignment import ModuleParameters from ansible.modules.network.f5.bigiq_utility_license_assignment import ModuleManager from ansible.modules.network.f5.bigiq_utility_license_assignment import ArgumentSpec - from ansible.module_utils.network.f5.common import F5ModuleError - from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError + + # 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")