Removes f5-sdk from bigip_ucs module (#48003)

This patch removes the usage of the f5-sdk from the bigip_ucs module
This commit is contained in:
Tim Rupp 2018-11-02 12:13:44 -07:00 committed by GitHub
parent 7c3b0a338e
commit 2a69dfb22f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 193 additions and 79 deletions

View file

@ -15,29 +15,38 @@ 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.bigip_ucs import Parameters
from library.modules.bigip_ucs import ModuleParameters
from library.modules.bigip_ucs import ModuleManager
from library.modules.bigip_ucs import ArgumentSpec
from library.modules.bigip_ucs import V1Manager
from library.modules.bigip_ucs import V2Manager
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.bigip_ucs import Parameters
from ansible.modules.network.f5.bigip_ucs import ModuleParameters
from ansible.modules.network.f5.bigip_ucs import ModuleManager
from ansible.modules.network.f5.bigip_ucs import ArgumentSpec
from ansible.modules.network.f5.bigip_ucs import V1Manager
from ansible.modules.network.f5.bigip_ucs import V2Manager
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")
@ -77,7 +86,7 @@ class TestParameters(unittest.TestCase):
state='installed'
)
p = Parameters(params=args)
p = ModuleParameters(params=args)
assert p.ucs == '/root/bigip.localhost.localdomain.ucs'
assert p.force is True
assert p.include_chassis_level_config is True
@ -99,7 +108,7 @@ class TestParameters(unittest.TestCase):
reset_trust=False
)
p = Parameters(params=args)
p = ModuleParameters(params=args)
assert p.ucs == '/root/bigip.localhost.localdomain.ucs'
assert p.include_chassis_level_config is False
assert p.no_license is False