mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-06 21:32:49 +00:00
Remove f5-sdk from bigip_snat_pool (#48030)
This commit is contained in:
@@ -14,25 +14,32 @@ 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_snat_pool import Parameters
|
||||
from library.modules.bigip_snat_pool import ModuleParameters
|
||||
from library.modules.bigip_snat_pool import ApiParameters
|
||||
from library.modules.bigip_snat_pool import ModuleManager
|
||||
from library.modules.bigip_snat_pool 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.bigip_snat_pool import Parameters
|
||||
from ansible.modules.network.f5.bigip_snat_pool import ModuleParameters
|
||||
from ansible.modules.network.f5.bigip_snat_pool import ApiParameters
|
||||
from ansible.modules.network.f5.bigip_snat_pool import ModuleManager
|
||||
from ansible.modules.network.f5.bigip_snat_pool 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")
|
||||
@@ -67,7 +74,7 @@ class TestParameters(unittest.TestCase):
|
||||
members=['10.10.10.10', '20.20.20.20'],
|
||||
partition='Common'
|
||||
)
|
||||
p = Parameters(params=args)
|
||||
p = ModuleParameters(params=args)
|
||||
assert p.name == 'my-snat-pool'
|
||||
assert p.state == 'present'
|
||||
assert len(p.members) == 2
|
||||
@@ -78,10 +85,10 @@ class TestParameters(unittest.TestCase):
|
||||
args = dict(
|
||||
members=['/Common/10.10.10.10', '/foo/20.20.20.20']
|
||||
)
|
||||
p = Parameters(params=args)
|
||||
p = ApiParameters(params=args)
|
||||
assert len(p.members) == 2
|
||||
assert '/Common/10.10.10.10' in p.members
|
||||
assert '/Common/20.20.20.20' in p.members
|
||||
assert '/foo/20.20.20.20' in p.members
|
||||
|
||||
|
||||
class TestManager(unittest.TestCase):
|
||||
@@ -126,7 +133,7 @@ class TestManager(unittest.TestCase):
|
||||
user='admin'
|
||||
))
|
||||
|
||||
current = Parameters(params=load_fixture('load_ltm_snatpool.json'))
|
||||
current = ApiParameters(params=load_fixture('load_ltm_snatpool.json'))
|
||||
|
||||
module = AnsibleModule(
|
||||
argument_spec=self.spec.argument_spec,
|
||||
@@ -152,7 +159,7 @@ class TestManager(unittest.TestCase):
|
||||
user='admin'
|
||||
))
|
||||
|
||||
current = Parameters(params=load_fixture('load_ltm_snatpool.json'))
|
||||
current = ApiParameters(params=load_fixture('load_ltm_snatpool.json'))
|
||||
|
||||
module = AnsibleModule(
|
||||
argument_spec=self.spec.argument_spec,
|
||||
|
||||
Reference in New Issue
Block a user