Skip to content

Commit

Permalink
Updates bigiq_utility_license_assignment for ansible 2.8 (ansible#47719)
Browse files Browse the repository at this point in the history
  • Loading branch information
caphrim007 authored and Tomorrow9 committed Dec 4, 2018
1 parent f57d207 commit 95df089
Showing 1 changed file with 13 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,38 @@

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:
from library.modules.bigiq_utility_license_assignment import ApiParameters
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")
Expand Down

0 comments on commit 95df089

Please sign in to comment.